From 55200135e3eac05c9d307d2a733aff02c87faf61 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 7 Jul 2009 08:36:42 +0000 Subject: - Support %h variable in 'smtp_server' option (#1485766) git-svn-id: https://svn.roundcube.net/trunk@2717 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_smtp.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc index 066e5ed47..db681af05 100644 --- a/roundcubemail/program/include/rcube_smtp.inc +++ b/roundcubemail/program/include/rcube_smtp.inc @@ -64,10 +64,10 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response, &$error) )); $smtp_timeout = null; - $smtp_host = $CONFIG['smtp_server']; + $smtp_host = str_replace('%h', $_SESSION['imap_host'], $CONFIG['smtp_server']); $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25; - $smtp_host_url = parse_url($CONFIG['smtp_server']); - + $smtp_host_url = parse_url($smtp_host); + // overwrite port if (isset($smtp_host_url['host']) && isset($smtp_host_url['port'])) { -- cgit v1.2.3