diff --git a/module/mail/model.php b/module/mail/model.php index f060aac58a..fdbee90a72 100644 --- a/module/mail/model.php +++ b/module/mail/model.php @@ -271,13 +271,14 @@ class mailModel extends model * @param array $ccList * @param bool $includeMe * @param array $emails + * @param bool $forceSync * @access public * @return void */ - public function send($toList, $subject, $body = '', $ccList = '', $includeMe = false, $emails = array()) + public function send($toList, $subject, $body = '', $ccList = '', $includeMe = false, $emails = array(), $forceSync = false) { if(!$this->config->mail->turnon) return; - if(!empty($this->config->mail->async)) return $this->addQueue($toList, $subject, $body, $ccList, $includeMe); + if(!empty($this->config->mail->async) and !$forceSync) return $this->addQueue($toList, $subject, $body, $ccList, $includeMe); ob_start(); diff --git a/module/user/control.php b/module/user/control.php index 522fd03042..1ca491501d 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -1119,7 +1119,7 @@ class user extends control $code = uniqid(); $this->dao->update(TABLE_USER)->set('resetToken')->eq(json_encode(array('code' => $code, 'endTime' => strtotime("+{$this->config->user->resetPasswordTimeout} minutes"))))->where('account')->eq($account)->exec(); - $result = $this->mail->send($account, $this->lang->user->resetPWD, sprintf($this->lang->mail->forgetPassword, commonModel::getSysURL() . inlink('resetPassword', 'code=' . $code)), true); + $result = $this->mail->send($account, $this->lang->user->resetPWD, sprintf($this->lang->mail->forgetPassword, commonModel::getSysURL() . inlink('resetPassword', 'code=' . $code)), '', true, array(), true); if(strstr($result, 'ERROR')) return $this->send(array('result' => 'fail', 'message' => $this->lang->user->error->sendMailFail), true); return $this->send(array('result' => 'success', 'message' => $this->lang->user->sendEmailSuccess));