summaryrefslogtreecommitdiff
path: root/program/include/rcube_smtp.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-05-07 09:38:44 +0000
committerthomascube <thomas@roundcube.net>2008-05-07 09:38:44 +0000
commit1854c4525bf1fce227a8cc0fa8aad06615df0eae (patch)
tree8af3b7c4ebcd34d037337688828f5091c1c39149 /program/include/rcube_smtp.inc
parenteb774cc6eb2818a1bdeae6c316024f93c2533d4e (diff)
More code cleanup + oop-ization
Diffstat (limited to 'program/include/rcube_smtp.inc')
-rw-r--r--program/include/rcube_smtp.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 2c474746d..4e5449075 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -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'];