diff options
| -rw-r--r-- | program/include/rcube_smtp.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc index d3376328f..56a4e9894 100644 --- a/program/include/rcube_smtp.inc +++ b/program/include/rcube_smtp.inc @@ -91,13 +91,13 @@ function smtp_mail($from, $recipients, $headers, &$body) // attempt to authenticate to the SMTP server if ($CONFIG['smtp_user'] && $CONFIG['smtp_pass']) { - if ($CONFIG['smtp_user'] == '%u') - $smtp_user = $_SESSION['username']; + if (strstr($CONFIG['smtp_user'], '%u')) + $smtp_user = str_replace('%u', $_SESSION['username'], $CONFIG['smtp_user']); else $smtp_user = $CONFIG['smtp_user']; - - if ($CONFIG['smtp_pass'] == '%p') - $smtp_pass = decrypt_passwd($_SESSION['password']); + + if (strstr($CONFIG['smtp_pass'], '%p')) + $smtp_pass = str_replace('%p', decrypt_passwd($_SESSION['password']), $CONFIG['smtp_pass']); else $smtp_pass = $CONFIG['smtp_pass']; |