diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-01-19 22:48:40 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-01-19 22:48:40 +0000 |
| commit | 989d48becf500b8cd73b04e3155f2d6403eecc0d (patch) | |
| tree | 349f8d37cfd85601cba4ceeb53a31d2c78f32367 | |
| parent | 1dfb4178085bff1adb6e75f4ccfd623cf7e99bc2 (diff) | |
Use str_replace for %u and %p in SMTP authorization
git-svn-id: https://svn.roundcube.net/trunk@113 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/rcube_smtp.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc index d3376328f..56a4e9894 100644 --- a/roundcubemail/program/include/rcube_smtp.inc +++ b/roundcubemail/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']; |