diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-14 14:06:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-14 14:06:23 +0000 |
| commit | 09f6cf11dd16893eea6836175773454a382f04df (patch) | |
| tree | 0f629179ea004d22e9f1dddb5e623163eb9e8e81 | |
| parent | 052025bb1f144337952236c5c4774826818037d4 (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2079497236..16082c203c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -208,6 +208,7 @@ p a { <li>[Feature] Added /includes/db/db_tools.php file, which includes tools for handling cross-db actions such as altering columns, etc.</li> <li>[Change] Reset the start parameter when the timeframe is changed in the mcp topic page (Ticket #14438)</li> <li>[Change] Added Code for cleaning the confirm table to the session garbage collection</li> + <li>[Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)</li> </ul> </div> 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'))), diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 90413d80de..30d2a6fc30 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -394,7 +394,7 @@ class messenger // Send message ... if (!$use_queue) { - $mail_to = ($to == '') ? 'Undisclosed-Recipient:;' : $to; + $mail_to = ($to == '') ? 'undisclosed-recipients:;' : $to; $err_msg = ''; if ($config['smtp_delivery']) @@ -629,7 +629,7 @@ class queue { case 'email': $err_msg = ''; - $to = (!$to) ? 'Undisclosed-Recipient:;' : $to; + $to = (!$to) ? 'undisclosed-recipients:;' : $to; if ($config['smtp_delivery']) { @@ -922,7 +922,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') $smtp->server_send("Subject: $subject"); // Now the To Header. - $to_header = ($to_header == '') ? 'Undisclosed-Recipients:;' : $to_header; + $to_header = ($to_header == '') ? 'undisclosed-recipients:;' : $to_header; $smtp->server_send("To: $to_header"); // Now the CC Header. diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 24571bec19..9a3f3e8bc3 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -199,7 +199,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'U_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $author_id) : '', 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', - 'U_INFO' => ($auth->acl_get('m_info') && $message_row['pm_forwarded']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'mode=pm_details&p=' . $message_row['msg_id'], true, $user->session_id) : '', 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_EMAIL' => $user_info['email'], 'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=quote&f=$folder_id&p=" . $message_row['msg_id'] : '', diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html index a8c60a09b3..9b41965fd8 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html @@ -93,7 +93,7 @@ <table width="100%" cellspacing="0"> <tr valign="middle"> - <td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_INFO --><a href="{U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> + <td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td> </tr> </table> |