diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
| commit | 75a51629454e971fd85118647d05a2a7f39931ad (patch) | |
| tree | 2a22645ce7b2ccfdbe62b85515f252af3cd9e131 /phpBB/includes/functions_messenger.php | |
| parent | 870991c0608caf7467018245a0a4e1f1d55efd12 (diff) | |
| download | forums-75a51629454e971fd85118647d05a2a7f39931ad.tar forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.gz forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.bz2 forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.xz forums-75a51629454e971fd85118647d05a2a7f39931ad.zip | |
again, a lot of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index b2cb5ec054..bd838a3346 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -26,7 +26,9 @@ class messenger */ function messenger($use_queue = true) { - $this->use_queue = $use_queue; + global $config; + + $this->use_queue = (!$config['email_package_size']) ? false : $use_queue; $this->subject = ''; } @@ -287,6 +289,7 @@ class messenger if ($config['email_package_size'] && $this->use_queue && !empty($this->queue)) { $this->queue->save(); + return; } } @@ -819,7 +822,11 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') $smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']); // 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)) + ob_start(); + $smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20); + $error_contents = ob_get_clean(); + + if (!$smtp->socket) { if ($errstr) { @@ -827,6 +834,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') } $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"; + $err_msg .= ($error_contents) ? '<br /><br />' . htmlspecialchars($error_contents) : ''; return false; } |