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 bbc886923e54c6a7edab4505b7ca8872def2318e..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 1136 2008-02-25 10:17:35Z till $
+ $Id: rcube_smtp.inc 1360 2008-05-07 09:38:44Z thomasb $
 
 */
 
@@ -55,7 +55,7 @@ $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;
@@ -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'];