diff options
| author |   Tom Knight <tomk@gentoo.org> | 2011-02-21 10:32:57 +0000 |
|---|---|---|
| committer | Tom Knight <tomk@gentoo.org> | 2011-02-21 10:32:57 +0000 |
| commit | bb869d0ae2fd92c52e179037e284e5df0f2d4b0f (patch) | |
| tree | bb4f3cf5936de4e12f7d21a03011dc4d296b6dbe | |
| parent | release date/version (diff) | |
| download | forums-bb869d0ae2fd92c52e179037e284e5df0f2d4b0f.tar.gz forums-bb869d0ae2fd92c52e179037e284e5df0f2d4b0f.tar.bz2 forums-bb869d0ae2fd92c52e179037e284e5df0f2d4b0f.zip | |
Added 'mark as spammer' to ban page to add spammer to stopforumspam.com
| -rw-r--r-- | docs/ChangeLog | 4 | ||||
| -rw-r--r-- | htdocs/admin/admin_user_ban.php | 36 | ||||
| -rw-r--r-- | htdocs/language/lang_english/lang_admin_extra.php | 2 | ||||
| -rwxr-xr-x | htdocs/templates/gentoo/admin/user_ban_body.tpl | 9 | ||||
| -rw-r--r-- | htdocs/templates/gentoo/admin/user_just_ban_body.tpl | 9 |
5 files changed, 56 insertions, 4 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index 8926eaf75..80e2c5cc8 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,7 @@ +- Added 'mark as spammer' to ban page to add spammer to stopforumspam.com (tomk) + +------------------------------------------------------------------------------- + phpBB-2-0-23-gentoo-p5 (2011-02-20) - Show hostname on ACP 'Make Includes' page (tomk) - Bugfix CIDR IP ban session dropping (desultory) diff --git a/htdocs/admin/admin_user_ban.php b/htdocs/admin/admin_user_ban.php index b29bebef7..42384bc61 100644 --- a/htdocs/admin/admin_user_ban.php +++ b/htdocs/admin/admin_user_ban.php @@ -6,7 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * - * $Id: admin_user_ban.php,v 1.15 2010/11/18 10:44:09 tomk Exp $ + * $Id: admin_user_ban.php,v 1.17 2011/01/18 12:02:12 desultory Exp $ * * ***************************************************************************/ @@ -53,6 +53,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) $email_bansql = ''; $ip_bansql = ''; $user_bbcode_snippet = '<br />'; + $is_spammer = false; $user_list = array(); if ( !empty($HTTP_POST_VARS['username']) ) @@ -74,6 +75,9 @@ if ( isset($HTTP_POST_VARS['submit']) ) // 2010-11-17 tomk - Show bbcode snippet to add to ban report topic after banning user $user_bbcode_snippet .= "<br /><tt>[*][profile=" . $this_userdata['user_id'] . "]" . htmlspecialchars($this_userdata['username']) . "[/profile] -- </tt>"; } + + // 2011-02-21 tomk - is_spammer only makes sense for users + $is_spammer = isset($HTTP_POST_VARS['is_spammer']); } $ip_list = array(); @@ -137,6 +141,28 @@ if ( isset($HTTP_POST_VARS['submit']) ) { message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql); } + + // 2011-02-21 tomk - Added 'mark as spammer' to ban page to add spammer to stopforumspam.com + if ($is_spammer) + { + include_once($phpbb_root_path . 'includes/stopforumspam.'.$phpEx); + + // get required details + $sql = "SELECT username, user_email, user_reg_ip, user_website, user_sig + FROM " . USERS_TABLE . " + WHERE user_id = " . $user_list[$i]; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select spammer information', '', __LINE__, __FILE__, $sql); + } + + $spammer = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + // post to stopforumspam API + stopforumspam_add_spammer($spammer['username'], $spammer['user_email'], decode_ip($spammer['user_reg_ip']), $pammer['user_website'], $spammer['user_sig']); + } } for($i = 0; $i < count($ip_list); $i++) @@ -305,6 +331,9 @@ else ); } + // 2011-02-21 tomk - default spammer to true if the username is already set + $is_spammer_checked = isset($HTTP_GET_VARS['username']) ? 'checked="checked"' : ''; + $hidden = $pane == '' ? '<input type="hidden" name="nopane" value="1">' : ''; $template->assign_vars(array( @@ -320,6 +349,7 @@ else 'S_REG_IP' => $HTTP_GET_VARS['reg_ip'], 'S_EMAIL' => $HTTP_GET_VARS['email'], 'S_HIDDEN' => $hidden, + 'S_IS_SPAMMER' => $is_spammer_checked, 'L_BAN_USER' => $lang['Ban_username'], 'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'], @@ -327,7 +357,9 @@ else 'L_BAN_IP' => $lang['Ban_IP'], 'L_BAN_IP_EXPLAIN' => sprintf($lang['Ban_IP_explain_cidr'], $board_config['min_cidr_block_size']), 'L_BAN_EMAIL' => $lang['Ban_email'], - 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain']) + 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'], + 'L_IS_SPAMMER' => $lang['Is_spammer'], + 'L_IS_SPAMMER_EXPLAIN' => $lang['Is_spammer_explain']) ); if ( !$just_ban ) diff --git a/htdocs/language/lang_english/lang_admin_extra.php b/htdocs/language/lang_english/lang_admin_extra.php index 5f88684df..50a3a92f2 100644 --- a/htdocs/language/lang_english/lang_admin_extra.php +++ b/htdocs/language/lang_english/lang_admin_extra.php @@ -136,4 +136,6 @@ $lang['Stopforumspam_frequency_threshold_explain'] = "The number of matches need $lang['Stopforumspam_days_threshold'] = "stopforumspam.com Days Threshold"; $lang['Stopforumspam_days_threshold_explain'] = "The number of days after which a match on stopforumspam.com is no longer valid, if empty no date checking is done."; $lang['Spammer_reason'] = 'Reason'; +$lang['Is_spammer'] = 'Spammer?'; +$lang['Is_spammer_explain'] = "Is this user a spammer and should their details be added to stopforumspam.com?"; ?> diff --git a/htdocs/templates/gentoo/admin/user_ban_body.tpl b/htdocs/templates/gentoo/admin/user_ban_body.tpl index c504796c1..f1f1a4dca 100755 --- a/htdocs/templates/gentoo/admin/user_ban_body.tpl +++ b/htdocs/templates/gentoo/admin/user_ban_body.tpl @@ -10,7 +10,14 @@ </tr> <tr> <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_BAN_USERNAME_EXPLAIN}</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" value="{S_USERNAME}"/> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td> + <td class="row2"> + <input type="text" class="post" name="username" maxlength="50" size="20" value="{S_USERNAME}"/> + <input type="hidden" name="mode" value="edit" /> + {S_HIDDEN_FIELDS} + <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /> + <br /> + {L_IS_SPAMMER}: <input type="checkbox" name="is_spammer" {S_IS_SPAMMER} /> {L_IS_SPAMMER_EXPLAIN} + </td> </tr> <tr> <th class="thHead" colspan="2">{L_UNBAN_USER}</th> diff --git a/htdocs/templates/gentoo/admin/user_just_ban_body.tpl b/htdocs/templates/gentoo/admin/user_just_ban_body.tpl index 8b6c74d89..72d0bc1a5 100644 --- a/htdocs/templates/gentoo/admin/user_just_ban_body.tpl +++ b/htdocs/templates/gentoo/admin/user_just_ban_body.tpl @@ -10,7 +10,14 @@ </tr> <tr> <td class="row1">{L_USERNAME}: <br /><span class="gensmall">{L_BAN_USERNAME_EXPLAIN}</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" value="{S_USERNAME}"/> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td> + <td class="row2"> + <input type="text" class="post" name="username" maxlength="50" size="20" value="{S_USERNAME}"/> + <input type="hidden" name="mode" value="edit" /> + {S_HIDDEN_FIELDS} + <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /> + <br /> + {L_IS_SPAMMER}: <input type="checkbox" name="is_spammer" {S_IS_SPAMMER} /> {L_IS_SPAMMER_EXPLAIN} + </td> </tr> <tr> <th class="thHead" colspan="2">{L_BAN_IP}</th> |