From 72cd3c1a761fad73235cad32f240a114ba2941aa Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 7 Jul 2009 08:36:42 +0000 Subject: - Support %h variable in 'smtp_server' option (#1485766) --- program/include/rcube_smtp.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/include/rcube_smtp.inc') diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc index 066e5ed47..db681af05 100644 --- a/program/include/rcube_smtp.inc +++ b/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