Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Change no email return.

Browse Source
This commit is contained in:
caoyanyi
2023-08-04 15:47:41 +08:00
parent 444f1815cf
commit b5ccce451c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mail/control.php
+13 -3
View File
@@ -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);
}
}
module/mail/ui/detect.html.php
-3
View File
@@ -29,6 +29,3 @@ formPanel(
set::actionsClass('w-1/2'),
set::submitBtnText($lang->mail->nextStep)
);
render();