* [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_spammers.php
@ 2010-09-09 17:05 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-09-09 17:05 UTC (permalink / raw
To: gentoo-commits
robbat2 10/09/09 17:05:04
Modified: admin_spammers.php
Log:
Review shows another max vs. auto_increment misusage that has the potential to break replication. This is near identical to my fix to usercp_register last year.
Revision Changes Path
1.3 forums/htdocs/admin/admin_spammers.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?r1=1.2&r2=1.3
Index: admin_spammers.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_spammers.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- admin_spammers.php 14 Feb 2007 21:08:03 -0000 1.2
+++ admin_spammers.php 9 Sep 2010 17:05:04 -0000 1.3
@@ -6,7 +6,7 @@
* copyright : (C) 2007 Tom Knight
* email : tomk@gentoo.org
*
- * $Id: admin_spammers.php,v 1.2 2007/02/14 21:08:03 tomk Exp $
+ * $Id: admin_spammers.php,v 1.3 2010/09/09 17:05:04 robbat2 Exp $
*
*
***************************************************************************/
@@ -261,28 +261,30 @@ else if ( $mode == 'add' )
}
else
{
+ // 2010-09-09 robbat2 - disabled to allow safe auto_increment instead
// insert into users table from spammers table
- $sql = "SELECT MAX(user_id) AS total
- FROM " . USERS_TABLE;
- if ( !($result = $db->sql_query($sql)) )
- {
- message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
- }
-
- if ( !($row = $db->sql_fetchrow($result)) )
- {
- message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
- }
- $new_user_id = $row['total'] + 1;
+ //$sql = "SELECT MAX(user_id) AS total
+ // FROM " . USERS_TABLE;
+ //if ( !($result = $db->sql_query($sql)) )
+ //{
+ // message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+ //}
+ //if ( !($row = $db->sql_fetchrow($result)) )
+ //{
+ // message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+ //}
+ //$new_user_id = $row['total'] + 1;
- $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, user_active)
- SELECT $new_user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, 1
+ $sql = "INSERT INTO " . USERS_TABLE . " (username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, user_active)
+ SELECT username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, 1
FROM " . SPAMMERS_TABLE . "
WHERE user_id = " . $user_id;
if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql);
}
+ // 2010-09-09 robbat2 - now we can get the user_id that was just created.
+ $new_user_id = $db->sql_nextid();
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user, group_moderator)
VALUES ('', 'Personal User', 1, 0)";
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_spammers.php
@ 2010-09-09 18:15 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-09-09 18:15 UTC (permalink / raw
To: gentoo-commits
robbat2 10/09/09 18:15:33
Modified: admin_spammers.php
Log:
Change comment style to show code block commented out for replication fix.
Revision Changes Path
1.4 forums/htdocs/admin/admin_spammers.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?r1=1.3&r2=1.4
Index: admin_spammers.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_spammers.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- admin_spammers.php 9 Sep 2010 17:05:04 -0000 1.3
+++ admin_spammers.php 9 Sep 2010 18:15:33 -0000 1.4
@@ -6,7 +6,7 @@
* copyright : (C) 2007 Tom Knight
* email : tomk@gentoo.org
*
- * $Id: admin_spammers.php,v 1.3 2010/09/09 17:05:04 robbat2 Exp $
+ * $Id: admin_spammers.php,v 1.4 2010/09/09 18:15:33 robbat2 Exp $
*
*
***************************************************************************/
@@ -263,17 +263,19 @@ else if ( $mode == 'add' )
{
// 2010-09-09 robbat2 - disabled to allow safe auto_increment instead
// insert into users table from spammers table
- //$sql = "SELECT MAX(user_id) AS total
- // FROM " . USERS_TABLE;
- //if ( !($result = $db->sql_query($sql)) )
- //{
- // message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
- //}
- //if ( !($row = $db->sql_fetchrow($result)) )
- //{
- // message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
- //}
- //$new_user_id = $row['total'] + 1;
+ /*
+ $sql = "SELECT MAX(user_id) AS total
+ FROM " . USERS_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+ }
+ if ( !($row = $db->sql_fetchrow($result)) )
+ {
+ message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+ }
+ $new_user_id = $row['total'] + 1;
+ */
$sql = "INSERT INTO " . USERS_TABLE . " (username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, user_active)
SELECT username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_jabber, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view, 1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_spammers.php
@ 2011-02-20 12:45 Tom Knight (tomk)
0 siblings, 0 replies; 4+ messages in thread
From: Tom Knight (tomk) @ 2011-02-20 12:45 UTC (permalink / raw
To: gentoo-commits
tomk 11/02/20 12:45:26
Modified: admin_spammers.php
Log:
Allow searching profile spammers by e-mail in ACP and show spam reason
Revision Changes Path
1.5 forums/htdocs/admin/admin_spammers.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?r1=1.4&r2=1.5
Index: admin_spammers.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_spammers.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin_spammers.php 9 Sep 2010 18:15:33 -0000 1.4
+++ admin_spammers.php 20 Feb 2011 12:45:26 -0000 1.5
@@ -6,7 +6,7 @@
* copyright : (C) 2007 Tom Knight
* email : tomk@gentoo.org
*
- * $Id: admin_spammers.php,v 1.4 2010/09/09 18:15:33 robbat2 Exp $
+ * $Id: admin_spammers.php,v 1.5 2011/02/20 12:45:26 tomk Exp $
*
*
***************************************************************************/
@@ -74,6 +74,7 @@
$username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
$reg_ip = ( !empty($HTTP_GET_VARS['reg_ip']) ) ? encode_ip($HTTP_GET_VARS['reg_ip']) : '';
$reg_ip = ( !empty($HTTP_POST_VARS['reg_ip']) ) ? encode_ip($HTTP_POST_VARS['reg_ip']) : $reg_ip;
+ $email = ( !empty($HTTP_POST_VARS['email']) ) ? $HTTP_POST_VARS['email'] : '';
$user_ids = '';
$select_all = FALSE;
@@ -157,6 +158,45 @@
message_die(GENERAL_ERROR, $message);
}
}
+ else if ( ! empty($email) )
+ {
+ $operator = "=";
+
+ // check for wildcards in the email
+ if ( strpos($email, "*") !== FALSE )
+ {
+ $email = str_replace("*", "%", $email);
+ $operator = "LIKE";
+ }
+
+ $sql = "SELECT user_id
+ FROM " . SPAMMERS_TABLE . "
+ WHERE user_email $operator '$email'";
+
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, 'Could not query user information', '', __LINE__, __FILE__, $sql);
+ }
+
+ if($db->sql_numrows($result) != 0)
+ {
+ while ( $row = $db->sql_fetchrow($result) )
+ {
+ $user_ids .= $row['user_id'] . ", ";
+ }
+
+ // strip last comma
+ if ( strlen($user_ids) > 2 )
+ {
+ $user_ids = substr($user_ids, 0, strlen($user_ids)-2);
+ }
+ }
+ else
+ {
+ $message = $lang['No_such_spammer'] . '<br /><br />' . sprintf($lang['Click_return_spammer'], '<a href="' . append_sid("admin_spammers.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
+ message_die(GENERAL_ERROR, $message);
+ }
+ }
else
{
$message = $lang['No_user_ip_entered'] . '<br /><br />' . sprintf($lang['Click_return_spammer'], '<a href="' . append_sid("admin_spammers.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
@@ -169,7 +209,7 @@
message_die(GENERAL_ERROR, $message);
}
- $sql = "SELECT user_id, username, user_regdate, user_email, user_website, user_reg_ip
+ $sql = "SELECT user_id, username, user_regdate, user_email, user_website, user_reg_ip, user_spammer_reason
FROM " . SPAMMERS_TABLE;
if ( ! $select_all )
@@ -197,6 +237,7 @@
'JOINDATE' => create_date($board_config['default_dateformat'], $row['user_regdate'], $board_config['board_timezone']),
'BAN' => ( ( !isset($banned[$row['user_id']]) ) ? $lang['Not_banned'] : $lang['Banned'] ),
'REG_IP' => ( !empty($row['user_reg_ip']) ) ? decode_ip($row['user_reg_ip']) : '',
+ 'REASON' => str_replace("\n", "<br />", $row['user_spammer_reason']),
));
}
}
@@ -219,12 +260,11 @@
'L_WEBSITE' => $lang['Website'],
'L_SELECT' => $lang['Select'],
'L_ADD_USER' => $lang['Add_user'],
+ 'L_REASON' = > $lang['Spammer_reason'],
'S_POST_ACTION' => append_sid("admin_spammers.$phpEx")
));
-
-
$template->pparse('body');
}
else if ( $mode == 'add' )
@@ -331,8 +371,10 @@
'L_USER_EXPLAIN' => $lang['Spammer_admin_explain'],
'L_USER_SELECT' => $lang['Select_a_User'],
'L_IP_SELECT' => $lang['Select_a_reg_ip'],
+ 'L_EMAIL' => $lang['Email_address'],
'L_LOOK_UP' => $lang['Look_up_user'],
'L_LOOK_IP' => $lang['Look_up_ip'],
+ 'L_SEARCH' => $lang['Search'],
'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"),
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_spammers.php
@ 2011-02-20 12:50 Tom Knight (tomk)
0 siblings, 0 replies; 4+ messages in thread
From: Tom Knight (tomk) @ 2011-02-20 12:50 UTC (permalink / raw
To: gentoo-commits
tomk 11/02/20 12:50:15
Modified: admin_spammers.php
Log:
typo
Revision Changes Path
1.6 forums/htdocs/admin/admin_spammers.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/admin/admin_spammers.php?r1=1.5&r2=1.6
Index: admin_spammers.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_spammers.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin_spammers.php 20 Feb 2011 12:45:26 -0000 1.5
+++ admin_spammers.php 20 Feb 2011 12:50:15 -0000 1.6
@@ -6,7 +6,7 @@
* copyright : (C) 2007 Tom Knight
* email : tomk@gentoo.org
*
- * $Id: admin_spammers.php,v 1.5 2011/02/20 12:45:26 tomk Exp $
+ * $Id: admin_spammers.php,v 1.6 2011/02/20 12:50:15 tomk Exp $
*
*
***************************************************************************/
@@ -260,7 +260,7 @@
'L_WEBSITE' => $lang['Website'],
'L_SELECT' => $lang['Select'],
'L_ADD_USER' => $lang['Add_user'],
- 'L_REASON' = > $lang['Spammer_reason'],
+ 'L_REASON' => $lang['Spammer_reason'],
'S_POST_ACTION' => append_sid("admin_spammers.$phpEx")
));
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-20 12:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-09 18:15 [gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_spammers.php Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2011-02-20 12:50 Tom Knight (tomk)
2011-02-20 12:45 Tom Knight (tomk)
2010-09-09 17:05 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox