diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-02-15 04:52:32 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-02-15 04:52:32 +0000 |
| commit | e18d7df6c047970cb95136a0e373e80dee3b7492 (patch) | |
| tree | 79d29e5ed728046eaa0f5f70706db5cbf17490ad /phpBB | |
| parent | 3167a09b9c16f30b88d29fd00cf3416b6c8d71ed (diff) | |
| download | forums-e18d7df6c047970cb95136a0e373e80dee3b7492.tar forums-e18d7df6c047970cb95136a0e373e80dee3b7492.tar.gz forums-e18d7df6c047970cb95136a0e373e80dee3b7492.tar.bz2 forums-e18d7df6c047970cb95136a0e373e80dee3b7492.tar.xz forums-e18d7df6c047970cb95136a0e373e80dee3b7492.zip | |
Add anti-abuse email headers to acp_inactive.php and correct activation reminders
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9327 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 499c88aa96..26fe6261ce 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -99,6 +99,8 @@ <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] Only remind users in the correct inactive states depending on the board account activation level.</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 5683ae5dab..a38b47a704 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -111,6 +111,7 @@ class acp_inactive $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($row['username'])) @@ -161,7 +162,11 @@ class acp_inactive $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $mark); + WHERE ' . $db->sql_in_set('user_id', $mark) . ' + AND user_inactive_reason'; + + $sql .= ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? ' = ' . INACTIVE_REMIND : ' <> ' . INACTIVE_MANUAL; + $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -179,9 +184,14 @@ class acp_inactive $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($row['username']), - 'REGISTER_DATE' => $user->format_date($row['user_regdate']), + 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey']) ); |