Changeset 177

Timestamp:

22/07/06 09:41:21 (2 years ago)

Author:

dez

Message:

Removed old tinymce in preparation for next commit which will add version 2.0.6.1

Files:

• blog.lib.php (modified) (2 diffs)
• miscfunctions.lib.php (modified) (1 diff)
• tinymce (deleted)

blog.lib.php

@@ -564 +564 @@
-                        $element = "comment";
-                }
+<<<<<<< .mine
+                //decide if the message is likely to be spam
+                $spam = checkSpam($host, $comment);
+=======
-                //decided if the comment is likly to be spam
-                if (checkRBL($host) or checkBody($comment)) {
@@ -573 +577 @@
-                        $spam = FALSE;
-                }
+>>>>>>> .r175
-                //sanitise email
-                if (isset($_POST['email']) && trim($_POST['email']) != "" && validEmail(trim($_POST['email']))) {

miscfunctions.lib.php

@@ -234 +234 @@
-        return $spam;
-}
+
+# General spam function combining all checks
+function checkSpam($ip, $message) {
+        $spam=checkRBL($ip);
+        if (preg_match_all("#http#", $message, $out)>5) $spam=true;
+        return $spam;
+}