summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2006-03-03 16:21:53 +0000
committerthomascube <thomas@roundcube.net>2006-03-03 16:21:53 +0000
commit8eba3000888d596263eb2b8923dacd20cd816878 (patch)
tree75ecb0cf5494e9338953b0d592945e274162825f /program
parent4b6d84661eeee82ab2edf475977c7f96b117a52b (diff)
Improved SMTP error handling
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_smtp.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 56a4e9894..63cdc1e58 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -81,10 +81,11 @@ function smtp_mail($from, $recipients, $headers, &$body)
// try to connect to server and exit on failure
- if (PEAR::isError($SMTP_CONN->connect($smtp_timeout)))
+ $result = $SMTP_CONN->connect($smtp_timeout);
+ if (PEAR::isError($result))
{
$SMTP_CONN = null;
- $SMTP_ERROR .= "Connection failed\n";
+ $SMTP_ERROR .= "Connection failed: ".$result->getMessage()."\n";
return FALSE;
}
@@ -102,11 +103,12 @@ function smtp_mail($from, $recipients, $headers, &$body)
$smtp_pass = $CONFIG['smtp_pass'];
$smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
-
- if (PEAR::isError($SMTP_CONN->auth($smtp_user, $smtp_pass, $smtp_auth_type)))
+ $result = $SMTP_CONN->auth($smtp_user, $smtp_pass, $smtp_auth_type);
+
+ if (PEAR::isError($result))
{
smtp_reset();
- $SMTP_ERROR .= "authentication failure\n";
+ $SMTP_ERROR .= "Authentication failure: ".$result->getMessage()."\n";
return FALSE;
}
}