diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-12-28 16:40:07 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-12-28 16:40:07 +0100 |
| commit | 5cc1eb27c7dfb5f6124a128dda37f65c1e826668 (patch) | |
| tree | 6992871c03bc093fd98b158e47caabecd8140b4f /phpBB/includes/functions_messenger.php | |
| parent | a45f03a5af4f25fb5e8477af3d37a9089555a719 (diff) | |
| parent | 82fff947c641665b80941814813e07e898a7676c (diff) | |
| download | forums-5cc1eb27c7dfb5f6124a128dda37f65c1e826668.tar forums-5cc1eb27c7dfb5f6124a128dda37f65c1e826668.tar.gz forums-5cc1eb27c7dfb5f6124a128dda37f65c1e826668.tar.bz2 forums-5cc1eb27c7dfb5f6124a128dda37f65c1e826668.tar.xz forums-5cc1eb27c7dfb5f6124a128dda37f65c1e826668.zip | |
Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympus
* bantu/ticket/10538:
[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 91b361183c..6549693333 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -568,7 +568,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()) { @@ -769,7 +769,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()) { @@ -1022,7 +1022,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; |