mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

- correct jabber token handling

Browse Source 
- 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
This commit is contained in:
Meik Sievertsen
2007-09-14 14:06:23 +00:00
parent 052025bb1f
commit 09f6cf11dd
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_jabber.php
View File

@@ -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'))),

6
phpBB/includes/functions_messenger.php
View File

@@ -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.

1
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -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&amp;action=msnm&amp;u=' . $author_id) : '',
'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
'U_INFO' => ($auth->acl_get('m_info') && $message_row['pm_forwarded']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'mode=pm_details&amp;p=' . $message_row['msg_id'], true, $user->session_id) : '',
'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
'U_EMAIL' => $user_info['email'],
'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&amp;mode=compose&amp;action=quote&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',