diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-06 19:37:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-06 19:37:09 +0000 |
| commit | 48b76be50b4f7c9e6e5a627887534d9115419afd (patch) | |
| tree | 0f54a3d68a5f6d541f1ff26b07e4e6da034622a9 /phpBB/includes/functions_messenger.php | |
| parent | 962be6ed09bc19bb255e3e9bbe0194831a922f5c (diff) | |
| download | forums-48b76be50b4f7c9e6e5a627887534d9115419afd.tar forums-48b76be50b4f7c9e6e5a627887534d9115419afd.tar.gz forums-48b76be50b4f7c9e6e5a627887534d9115419afd.tar.bz2 forums-48b76be50b4f7c9e6e5a627887534d9115419afd.tar.xz forums-48b76be50b4f7c9e6e5a627887534d9115419afd.zip | |
tiny alterations
git-svn-id: file:///svn/phpbb/trunk@6846 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a9e6011b8c..8ee887e09b 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -821,6 +821,11 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') // Ok we have error checked as much as we can to this point let's get on it already. if (!$smtp->socket = @fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20)) { + if ($errstr) + { + $errstr = utf8_convert_message($errstr); + } + $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; return false; } @@ -1062,6 +1067,11 @@ class smtp_class // able to get our ip for matching... if (!$this->socket = @fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 10)) { + if ($errstr) + { + $errstr = utf8_convert_message($errstr); + } + $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; return $err_msg; } @@ -1152,6 +1162,11 @@ class smtp_class if (!$this->socket = @fsockopen($hostname, 110, $errno, $errstr, 10)) { + if ($errstr) + { + $errstr = utf8_convert_message($errstr); + } + return (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; } |