[geeklog-hg] geeklog: Fixes for changeset 84afc9a91064 including Stop Forum S...

[geeklog-cvs at lists.geeklog.net]

changeset 9453:6fad9a6937e7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6fad9a6937e7
user: Tom <websitemaster at cogeco.net>
date: Mon Jan 27 22:59:26 2014 -0500
description:
Fixes for changeset 84afc9a91064 including Stop Forum Spam and counters not being updated. Defined SPAM constants

diffstat:

 plugins/spamx/IPofUrl.Examine.class.php |  2 +-
 plugins/spamx/SFS.Misc.class.php        |  6 +++---
 plugins/spamx/SLVbase.class.php         |  2 +-
 plugins/spamx/functions.inc             |  6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r ec1bd5197e06 -r 6fad9a6937e7 plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Sat Jan 25 19:54:46 2014 +0900
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Mon Jan 27 22:59:26 2014 -0500
@@ -69,7 +69,7 @@
 
                 if ($val == $ip) {
                     $ans = PLG_SPAM_FOUND;	// quit on first positive match
-                    DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter WHERE name='IPofUrl' AND value='" . DB_escapeString($val) . "'", 1);
+                    DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter + 1 WHERE name='IPofUrl' AND value='" . DB_escapeString($val) . "'", 1);
                     SPAMX_log($LANG_SX00['foundspam'] . $urls[2][$i] .
                               $LANG_SX00['foundspam2'] . $uid .
                               $LANG_SX00['foundspam3'] . $_SERVER['REMOTE_ADDR']);
diff -r ec1bd5197e06 -r 6fad9a6937e7 plugins/spamx/SFS.Misc.class.php
--- a/plugins/spamx/SFS.Misc.class.php	Sat Jan 25 19:54:46 2014 +0900
+++ b/plugins/spamx/SFS.Misc.class.php	Mon Jan 27 22:59:26 2014 -0500
@@ -75,8 +75,8 @@
                 WHERE name='IP' AND value='$db_ip'
                 OR name='email' AND value='$db_email'", 1);
         if (DB_numRows($result) > 0) {
-            list ($name, $value) = DB_fetchAarray($result);
-            DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter WHERE name='" . DB_escapeString($name) . "' AND value='" . DB_escapeString($value) . "'", 1);
+            list ($name, $value) = DB_fetchArray($result);
+            DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter + 1 WHERE name='" . DB_escapeString($name) . "' AND value='" . DB_escapeString($value) . "'", 1);
             return PLG_SPAM_FOUND;
         }
 
@@ -133,7 +133,7 @@
 
         if (!empty($value_arr)) {
             $values = implode(',', $value_arr);
-            $sql = "INSERT INTO {$_TABLES['spamx']} (name, value, 0) 
+            $sql = "INSERT INTO {$_TABLES['spamx']} (name, value) 
                     VALUES $values";
             DB_query($sql);
 
diff -r ec1bd5197e06 -r 6fad9a6937e7 plugins/spamx/SLVbase.class.php
--- a/plugins/spamx/SLVbase.class.php	Sat Jan 25 19:54:46 2014 +0900
+++ b/plugins/spamx/SLVbase.class.php	Mon Jan 27 22:59:26 2014 -0500
@@ -131,7 +131,7 @@
                 if (!empty($link)) {
                     if (preg_match("#$val#i", $link)) {
                         $links[$key] = '';
-                        DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter WHERE name='SLVwhitelist' AND value='" . DB_escapeString($A['value']) . "'", 1);
+                        DB_query("UPDATE {$_TABLES['spamx']} SET counter = counter + 1 WHERE name='SLVwhitelist' AND value='" . DB_escapeString($A['value']) . "'", 1);
                     }
                 }
             }
diff -r ec1bd5197e06 -r 6fad9a6937e7 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sat Jan 25 19:54:46 2014 +0900
+++ b/plugins/spamx/functions.inc	Mon Jan 27 22:59:26 2014 -0500
@@ -40,6 +40,12 @@
 }
 
 
+// Response codes for checking for a SPAM
+define('PLG_SPAM_NOT_FOUND',       0);
+define('PLG_SPAM_FOUND',           1);
+define('PLG_SPAM_UNSURE',          2);
+
+
 // +---------------------------------------------------------------------------+
 // | Geeklog Plugin API Implementations                                        |
 // +---------------------------------------------------------------------------+