Gentoo Archives: gentoo-commits

From: "Tom Knight (tomk)" <tomk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_user_ban.php
Date: Mon, 21 Feb 2011 10:33:08
Message-Id: 20110221103257.A70B320057@flycatcher.gentoo.org
1 tomk 11/02/21 10:32:57
2
3 Modified: admin_user_ban.php
4 Log:
5 Added 'mark as spammer' to ban page to add spammer to stopforumspam.com
6
7 Revision Changes Path
8 1.18 forums/htdocs/admin/admin_user_ban.php
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?rev=1.18&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?rev=1.18&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_user_ban.php?r1=1.17&r2=1.18
13
14 Index: admin_user_ban.php
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_user_ban.php,v
17 retrieving revision 1.17
18 retrieving revision 1.18
19 diff -u -r1.17 -r1.18
20 --- admin_user_ban.php 18 Jan 2011 12:02:12 -0000 1.17
21 +++ admin_user_ban.php 21 Feb 2011 10:32:57 -0000 1.18
22 @@ -6,7 +6,7 @@
23 * copyright : (C) 2001 The phpBB Group
24 * email : support@×××××.com
25 *
26 - * $Id: admin_user_ban.php,v 1.17 2011/01/18 12:02:12 desultory Exp $
27 + * $Id: admin_user_ban.php,v 1.18 2011/02/21 10:32:57 tomk Exp $
28 *
29 *
30 ***************************************************************************/
31 @@ -53,6 +53,7 @@
32 $email_bansql = '';
33 $ip_bansql = '';
34 $user_bbcode_snippet = '<br />';
35 + $is_spammer = false;
36
37 $user_list = array();
38 if ( !empty($HTTP_POST_VARS['username']) )
39 @@ -74,6 +75,9 @@
40 // 2010-11-17 tomk - Show bbcode snippet to add to ban report topic after banning user
41 $user_bbcode_snippet .= "<br /><tt>[*][profile=" . $this_userdata['user_id'] . "]" . htmlspecialchars($this_userdata['username']) . "[/profile] --&nbsp;</tt>";
42 }
43 +
44 + // 2011-02-21 tomk - is_spammer only makes sense for users
45 + $is_spammer = isset($HTTP_POST_VARS['is_spammer']);
46 }
47
48 $ip_list = array();
49 @@ -137,6 +141,28 @@
50 {
51 message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
52 }
53 +
54 + // 2011-02-21 tomk - Added 'mark as spammer' to ban page to add spammer to stopforumspam.com
55 + if ($is_spammer)
56 + {
57 + include_once($phpbb_root_path . 'includes/stopforumspam.'.$phpEx);
58 +
59 + // get required details
60 + $sql = "SELECT username, user_email, user_reg_ip, user_website, user_sig
61 + FROM " . USERS_TABLE . "
62 + WHERE user_id = " . $user_list[$i];
63 +
64 + if ( !($result = $db->sql_query($sql)) )
65 + {
66 + message_die(GENERAL_ERROR, 'Could not select spammer information', '', __LINE__, __FILE__, $sql);
67 + }
68 +
69 + $spammer = $db->sql_fetchrow($result);
70 + $db->sql_freeresult($result);
71 +
72 + // post to stopforumspam API
73 + stopforumspam_add_spammer($spammer['username'], $spammer['user_email'], decode_ip($spammer['user_reg_ip']), $pammer['user_website'], $spammer['user_sig']);
74 + }
75 }
76
77 for($i = 0; $i < count($ip_list); $i++)
78 @@ -305,6 +331,9 @@
79 );
80 }
81
82 + // 2011-02-21 tomk - default spammer to true if the username is already set
83 + $is_spammer_checked = isset($HTTP_GET_VARS['username']) ? 'checked="checked"' : '';
84 +
85 $hidden = $pane == '' ? '<input type="hidden" name="nopane" value="1">' : '';
86
87 $template->assign_vars(array(
88 @@ -320,6 +349,7 @@
89 'S_REG_IP' => $HTTP_GET_VARS['reg_ip'],
90 'S_EMAIL' => $HTTP_GET_VARS['email'],
91 'S_HIDDEN' => $hidden,
92 + 'S_IS_SPAMMER' => $is_spammer_checked,
93
94 'L_BAN_USER' => $lang['Ban_username'],
95 'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'],
96 @@ -327,7 +357,9 @@
97 'L_BAN_IP' => $lang['Ban_IP'],
98 'L_BAN_IP_EXPLAIN' => sprintf($lang['Ban_IP_explain_cidr'], $board_config['min_cidr_block_size']),
99 'L_BAN_EMAIL' => $lang['Ban_email'],
100 - 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'])
101 + 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'],
102 + 'L_IS_SPAMMER' => $lang['Is_spammer'],
103 + 'L_IS_SPAMMER_EXPLAIN' => $lang['Is_spammer_explain'])
104 );
105
106 if ( !$just_ban )