From d06d677565de767c032c511c1dd85b2407cb82a0 Mon Sep 17 00:00:00 2001
From: xiaomlove <1939737565@qq.com>
Date: Mon, 20 Jan 2025 00:47:31 +0800
Subject: [PATCH] fix torrent edit and send email

---
 app/Repositories/ToolRepository.php | 3 ++-
 public/edit.php                     | 2 +-
 public/mailtest.php                 | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/ToolRepository.php b/app/Repositories/ToolRepository.php
index b12bb198..bdbe5322 100644
--- a/app/Repositories/ToolRepository.php
+++ b/app/Repositories/ToolRepository.php
@@ -329,7 +329,8 @@ class ToolRepository extends BaseRepository
         }
         // Create the Transport
         $transport = $factory->create(new Dsn(
-            $encryption === 'tls' ? (($smtp['smtpport'] == 465) ? 'smtps' : 'smtp') : '',
+//            $encryption === 'tls' ? (($smtp['smtpport'] == 465) ? 'smtps' : 'smtp') : '',
+            $smtp['smtpport'] == 465 && in_array($encryption, ['ssl', 'tls']) ? 'smtps' : 'smtp',
             $smtp['smtpaddress'],
             $smtp['accountname'] ?? null,
             $smtp['accountpassword'] ?? null,
diff --git a/public/edit.php b/public/edit.php
index 9b96383a..9ac26b05 100644
--- a/public/edit.php
+++ b/public/edit.php
@@ -8,7 +8,7 @@ $id = intval($_GET['id'] ?? 0);
 if (!$id)
 	die();
 
-$res = sql_query("SELECT torrents.*, categories.mode as cat_mode FROM torrents LEFT JOIN categories ON category = categories.id WHERE torrents.id = $id");
+$res = sql_query("SELECT torrents.*, categories.mode as cat_mode, torrent_extras.media_info as technical_info, torrent_extras.descr FROM torrents LEFT JOIN categories ON category = categories.id left join torrent_extras on torrents.id = torrent_extras.torrent_id WHERE torrents.id = $id");
 $row = mysql_fetch_assoc($res);
 if (!$row) die();
 
diff --git a/public/mailtest.php b/public/mailtest.php
index 802cee15..0de7f1f6 100644
--- a/public/mailtest.php
+++ b/public/mailtest.php
@@ -26,6 +26,7 @@ EOD;
         $toolRep->sendMail($email, $title, $body, true);
         stderr($lang_mailtest['std_success'], $lang_mailtest['std_success_note']);
     } catch (\Throwable $e) {
+        do_log($e->getMessage().$e->getTraceAsString(), "error");
         stderr($lang_functions['std_error'], $lang_functions['text_unable_to_send_mail'] . sprintf("<br/><br/><code>%s</code>", $e->getMessage()), false);
     }
 }