From 6c76c91951d259f59b2b7a42b8fe895dcc0ef21b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 23 Aug 2006 17:36:37 -0400
Subject: [PATCH] Updated Polish, Portuguese, Latvian, Chinese and Japanese localization
---
program/include/rcube_smtp.inc | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 56a4e98..3108675 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -49,7 +49,7 @@
* @return bool Returns TRUE on success, or FALSE on error
* @access public
*/
-function smtp_mail($from, $recipients, $headers, &$body)
+function smtp_mail($from, $recipients, &$headers, &$body)
{
global $SMTP_CONN, $CONFIG, $SMTP_ERROR;
$smtp_timeout = null;
@@ -81,10 +81,11 @@
// 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 @@
$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;
}
}
--
Gitblit v1.9.1