diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-11-20 18:45:56 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-11-20 18:45:56 +0100 |
| commit | d766ee3fe65924aa8379ef0672b2f52315415612 (patch) | |
| tree | 480e8a3399691ca0c8633b92775205ea9a7475c8 /phpBB/includes/ucp/ucp_resend.php | |
| parent | 08032068c0b8d6ebe36484603a6d9b61608e222e (diff) | |
| parent | 92e1681761d83db426de1176f48d37ad30c14acf (diff) | |
| download | forums-d766ee3fe65924aa8379ef0672b2f52315415612.tar forums-d766ee3fe65924aa8379ef0672b2f52315415612.tar.gz forums-d766ee3fe65924aa8379ef0672b2f52315415612.tar.bz2 forums-d766ee3fe65924aa8379ef0672b2f52315415612.tar.xz forums-d766ee3fe65924aa8379ef0672b2f52315415612.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
[ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
[ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
[ticket/10446] DRY X-AntiAbuse header addition.
Conflicts:
phpBB/includes/ucp/ucp_register.php
Diffstat (limited to 'phpBB/includes/ucp/ucp_resend.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_resend.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 66677b9a4f..ab4f699668 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($config, $user); $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($config, $user); $messenger->assign_vars(array( 'USERNAME' => htmlspecialchars_decode($user_row['username']), |