From 71598c875ef44817035acbbc2016b6d9cdf9203b Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Sun, 5 May 2013 02:29:51 +0000 Subject: [PATCH] * adjust the smtp error messages. --- .../language/phpmailer.lang-zh-cn.php | 2 +- .../language/phpmailer.lang-zh-tw.php | 18 +++++++++--------- lib/phpmailer/phpmailer.class.php | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/phpmailer/language/phpmailer.lang-zh-cn.php b/lib/phpmailer/language/phpmailer.lang-zh-cn.php index ba73c9f33b..a682bd0e02 100644 --- a/lib/phpmailer/language/phpmailer.lang-zh-cn.php +++ b/lib/phpmailer/language/phpmailer.lang-zh-cn.php @@ -6,7 +6,7 @@ */ $PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。\n请检查您设置的用户名密码是否正确。\n有的系统登录用户名是完整的邮箱地址。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。\n请确认禅道所在的机器能够访问smtp服务器，\n确认域名解析是否正常，端口号是否正确，防火墙是否正常。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机，请确认禅道机器：\n1. 能ping通smtp服务器；\n2. 使用telnet 命令能够连接到smtp的发信端口;\n3. 如果上述步骤都是通的，windows请检查防火墙设置，linux请关闭selnux或者执行"setsebool httpd_can_sendmail true"允许apache可以发信。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; //$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; $PHPMAILER_LANG['encoding'] = '未知编码: '; diff --git a/lib/phpmailer/language/phpmailer.lang-zh-tw.php b/lib/phpmailer/language/phpmailer.lang-zh-tw.php index fef66f8cb1..baf374295b 100644 --- a/lib/phpmailer/language/phpmailer.lang-zh-tw.php +++ b/lib/phpmailer/language/phpmailer.lang-zh-tw.php @@ -1,26 +1,26 @@ */ -$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機。'; +$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。\n請檢查您設置的用戶名密碼是否正確。\n有的系統登錄用戶名是完整的郵箱地址。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機，請確認禪道機器：\n1. 能ping通smtp伺服器；\n2. 使用telnet 命令能夠連接到smtp的發信連接埠;\n3. 如果上述步驟都是通的，windows請檢查防火牆設置，linux請關閉selnux或者執行"setsebool httpd_can_sendmail true"允許apache可以發信。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤：數據不被接受。'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +//$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; $PHPMAILER_LANG['encoding'] = '未知編碼: '; -$PHPMAILER_LANG['file_access'] = '無法訪問文件：'; -$PHPMAILER_LANG['file_open'] = '文件錯誤：無法打開文件：'; -$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：'; $PHPMAILER_LANG['execute'] = '無法執行：'; +$PHPMAILER_LANG['file_access'] = '無法訪問檔案：'; +$PHPMAILER_LANG['file_open'] = '檔案錯誤：無法打開檔案：'; +$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：'; $PHPMAILER_LANG['instantiate'] = '未知函數調用。'; //$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。'; $PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。'; +$PHPMAILER_LANG['provide_address'] = '收件人沒有設置郵箱，請到組織視圖中檢查下相應用戶的email設置。'; $PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤：收件人地址錯誤：'; //$PHPMAILER_LANG['signing'] = 'Signing Error: '; //$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; //$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; //$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file +?> diff --git a/lib/phpmailer/phpmailer.class.php b/lib/phpmailer/phpmailer.class.php index 09479239bf..b3f0814b82 100644 --- a/lib/phpmailer/phpmailer.class.php +++ b/lib/phpmailer/phpmailer.class.php @@ -858,7 +858,7 @@ class PHPMailer { 'from_failed' => 'The following From address failed: ', 'recipients_failed' => 'SMTP Error: The following recipients failed: ', 'data_not_accepted' => 'SMTP Error: Data not accepted.', - 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', + 'connect_host' => 'SMTP Error: Could not connect to SMTP host. Please make user the zentao host:\n 1. ping the smtp host ok;\n 2. telnet the smtp port to smtp host ok;\n 3. If ping and telnet are ok, checking firewall under window, turn off selnux or "setsebool httpd_can_sendmail true" to allow apache to send mail under linux.', 'file_access' => 'Could not access file: ', 'file_open' => 'File Error: Could not open file: ', 'encoding' => 'Unknown encoding: ', @@ -2317,4 +2317,4 @@ class phpmailerException extends Exception { return $errorMsg; } } -?> \ No newline at end of file +?>