Changeset 158 in subversion for trunk/roundcubemail/program/include/rcube_smtp.inc

Timestamp:

Mar 3, 2006 11:21:53 AM (7 years ago)

Author:

roundcube

Message:

Improved SMTP error handling

File:

• trunk/roundcubemail/program/include/rcube_smtp.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_smtp.inc

@@ -82 +82 @@
 
     // 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;
       }
@@ -103 +104 @@
 
           $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;
         }