Added DISCUSSION_SPAM_CHECK trigger

.gitignore

@@ -0,0 +1 @@
+.idea

README

@@ -8,3 +8,13 @@ All documentation for the Discussion Plugin is available online at:
 (c) 2008 - 2009 by Gina Häußge, Michael Klier <[email protected]>
 (c) 2013 by Michael Hamann <[email protected]>
 See COPYING for license info.
+
+The Discussion Plugin adds the following triggers:
+
+=== DISCUSSION_SPAM_CHECK ===
+
+The data argument is the comment array.  Developers implementing handlers for the DISCUSSION_SPAM_CHECK trigger
+should be aware that the only field assured of being present is *raw* which contains the raw user input.  Checks
+against other fields should first check for the presence of those fields.
+
+If the comment is spam the trigger handler should return true, which will prevent the message from being saved.

action.php

@@ -489,14 +489,12 @@ protected function _flattenThreads($comments, $keys = null) {
     }
 
     /**
-     * Adds a new comment and then displays all comments
+     * Checks for blocking conditions which would prevent this comment from being saved.
      *
      * @param array $comment
-     * @param string $parent
      * @return bool
      */
-    protected function _add($comment, $parent) {
-        global $ID;
+    protected function _not_spam($comment) {
         global $TEXT;
 
         $otxt = $TEXT; // set $TEXT to comment text for wordblock check
@@ -508,13 +506,35 @@ protected function _add($comment, $parent) {
             return false;
         }
 
+        $TEXT = $otxt; // restore global $TEXT
+
+        if (trigger_event('DISCUSSION_SPAM_CHECK', $comment)) {
+            msg($this->getLang('wordblock'), -1);
+            return false; // Comment identified as spam
+        }
+
+        return true;
+    }
+
+    /**
+     * Adds a new comment and then displays all comments
+     *
+     * @param array $comment
+     * @param string $parent
+     * @return bool
+     */
+    protected function _add($comment, $parent) {
+        global $ID;
+
         if ((!$this->getConf('allowguests'))
-                && ($comment['user']['id'] != $_SERVER['REMOTE_USER'])
+            && ($comment['user']['id'] != $_SERVER['REMOTE_USER'])
         ) {
             return false; // guest comments not allowed
         }
 
-        $TEXT = $otxt; // restore global $TEXT
+        if ($this->_not_spam($comment) === false) {
+            return false;
+        }
 
         // get discussion meta file name
         $file = metaFN($ID, '.comments');
@@ -615,18 +635,10 @@ public function save($cids, $raw, $act = NULL) {
         if(!$cids) return false; // do nothing if we get no comment id
 
         if ($raw) {
-            global $TEXT;
-
-            $otxt = $TEXT; // set $TEXT to comment text for wordblock check
-            $TEXT = $raw;
-
-            // spamcheck against the DokuWiki blacklist
-            if (checkwordblock()) {
-                msg($this->getLang('wordblock'), -1);
+            $comment['raw'] = $raw;
+            if ($this->_not_spam($comment) === false) {
                 return false;
             }
-
-            $TEXT = $otxt; // restore global $TEXT
         }
 
         // get discussion meta file name

plugin.info.txt

@@ -1,5 +1,5 @@
 base   discussion
-author Michael Hamann, Gerrit Uitslag, Gina Häussge, Christopher Smith, Michael Klier, Esther Brunner, Matthias Schulte
+author Michael Hamann, Gerrit Uitslag, Gina Häussge, Christopher Smith, Michael Klier, Esther Brunner, Matthias Schulte, Clay Dowling
 email  [email protected]
 date   2016-04-23
 name   discussion plugin