Imported Upstream version 0.2~alpha

[roundcube.git] / program / include / rcube_smtp.inc

diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 55ac8f5a370350780152135e25f474e86436ea5b..6049418f3ee6e5d5c1cf3a6894a8754b324aafd4 100644 (file)
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_smtp.inc 805 2007-09-20 13:36:57Z robin $
+ $Id: rcube_smtp.inc 1360 2008-05-07 09:38:44Z thomasb $
 
 */
 
@@ -55,26 +55,26 @@ $SMTP_CONN = null;
  */
 function smtp_mail($from, $recipients, &$headers, &$body, &$response)
   {
-  global $SMTP_CONN, $CONFIG;
+  global $SMTP_CONN, $CONFIG, $RCMAIL;
   $smtp_timeout = null;
   $smtp_host = $CONFIG['smtp_server'];
   $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
   $smtp_host_url = parse_url($CONFIG['smtp_server']);
   
   // overwrite port
-  if ($smtp_host_url['host'] && $smtp_host_url['port'])
+  if (isset($smtp_host_url['host']) && isset($smtp_host_url['port']))
     {
     $smtp_host = $smtp_host_url['host'];
     $smtp_port = $smtp_host_url['port'];
     }
 
   // re-write smtp host
-  if ($smtp_host_url['host'] && $smtp_host_url['scheme'])
+  if (isset($smtp_host_url['host']) && isset($smtp_host_url['scheme']))
     $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
 
 
   // create Net_SMTP object and connect to server
-  if (!is_object($smtp_conn))
+  if (!is_object($SMTP_CONN))
     {
     $helo_host = empty($CONFIG['smtp_helo_host']) ? (empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME']) : $CONFIG['smtp_helo_host'];
     $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
@@ -102,7 +102,7 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response)
         $smtp_user = $CONFIG['smtp_user'];
 
       if (strstr($CONFIG['smtp_pass'], '%p'))
-        $smtp_pass = str_replace('%p', decrypt_passwd($_SESSION['password']), $CONFIG['smtp_pass']);
+        $smtp_pass = str_replace('%p', $RCMAIL->decrypt_passwd($_SESSION['password']), $CONFIG['smtp_pass']);
       else
         $smtp_pass = $CONFIG['smtp_pass'];
 
@@ -112,7 +112,7 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response)
       if (PEAR::isError($result))
         {
         smtp_reset();
-        $response[] .= "Authentication failure: ".$result->getMessage();
+        $response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
         return FALSE;
         }
       }