* finish task #1967.

This commit is contained in:
wangyidong
2014-07-29 01:09:28 +00:00
parent 5696caf06f
commit 4ae0876ba3
3 changed files with 5 additions and 0 deletions

View File

@@ -42,3 +42,4 @@ $lang->mail->content = 'If you can see this, the email notification featu
$lang->mail->successSended = 'Successfully sended!';
$lang->mail->sendmailTips = 'Tips: system will not send mail to current user.';
$lang->mail->needConfigure = "I can not find the configuration, please configure it first.";
$lang->mail->nofsocket = 'The fsocket correlation function is disabled, not letter!';

View File

@@ -42,3 +42,4 @@ $lang->mail->content = '邮箱设置成功';
$lang->mail->successSended = '成功发送!';
$lang->mail->sendmailTips = '提示:系统不会为当前操作者发信。';
$lang->mail->needConfigure = '无法找到邮件配置信息,请先配置邮件发送参数。';
$lang->mail->nofsocket = 'fsocket相关函数被禁用不能发信';

View File

@@ -243,6 +243,9 @@ class mailModel extends model
{
if(!$this->config->mail->turnon) return;
/* Task #1967. check the function of fsocket. */
if(function_exists('fsockopen')) die(js::alert($this->lang->mail->nofsocket));
ob_start();
$toList = $toList ? explode(',', str_replace(' ', '', $toList)) : array();
$ccList = $ccList ? explode(',', str_replace(' ', '', $ccList)) : array();