diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-12-28 16:41:38 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-12-28 16:41:38 +0100 |
| commit | 96114f7e3575683143bca733bb2c527408005348 (patch) | |
| tree | ed7b79b8ad647f9617b962bed3b3cfc712f29afa /phpBB/includes/functions_messenger.php | |
| parent | 7e3724c3e1befd0dc2853dd00b30d55ca65bdb93 (diff) | |
| parent | 5cc1eb27c7dfb5f6124a128dda37f65c1e826668 (diff) | |
| download | forums-96114f7e3575683143bca733bb2c527408005348.tar forums-96114f7e3575683143bca733bb2c527408005348.tar.gz forums-96114f7e3575683143bca733bb2c527408005348.tar.bz2 forums-96114f7e3575683143bca733bb2c527408005348.tar.xz forums-96114f7e3575683143bca733bb2c527408005348.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 4797da5398..24b8591f3b 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -570,7 +570,7 @@ class messenger if (!$use_queue) { include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']); + $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], htmlspecialchars_decode($config['jab_password']), $config['jab_use_ssl']); if (!$this->jabber->connect()) { @@ -771,7 +771,7 @@ class queue } include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']); + $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], htmlspecialchars_decode($config['jab_password']), $config['jab_use_ssl']); if (!$this->jabber->connect()) { @@ -1024,7 +1024,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false) } // Let me in. This function handles the complete authentication process - if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], $config['smtp_password'], $config['smtp_auth_method'])) + if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], htmlspecialchars_decode($config['smtp_password']), $config['smtp_auth_method'])) { $smtp->close_session($err_msg); return false; |