makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10446] DRY X-AntiAbuse header addition.

Browse source 
PHPBB3-10446
This commit is contained in:
Oleg Pudeyev 2011-11-20 04:15:44 -05:00
parent 6155707071
commit 64d62038cd
10 changed files with 26 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/acp/acp_email.php
View file

@ -195,10 +195,7 @@ class acp_email
$messenger->template('admin_send_email', $used_lang); $messenger->template('admin_send_email', $used_lang);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->subject(htmlspecialchars_decode($subject)); $messenger->subject(htmlspecialchars_decode($subject));
$messenger->set_mail_priority($priority); $messenger->set_mail_priority($priority);

10
phpBB/includes/acp/acp_inactive.php
View file

@ -118,10 +118,7 @@ class acp_inactive
$messenger->to($row['user_email'], $row['username']); $messenger->to($row['user_email'], $row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username'])) 'USERNAME' => htmlspecialchars_decode($row['username']))
@ -209,10 +206,7 @@ class acp_inactive
$messenger->to($row['user_email'], $row['username']); $messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']); $messenger->im($row['user_jabber'], $row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']), 'USERNAME' => htmlspecialchars_decode($row['username']),

10
phpBB/includes/acp/acp_users.php
View file

@ -348,10 +348,7 @@ class acp_users
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@ -406,10 +403,7 @@ class acp_users
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username'])) 'USERNAME' => htmlspecialchars_decode($user_row['username']))

12
phpBB/includes/functions_messenger.php
View file

@ -162,6 +162,18 @@ class messenger
$this->extra_headers[] = trim($headers); $this->extra_headers[] = trim($headers);
} }
/**
* Adds X-AntiAbuse headers
*/
function anti_abuse_headers($headers)
{
global $config, $user;
$this->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$this->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$this->headers('X-AntiAbuse: User IP - ' . $user->ip);
}
/** /**
* Set the email priority * Set the email priority
*/ */

5
phpBB/includes/ucp/ucp_activate.php
View file

@ -117,10 +117,7 @@ class ucp_activate
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username'])) 'USERNAME' => htmlspecialchars_decode($user_row['username']))

5
phpBB/includes/ucp/ucp_profile.php
View file

@ -150,10 +150,7 @@ class ucp_profile
$messenger->to($data['email'], $data['username']); $messenger->to($data['email'], $data['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($data['username']), 'USERNAME' => htmlspecialchars_decode($data['username']),

5
phpBB/includes/ucp/ucp_register.php
View file

@ -366,10 +366,7 @@ class ucp_register
$messenger->to($data['email'], $data['username']); $messenger->to($data['email'], $data['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),

10
phpBB/includes/ucp/ucp_resend.php
View file

@ -94,10 +94,7 @@ class ucp_resend
$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); $messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']); $messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@ -133,10 +130,7 @@ class ucp_resend
$messenger->to($row['user_email'], $row['username']); $messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']); $messenger->im($row['user_jabber'], $row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username']), 'USERNAME' => htmlspecialchars_decode($user_row['username']),

5
phpBB/install/install_install.php
View file

@ -1945,10 +1945,7 @@ class install_install extends module
$messenger->to($data['board_email1'], $data['admin_name']); $messenger->to($data['board_email1'], $data['admin_name']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($data['admin_name']), 'USERNAME' => htmlspecialchars_decode($data['admin_name']),

5
phpBB/memberlist.php
View file

@ -899,10 +899,7 @@ switch ($mode)
$notify_type = NOTIFY_EMAIL; $notify_type = NOTIFY_EMAIL;
} }
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->anti_abuse_headers();
$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'BOARD_CONTACT' => $config['board_contact'], 'BOARD_CONTACT' => $config['board_contact'],