aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_jabber.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-14 14:06:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-14 14:06:23 +0000
commit09f6cf11dd16893eea6836175773454a382f04df (patch)
tree0f629179ea004d22e9f1dddb5e623163eb9e8e81 /phpBB/includes/functions_jabber.php
parent052025bb1f144337952236c5c4774826818037d4 (diff)
downloadforums-09f6cf11dd16893eea6836175773454a382f04df.tar
forums-09f6cf11dd16893eea6836175773454a382f04df.tar.gz
forums-09f6cf11dd16893eea6836175773454a382f04df.tar.bz2
forums-09f6cf11dd16893eea6836175773454a382f04df.tar.xz
forums-09f6cf11dd16893eea6836175773454a382f04df.zip
- correct jabber token handling
- undisclosed-recipients:; instead of undisclosed-recipient:; - PM details button should not be there git-svn-id: file:///svn/phpbb/trunk@8090 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
-rw-r--r--phpBB/includes/functions_jabber.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 6297dac4bf..e15033b7e0 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -499,6 +499,13 @@ class jabber
}
else
{
+ // Make sure we only use 'auth' for qop (relevant for $this->encrypt_password())
+ // If the <response> is choking up on the changed parameter we may need to adjust encrypt_password() directly
+ if (isset($decoded['qop']) && $decoded['qop'] != 'auth' && strpos($decoded['qop'], 'auth') !== false)
+ {
+ $decoded['qop'] = 'auth';
+ }
+
$response = array(
'username' => $this->username,
'response' => $this->encrypt_password(array_merge($decoded, array('nc' => '00000001'))),