Changeset 161

Timestamp:

26/12/05 16:02:55 (3 years ago)

Author:

rollercow

Message:

Checks comment posting host against several rbl's, flags comments as spam and check them to be deleted on the comment moderation page.
Forces spam comments to be moderated even if moderation is turned of.
Does not send out email notification for spam comments

Files:

• admin.lib.php (modified) (2 diffs)
• blog.lib.php (modified) (3 diffs)
• blog.sql (modified) (2 diffs)
• miscfunctions.lib.php (modified) (1 diff)

admin.lib.php

@@ -565 +565 @@
-                echo "<div class=\"entry\">\n";
-                echo "<h2>Comments Pending Approval</h2>\n";
+                echo "<p>The comments in red are probably spam. They are premarked to be deleted for your convience.</p>\n";
-                echo "<form action=\"{$this->adminPath}updatecomments/\" method=\"post\">\n";
-                echo "<table class=\"td\">\n";
@@ -591 +592 @@
-                        }
-                        //how display each of the comments
-
+
+
+
+
-                        echo "\t\t<td><a href=\"mailto:{$r['email']}\" title=\"IP: {$r['host']}\">{$r['name']}</a></td>\n";
-                        echo "\t\t<td>{$r['body']}</td>\n";
-                        echo "\t\t<td><input type=\"radio\" name=\"group[$count]\" value=\"a:{$r['id']}\" /></td>\n";
-
+
+
+
+
-                        echo "\t</tr>\n";
-                }

blog.lib.php

@@ -340 +340 @@
-                        $host = addslashes($_SERVER['REMOTE_ADDR']);
-                }
+                //decided if the host is likly to have given us spam
+                if (checkRBL($host)) {
+                        $spam = TRUE;
+                }
+                else {
+                        $spam = FALSE;
+                }
-                //sanitise comment
-                if (isset($_POST['comment']) && trim($_POST['comment']) != "") {
@@ -376 +383 @@
-                if ($this->commentError == "") {
-                        // do we need to set the moderated flag on this comment?
-
+ or $spam
-                                $moderated = TRUE;
-                        } else {
@@ -385 +392 @@
-                                }
-                        }
-) VALUES ('{$postid}','{$author}','{$email}','{$comment}','{$host}', ".(($moderated
+, spam) VALUES ('{$postid}','{$author}','{$email}','{$comment}','{$host}', ".(($moderated) ? "true" : "false").", ".(($spam
-                        if(!db_query($query)) {
-                                error(2,_("Database commit failed -").db_error());
-                        }
-                        else {
-
+
+
-                                if(!$moderated) {
-                                        echo "<p class=\"updateinfo\">"._("Your comment has been added, but before it appears here it must be accepted by the blog owner.")."</p>";

blog.sql

@@ -2 +2 @@
-
-CREATE TABLE categories (
-    
-    
-    
-    
+       
+       
+       
+       
-);
-
@@ -23 +23 @@
-
-CREATE TABLE entries (
-    
-    
-    
-    
-    
-    
-    
+       
+       
+       
+       
+       
+       
+       
-);
-CREATE UNIQUE INDEX entries_shortsubject_key ON entries (shortsubject, user_id);
-
-CREATE TABLE comments (
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-);
-
-CREATE TABLE authorised_emails (
-    
-    
-    
+       
+       
+       
-);
-CREATE UNIQUE INDEX authorised_emails_email_key ON authorised_emails (email, user_id);

miscfunctions.lib.php

@@ -66 +66 @@
-        return $revision;
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+