Changeset 1063470

Timestamp:

01/08/2015 10:39:12 PM (10 years ago)

Author:

benohead

Message:

tagging version 0.4

Location:

wp-spam-fighter

Files:

• tags/0.4 (added)
• tags/0.4/bootstrap.php (copied) (copied from wp-spam-fighter/trunk/bootstrap.php) (1 diff)
• tags/0.4/classes (copied) (copied from wp-spam-fighter/trunk/classes)
• tags/0.4/classes/wp-spam-fighter.php (modified) (3 diffs)
• tags/0.4/classes/wpsf-settings.php (modified) (3 diffs)
• tags/0.4/css (copied) (copied from wp-spam-fighter/trunk/css)
• tags/0.4/javascript (copied) (copied from wp-spam-fighter/trunk/javascript)
• tags/0.4/languages (copied) (copied from wp-spam-fighter/trunk/languages)
• tags/0.4/readme.txt (copied) (copied from wp-spam-fighter/trunk/readme.txt) (2 diffs)
• tags/0.4/screenshot-1.png (copied) (copied from wp-spam-fighter/trunk/screenshot-1.png)
• tags/0.4/views (copied) (copied from wp-spam-fighter/trunk/views)
• tags/0.4/views/wpsf-settings/page-settings-fields.php (modified) (1 diff)
• trunk/bootstrap.php (modified) (1 diff)
• trunk/classes/wp-spam-fighter.php (modified) (3 diffs)
• trunk/classes/wpsf-settings.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/views/wpsf-settings/page-settings-fields.php (modified) (1 diff)

wp-spam-fighter/tags/0.4/bootstrap.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/wp-spam-fighter/
 Description: Comment spam prevention without moderation, captchas or questions
-Version:     0.3
+Version:     0.4
 Author:      Henri Benoit
 Author URI:  http://benohead.com

wp-spam-fighter/tags/0.4/classes/wp-spam-fighter.php

@@ -28 +28 @@
          * Plugin version number
          */
-        const VERSION = '0.3';
+        const VERSION = '0.4';
 
         /**
@@ -418 +418 @@
 
         function comment_post( $comment_ID, $approved ) {
-            if (isset($this->modules['WPSF_Settings']->settings['others']['delete']) && $this->modules['WPSF_Settings']->settings['others']['delete']) {
-                if ($approved == 'spam') {
-                    wp_trash_comment( $comment_ID );
-                }
-            }
         }
 
@@ -456 +451 @@
                 }
             }
+            if ($approved === 'spam') {
+                if (isset($this->modules['WPSF_Settings']->settings['others']['delete']) && $this->modules['WPSF_Settings']->settings['others']['delete']) {
+                    add_action('wp_insert_comment', array(&$this, 'handle_auto_trash'), 0, 2);
+                }
+                if (isset($this->modules['WPSF_Settings']->settings['others']['discard']) && $this->modules['WPSF_Settings']->settings['others']['discard']) {
+                    add_action('wp_insert_comment', array(&$this, 'handle_auto_delete'), 0, 2);
+                }
+            }
             return $approved;
+        }
+
+        public function handle_auto_delete($id, $comment) {
+            if(!$comment && !is_object($cmt = get_comment($comment))){
+                return;
+            }
+            wp_delete_comment($id, true);
+        }
+
+        public function handle_auto_trash($id, $comment) {
+            if(!$comment && !is_object($cmt = get_comment($comment))){
+                return;
+            }
+            wp_trash_comment($id, false);
         }
 

wp-spam-fighter/tags/0.4/classes/wpsf-settings.php

@@ -225 +225 @@
                 "registration" => true,
                 "delete" => false,
+                "discard" => false,
             );
 
@@ -421 +422 @@
             $this->add_settings_field_others('wpsf_registration', 'Also protect from spammer registration');
             $this->add_settings_field_others('wpsf_delete', 'Move Spam to Trash');
+            $this->add_settings_field_others('wpsf_discard', 'Immediately discard comment');
 
             // The settings container
@@ -569 +571 @@
             $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'registration', true);
             $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'delete', false);
+            $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'discard', false);
 
             return $new_settings;

wp-spam-fighter/tags/0.4/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 4.1
-Stable tag: 0.3
+Stable tag: 0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 == Changelog ==
 
+= 0.4 =
+
+* Added option to discard spam comments (without inserting them into the WordPress database) instead of just marking them as spam.
+
 = 0.3 =
 

wp-spam-fighter/tags/0.4/views/wpsf-settings/page-settings-fields.php

@@ -77 +77 @@
            id="wpsf_settings[others][delete]"
            value="1" <?php if (isset($settings['others']['delete'])) checked(1, $settings['others']['delete']) ?>>
+<?php
+elseif ('wpsf_discard' == $field['label_for']) : ?>
+    <input type="checkbox" name="wpsf_settings[others][discard]"
+           id="wpsf_settings[others][discard]"
+           value="1" <?php if (isset($settings['others']['discard'])) checked(1, $settings['others']['discard']) ?>>
 <?php endif; ?>

wp-spam-fighter/trunk/bootstrap.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/wp-spam-fighter/
 Description: Comment spam prevention without moderation, captchas or questions
-Version:     0.3
+Version:     0.4
 Author:      Henri Benoit
 Author URI:  http://benohead.com

wp-spam-fighter/trunk/classes/wp-spam-fighter.php

@@ -28 +28 @@
          * Plugin version number
          */
-        const VERSION = '0.3';
+        const VERSION = '0.4';
 
         /**
@@ -418 +418 @@
 
         function comment_post( $comment_ID, $approved ) {
-            if (isset($this->modules['WPSF_Settings']->settings['others']['delete']) && $this->modules['WPSF_Settings']->settings['others']['delete']) {
-                if ($approved == 'spam') {
-                    wp_trash_comment( $comment_ID );
-                }
-            }
         }
 
@@ -456 +451 @@
                 }
             }
+            if ($approved === 'spam') {
+                if (isset($this->modules['WPSF_Settings']->settings['others']['delete']) && $this->modules['WPSF_Settings']->settings['others']['delete']) {
+                    add_action('wp_insert_comment', array(&$this, 'handle_auto_trash'), 0, 2);
+                }
+                if (isset($this->modules['WPSF_Settings']->settings['others']['discard']) && $this->modules['WPSF_Settings']->settings['others']['discard']) {
+                    add_action('wp_insert_comment', array(&$this, 'handle_auto_delete'), 0, 2);
+                }
+            }
             return $approved;
+        }
+
+        public function handle_auto_delete($id, $comment) {
+            if(!$comment && !is_object($cmt = get_comment($comment))){
+                return;
+            }
+            wp_delete_comment($id, true);
+        }
+
+        public function handle_auto_trash($id, $comment) {
+            if(!$comment && !is_object($cmt = get_comment($comment))){
+                return;
+            }
+            wp_trash_comment($id, false);
         }
 

wp-spam-fighter/trunk/classes/wpsf-settings.php

@@ -225 +225 @@
                 "registration" => true,
                 "delete" => false,
+                "discard" => false,
             );
 
@@ -421 +422 @@
             $this->add_settings_field_others('wpsf_registration', 'Also protect from spammer registration');
             $this->add_settings_field_others('wpsf_delete', 'Move Spam to Trash');
+            $this->add_settings_field_others('wpsf_discard', 'Immediately discard comment');
 
             // The settings container
@@ -569 +571 @@
             $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'registration', true);
             $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'delete', false);
+            $new_settings = $this->setting_default_if_not_set($new_settings, 'others', 'discard', false);
 
             return $new_settings;

wp-spam-fighter/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 4.1
-Stable tag: 0.3
+Stable tag: 0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 == Changelog ==
 
+= 0.4 =
+
+* Added option to discard spam comments (without inserting them into the WordPress database) instead of just marking them as spam.
+
 = 0.3 =
 

wp-spam-fighter/trunk/views/wpsf-settings/page-settings-fields.php

@@ -77 +77 @@
            id="wpsf_settings[others][delete]"
            value="1" <?php if (isset($settings['others']['delete'])) checked(1, $settings['others']['delete']) ?>>
+<?php
+elseif ('wpsf_discard' == $field['label_for']) : ?>
+    <input type="checkbox" name="wpsf_settings[others][discard]"
+           id="wpsf_settings[others][discard]"
+           value="1" <?php if (isset($settings['others']['discard'])) checked(1, $settings['others']['discard']) ?>>
 <?php endif; ?>