diff options
author | Chris Smith <toonarmy@phpbb.com> | 2009-02-23 17:53:24 +0000 |
---|---|---|
committer | Chris Smith <toonarmy@phpbb.com> | 2009-02-23 17:53:24 +0000 |
commit | 52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb (patch) | |
tree | e0ed97355e293ec30d9255bbb297cf4eac2188b0 | |
parent | f42fe3b024861d20b99272d9c1dc56b81974a753 (diff) | |
download | forums-52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb.tar forums-52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb.tar.gz forums-52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb.tar.bz2 forums-52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb.tar.xz forums-52d0f2fa3c575df32c64bb0c0dddfbd62dc88afb.zip |
Add correct antiabuse headers and fix #41935
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9339 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_resend.php | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 803548e9b6..7329fc1449 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -99,7 +99,7 @@ <li>[Fix] Whois now works reliably for RIRs other than APNIC and RIPE</li> <li>[Fix] Correctly convert Niels' Birthday MOD to the date format used in phpBB3. (Bug #32895)</li> <li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li> - <li>[Fix] Add missing anti-abuse email headers to acp_inactive.php.</li> + <li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li> <li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li> <li>[Fix] Topic print view XHTML error. (Bug #41745)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 48176a3989..cad494541b 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -133,6 +133,11 @@ 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->assign_vars(array( 'USERNAME' => htmlspecialchars_decode($user_row['username']), 'U_USER_DETAILS' => generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", @@ -146,7 +151,7 @@ class ucp_resend meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT']; + $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT']; $message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>'); trigger_error($message); } |