Gentoo Archives: gentoo-commits

From: "Dean Stephens (desultory)" <desultory@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: usercp_register.php
Date: Tue, 07 Sep 2010 08:23:41
Message-Id: 20100907082333.110FB20051@flycatcher.gentoo.org
1 desultory 10/09/07 08:23:33
2
3 Modified: usercp_register.php
4 Log:
5 Tweak the profile spammers insertion to avoid breaking replication when dealing with overeager bots.
6
7 Revision Changes Path
8 1.34 forums/htdocs/includes/usercp_register.php
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.34&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.34&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?r1=1.33&r2=1.34
13
14 Index: usercp_register.php
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/usercp_register.php,v
17 retrieving revision 1.33
18 retrieving revision 1.34
19 diff -u -r1.33 -r1.34
20 --- usercp_register.php 19 May 2010 10:22:15 -0000 1.33
21 +++ usercp_register.php 7 Sep 2010 08:23:32 -0000 1.34
22 @@ -6,7 +6,7 @@
23 * copyright : (C) 2001 The phpBB Group
24 * email : support@×××××.com
25 *
26 - * $Id: usercp_register.php,v 1.33 2010/05/19 10:22:15 tomk Exp $
27 + * $Id: usercp_register.php,v 1.34 2010/09/07 08:23:32 desultory Exp $
28 *
29 *
30 ***************************************************************************/
31 @@ -671,7 +671,7 @@
32
33 // This user is most likely a profile spammer, so insert their info into the spammer database
34 // then show an error message telling them to contact us in case it's a false positive
35 - $sql = "INSERT INTO " . SPAMMERS_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_active, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view)
36 + $sql = "INSERT IGNORE INTO " . SPAMMERS_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_active, user_actkey, user_showavatars, user_reg_ip, user_require_activation, user_author_view)
37 VALUES ('" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', '" . str_replace("\'", "''", $jabber) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
38 if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa || $board_config['require_activation'] == USER_ACTIVATION_WATCHED_IP || $board_config['require_activation'] == USER_ACTIVATION_MULTI_IP )
39 {