From 678f74a17a2d3269538e02f7061f6e37a2193ff9 Mon Sep 17 00:00:00 2001
From: lgb <353856593@qq.com>
Date: Sat, 22 Jun 2024 16:30:55 +0800
Subject: [PATCH] mailtest show error msg

---
 app/Repositories/ToolRepository.php |  8 ++++++--
 include/constants.php               |  2 +-
 public/mailtest.php                 | 11 ++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/Repositories/ToolRepository.php b/app/Repositories/ToolRepository.php
index d84518fd..69de55ba 100644
--- a/app/Repositories/ToolRepository.php
+++ b/app/Repositories/ToolRepository.php
@@ -316,7 +316,7 @@ class ToolRepository extends BaseRepository
      * @param $body
      * @return bool
      */
-    public function sendMail($to, $subject, $body): bool
+    public function sendMail($to, $subject, $body, $exception = false): bool
     {
         $log = "[SEND_MAIL]";
         $factory = new EsmtpTransportFactory();
@@ -353,7 +353,11 @@ class ToolRepository extends BaseRepository
             return true;
         } catch (\Throwable $e) {
             do_log("$log, fail: " . $e->getMessage() . "\n" . $e->getTraceAsString(), 'error');
-            return false;
+            if ($exception) {
+                throw $e;
+            } else {
+                return false;
+            }
         }
     }
 
diff --git a/include/constants.php b/include/constants.php
index bbcbb174..37608b46 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-06-16');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-06-22');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/public/mailtest.php b/public/mailtest.php
index 3f4d33b8..802cee15 100644
--- a/public/mailtest.php
+++ b/public/mailtest.php
@@ -20,9 +20,14 @@ if ($action == "sendmail")
 EOD;
 
 //	sent_mail($email, $SITENAME, $SITEEMAIL, change_email_encode(get_langfolder_cookie(), $title), change_email_encode(get_langfolder_cookie(),$body), '', false, false, '', get_email_encode(get_langfolder_cookie()));
-	sent_mail($email, $SITENAME, $SITEEMAIL, $title, $body, '', false, false, '', get_email_encode(get_langfolder_cookie()));
-
-	stderr($lang_mailtest['std_success'], $lang_mailtest['std_success_note']);
+//	sent_mail($email, $SITENAME, $SITEEMAIL, $title, $body, '', false, false, '', get_email_encode(get_langfolder_cookie()));
+    try {
+        $toolRep = new \App\Repositories\ToolRepository();
+        $toolRep->sendMail($email, $title, $body, true);
+        stderr($lang_mailtest['std_success'], $lang_mailtest['std_success_note']);
+    } catch (\Throwable $e) {
+        stderr($lang_functions['std_error'], $lang_functions['text_unable_to_send_mail'] . sprintf("<br/><br/><code>%s</code>", $e->getMessage()), false);
+    }
 }
 else
 {