aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-20 04:15:44 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-20 04:15:44 -0500
commit64d62038cd8e2e69eb101c5256ea458cff98ae10 (patch)
tree604188118275a8519a0e2eeea051e8086e30271d /phpBB/includes/ucp/ucp_resend.php
parentMerge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus (diff)
downloadphpbb-64d62038cd8e2e69eb101c5256ea458cff98ae10.tar.gz
phpbb-64d62038cd8e2e69eb101c5256ea458cff98ae10.tar.bz2
phpbb-64d62038cd8e2e69eb101c5256ea458cff98ae10.zip
[ticket/10446] DRY X-AntiAbuse header addition.
PHPBB3-10446
Diffstat (limited to 'phpBB/includes/ucp/ucp_resend.php')
-rw-r--r--phpBB/includes/ucp/ucp_resend.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 39e9be24a1..c1f9effb01 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -94,10 +94,7 @@ class ucp_resend
$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']);
- $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
- $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->anti_abuse_headers();
$messenger->assign_vars(array(
'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->im($row['user_jabber'], $row['username']);
- $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
- $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->anti_abuse_headers();
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username']),