diff --git a/module/mail/control.php b/module/mail/control.php index 0207b290ca..7d8a5b82d2 100755 --- a/module/mail/control.php +++ b/module/mail/control.php @@ -192,6 +192,7 @@ class mail extends control $mailConfig->turnon = $this->post->turnon; $mailConfig->mta = 'sendcloud'; + $mailConfig->async = $this->post->async; $mailConfig->fromAddress = ''; $mailConfig->fromName = ''; $mailConfig->sendcloud->accessKey = trim($this->post->accessKey); @@ -213,6 +214,7 @@ class mail extends control $mailConfig->fromAddress = $this->config->mail->fromAddress; $mailConfig->fromName = $this->config->mail->fromName; $mailConfig->turnon = $this->config->mail->turnon; + $mailConfig->async = isset($this->config->mail->async) ? $this->config->mail->async : 0; } $this->view->title = $this->lang->mail->sendCloud; diff --git a/module/mail/view/sendcloud.html.php b/module/mail/view/sendcloud.html.php index b666006b98..cbe8ab30fe 100755 --- a/module/mail/view/sendcloud.html.php +++ b/module/mail/view/sendcloud.html.php @@ -25,6 +25,12 @@ include '../../common/view/header.html.php'; mail->turnon; ?> mail->turnonList, isset($mailConfig->turnon) ? $mailConfig->turnon : 1);?> + global->cron)):?> + + mail->async?> + mail->asyncList, zget($config->mail, 'async', 0))?> + + mail->accessKey; ?> @@ -46,6 +52,7 @@ include '../../common/view/header.html.php'; if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test')); echo html::linkButton($lang->mail->closeSendCloud, inlink('reset')); if($this->config->mail->turnon and common::hasPriv('mail', 'sendcloudUser')) echo html::linkButton($lang->mail->sendcloudUser, inlink('sendcloudUser')); + if(common::hasPriv('mail', 'browse') and !empty($config->mail->async) and !empty($config->global->cron)) echo html::linkButton($lang->mail->browse, inlink('browse')); ?>