From b5ccce451c1369169142c19276b5fd565c77d97e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 4 Aug 2023 15:47:39 +0800
Subject: [PATCH] * Change no email return.

---
 module/mail/control.php        | 16 +++++++++++++---
 module/mail/ui/detect.html.php |  3 ---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/module/mail/control.php b/module/mail/control.php
index a63dc5a2bd..ff61f5450a 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -143,7 +143,7 @@ class mail extends control
             $mailConfig->smtp->debug    = $this->post->debug;
             $mailConfig->smtp->charset  = $this->post->charset;
 
-            if(empty($mailConfig->fromName)) return $this->sendError(array('fromName' => sprintf($this->lang->error->notempty, $this->lang->mail->fromName)));
+            if($mailConfig->turnon && empty($mailConfig->fromName)) return $this->sendError(array('fromName' => sprintf($this->lang->error->notempty, $this->lang->mail->fromName)));
 
             /* The mail need openssl and curl extension when secure is tls. */
             if($mailConfig->smtp->secure == 'tls')
@@ -158,11 +158,21 @@ class mail extends control
                 }
             }
 
+            $this->session->set('mailConfig', $mailConfig->turnon);
             $this->loadModel('setting')->setItems('system.mail', $mailConfig);
             if(dao::isError()) return $this->sendError(dao::getError());
 
-            $mailExist = !empty($this->mail->mailExist());
-            return $this->send(array('result' => 'success', 'callback' => "window.mailTips({$mailExist});"));
+            $result = array('result' => 'success');
+            if($mailConfig->turnon)
+            {
+                $mailExist = !empty($this->mail->mailExist());
+                $result['callback'] = "window.mailTips({$mailExist});";
+            }
+            else
+            {
+                $result['load'] = inlink('detect');
+            }
+            return $this->send($result);
         }
     }
 
diff --git a/module/mail/ui/detect.html.php b/module/mail/ui/detect.html.php
index 55201f89ca..65950a8712 100644
--- a/module/mail/ui/detect.html.php
+++ b/module/mail/ui/detect.html.php
@@ -29,6 +29,3 @@ formPanel(
     set::actionsClass('w-1/2'),
     set::submitBtnText($lang->mail->nextStep)
 );
-
-render();
-