Changeset 19933

Timestamp:

12/22/08 17:05:58 (1 year ago)

Author:

bergie

Message:

Use Mollom comment spam checker if enabled, fixes #684

Files:

• branches/ragnaroek/midcom/net.nehmer.comments/comment.php (modified) (4 diffs)
• branches/ragnaroek/midcom/net.nehmer.comments/config/config.inc (modified) (1 diff)
• branches/ragnaroek/midcom/net.nehmer.comments/handler/view.php (modified) (2 diffs)
• branches/ragnaroek/midcom/net.nemein.discussion/config/config.inc (modified) (1 diff)
• branches/ragnaroek/midcom/net.nemein.discussion/handler/post.php (modified) (2 diffs)
• branches/ragnaroek/midcom/net.nemein.discussion/helper_email_import.php (modified) (2 diffs)
• branches/ragnaroek/midcom/net.nemein.discussion/midcom/interfaces.php (modified) (2 diffs)
• branches/ragnaroek/midcom/net.nemein.discussion/post.php (modified) (4 diffs)

branches/ragnaroek/midcom/net.nehmer.comments/comment.php

@@ -165 +165 @@
-        return $qb->count_unchecked();
-    }
+
+    /**
+     * Check the post against possible spam filters.
+     *
+     * This will update post status on the background and log the information.
+     */
+    function check_spam(&$config)
+    {
+        if (!$config->get('enable_mollom_check'))
+        {
+            // Mollom spam checker is not enabled, skip check
+            return;
+        }
+        
+        if (!$_MIDCOM->componentloader->is_installed('be.crsolutions.mollom'))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add('be.crsolutions.mollom spam checker is enabled but not installed, aborting check', MIDCOM_LOG_INFO);
+            debug_pop();
+            return;
+        }
+        
+        $_MIDCOM->load_library('be.crsolutions.mollom');
+        
+        $mollom = new be_crsolutions_mollom();
+        if (!$mollom->initialize())
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add('be.crsolutions.mollom initialization failed, aborting check', MIDCOM_LOG_INFO);
+            debug_pop();
+            return;
+        }
+        
+        $ret = $mollom->check_content(null, $this->title, $this->content, $this->author);
+        if (!isset($ret['spam']))
+        {
+            // No need to log here, the mollom class does that. Just abort.
+            return;
+        }
+        
+        if ($ret['spam'] == 'ham')
+        {
+            // Quality content
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Mollom noted comment \"{$this->title}\" ({$this->guid}) as ham with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+            debug_pop();
+            
+            $this->status = NET_NEHMER_COMMENTS_MODERATED;
+            $this->update();
+            $this->_log_moderation('reported_not_junk', 'mollom', "Quality = {$ret['quality']}");
+            return;
+        }
+        
+        if ($ret['spam'] == 'spam')
+        {
+            // Spam
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Mollom noted comment \"{$this->title}\" ({$this->guid}) as spam with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+            debug_pop();
+            
+            $this->status = NET_NEHMER_COMMENTS_JUNK;
+            $this->update();
+            $this->_log_moderation('confirmed_junk', 'mollom', "Quality = {$ret['quality']}");
+            return;
+        }
+        
+        // Otherwise we let it stay in initial status, as Mollom was unsure
+
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_add("Mollom noted comment \"{$this->title}\" ({$this->guid}) as unsure with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+        debug_pop();
-    
+        return;
+    }
+
-    function report_abuse()
-    {
@@ -282 +356 @@
-            if (count($log_action) == 2)
-            {
-if ($log_details[0] == 'anonymous'
+switch ($log_details[0]
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -304 +382 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        $browser = str_replace(':', '_', $_SERVER['HTTP_USER_AGENT']);
@@ -329 +410 @@
-            2 => $browser
-        );
+
+        if ($extra !== null)
+        {
+            $log_details[] = $extra;
+        }
-        
-        $this->set_parameter('net.nehmer.comments:moderation_log', implode(':', $log_action), implode(':', $log_details));

branches/ragnaroek/midcom/net.nehmer.comments/config/config.inc

@@ -14 +14 @@
-// Allow anonymous posting.
-'allow_anonymous' => true,
+
+'enable_mollom_check' => false,
-
-// Notify authors on new comments

branches/ragnaroek/midcom/net.nehmer.comments/handler/view.php

@@ -601 +601 @@
-    {
-        if (   ! $_MIDCOM->auth->user
-
+'net.nehmer.comments'
-        {
-            $_MIDCOM->generate_error(MIDCOM_ERRCRIT,
@@ -611 +611 @@
-        {
-            case 'save':
+                // Check against comment spam
+                $this->_new_comment->check_spam($this->_config);
+
-                $this->_cache_ratings();
-                $this->_notify_authors();

branches/ragnaroek/midcom/net.nemein.discussion/config/config.inc

@@ -59 +59 @@
-'moderators' => '',
-
+'enable_mollom_check' => false,
-'remove_unpopular_threads' => false,
-

branches/ragnaroek/midcom/net.nemein.discussion/handler/post.php

@@ -332 +332 @@
-        {
-            case 'save':
+                // Check spam
+                $this->_post->check_spam($this->_config);
+                
-                // Update thread accordingly
-                $this->_thread->title = $this->_post->subject;
@@ -589 +592 @@
-        {
-            case 'save':
+                // Check spam
+                $this->_post->check_spam($this->_config);
+
-                // Index the article
-                $indexer =& $_MIDCOM->get_service('indexer');

branches/ragnaroek/midcom/net.nemein.discussion/helper_email_import.php

@@ -235 +235 @@
-            }
-        }
+        
-        $post->set_parameter('midcom.helper.datamanager2', 'schema_name', $this->schema_name);
-        debug_add("Created new post #{$post->id}",  MIDCOM_LOG_INFO);
@@ -296 +297 @@
-            $post->update();
-        }
+        
+        // Handle spam checks
+        $post->check_spam($this->_config);
-
-        // Index the post ??

branches/ragnaroek/midcom/net.nemein.discussion/midcom/interfaces.php

@@ -29 +29 @@
-
-        $this->_component = 'net.nemein.discussion';
-A
+a
-        (
-            'viewer.php',
@@ -36 +36 @@
-            'post.php',
-        );
-
+
+
-            'midcom.helper.datamanager2',
-            'de.bitfolge.feedcreator',

branches/ragnaroek/midcom/net.nemein.discussion/post.php

@@ -141 +141 @@
-        return $this->subject;
-    }
+    
+    /**
+     * Check the post against possible spam filters.
+     *
+     * This will update post status on the background and log the information.
+     */
+    function check_spam(&$config)
+    {
+        if (!$config->get('enable_mollom_check'))
+        {
+            // Mollom spam checker is not enabled, skip check
+            return;
+        }
+        
+        if (!$_MIDCOM->componentloader->is_installed('be.crsolutions.mollom'))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add('be.crsolutions.mollom spam checker is enabled but not installed, aborting check', MIDCOM_LOG_INFO);
+            debug_pop();
+            return;
+        }
+        
+        $_MIDCOM->load_library('be.crsolutions.mollom');
+        
+        $mollom = new be_crsolutions_mollom();
+        if (!$mollom->initialize())
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add('be.crsolutions.mollom initialization failed, aborting check', MIDCOM_LOG_INFO);
+            debug_pop();
+            return;
+        }
+        
+        $ret = $mollom->check_content(null, $this->subject, $this->content, $this->sendername, $this->senderurl, $this->senderemail);
+        if (!isset($ret['spam']))
+        {
+            // No need to log here, the mollom class does that. Just abort.
+            return;
+        }
+        
+        if ($ret['spam'] == 'ham')
+        {
+            // Quality content
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Mollom noted post \"{$this->subject}\" ({$this->guid}) as ham with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+            debug_pop();
+            
+            $this->status = NET_NEMEIN_DISCUSSION_MODERATED;
+            $this->update();
+            $this->_log_moderation('reported_not_junk', 'mollom', "Quality = {$ret['quality']}");
+            return;
+        }
+        
+        if ($ret['spam'] == 'spam')
+        {
+            // Spam
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Mollom noted post \"{$this->subject}\" ({$this->guid}) as spam with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+            debug_pop();
+            
+            $this->status = NET_NEMEIN_DISCUSSION_JUNK;
+            $this->update();
+            $this->_log_moderation('confirmed_junk', 'mollom', "Quality = {$ret['quality']}");
+            return;
+        }
+        
+        // Otherwise we let it stay in initial status, as Mollom was unsure
+
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_add("Mollom noted post \"{$this->subject}\" ({$this->guid}) as unsure with quality {$ret['quality']}", MIDCOM_LOG_DEBUG);
+        debug_pop();
+    
+        return;
+    }
-
-    /**
@@ -258 +332 @@
-            if (count($log_action) == 2)
-            {
-if ($log_details[0] == 'anonymous'
+switch ($log_details[0]
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -280 +358 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        $browser = str_replace(':', '_', $_SERVER['HTTP_USER_AGENT']);
@@ -306 +387 @@
-        );
-        
+        if ($extra !== null)
+        {
+            $log_details[] = $extra;
+        }
+        
-        $this->set_parameter('net.nemein.discussion:moderation_log', implode(':', $log_action), implode(':', $log_details));
-    }