Changeset 2646847

Timestamp:

12/20/2021 03:10:48 PM (3 years ago)

Author:

neuropassenger

Message:

Filling time corrections, Flamingo Inbound

Location:

bs-spam-protector/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-bs-spam-protector-admin.php (modified) (3 diffs)
• bs-spam-protector.php (modified) (2 diffs)
• includes/class-bs-spam-protector-activator.php (modified) (1 diff)
• includes/class-bs-spam-protector.php (modified) (1 diff)
• public/class-bs-spam-protector-public.php (modified) (10 diffs)

bs-spam-protector/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 5.7.2
 Tested up to: 5.8.2
-Stable tag: 1.3.4
+Stable tag: 1.6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 
 == Changelog ==
+
+= 1.6.0 =
+* SPAM Protector information is now stored in the Flamingo 'meta' column.
+
+= 1.5.0 =
+* More accurate calculation of the filling time for the textarea field.
+
+= 1.4.0 =
+* Setting for the time interval for filling out the form.
 
 = 1.3.4 =

bs-spam-protector/trunk/admin/class-bs-spam-protector-admin.php

@@ -131 +131 @@
         );
 
+        register_setting(
+            'bs_spam_protector_general',
+            'bs_spam_protector_expiration_interval'
+        );
+
         add_settings_section(
             'bs_spam_protector_general',
@@ -153 +158 @@
             'bs_spam_protector_general'
         );
+
+        add_settings_field(
+            'bs_spam_protector_expiration_interval',
+            'Expiration interval',
+            array( $this, 'show_expiration_interval_field' ),
+            $this->plugin_name,
+            'bs_spam_protector_general'
+        );
     }
 
@@ -170 +183 @@
     }
 
+    function show_expiration_interval_field() {
+        $expiration_interval = get_option( 'bs_spam_protector_expiration_interval' );
+        echo "<input type='number' class='regular-text bs_spam_protector_expiration_interval' name='bs_spam_protector_expiration_interval' placeholder='12' value='" . (esc_attr( $expiration_interval ) ?? '') . "'>";
+        echo "<p>The allowed time interval <strong>in hours</strong> between opening and submitting a form.</p>";
+    }
+
 }

bs-spam-protector/trunk/bs-spam-protector.php

@@ -16 +16 @@
  * Plugin Name:       BS SPAM Protector
  * Description:       This plugin protects Contact Form 7 from spam.
- * Version:           1.3.4
+ * Version:           1.6.0
  * Author:            Oleg Sokolov
  * Author URI:        https://neuropassenger.ru
@@ -35 +35 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'BS_SPAM_PROTECTOR_VERSION', '1.3.4' );
+define( 'BS_SPAM_PROTECTOR_VERSION', '1.6.0' );
 
 /**

bs-spam-protector/trunk/includes/class-bs-spam-protector-activator.php

@@ -35 +35 @@
         $secret_key = hash_hmac( 'sha256', $time, date( 'F', $time ) );
         update_option( 'bs_spam_protector_secret_key', $secret_key );
+        update_option( 'bs_spam_protector_expiration_interval', 12 );
     }
 

bs-spam-protector/trunk/includes/class-bs-spam-protector.php

@@ -186 +186 @@
         $this->loader->add_filter( 'wpcf7_spam', $plugin_public, 'is_spam_submission' );
 
+        //$this->loader->add_action( 'load-flamingo_page_flamingo_inbound', $plugin_public, 'add_spam_protector_flamingo_meta_box' );
+        $this->loader->add_filter( 'flamingo_add_inbound', $plugin_public, 'prepare_data_for_flamingo_inbound' );
+
     }
 

bs-spam-protector/trunk/public/class-bs-spam-protector-public.php

@@ -98 +98 @@
 
         wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/bs-spam-protector-public.js', array( 'jquery' ), false );
+        $expiration_interval = get_option( 'bs_spam_protector_expiration_interval' );
         wp_localize_script( $this->plugin_name, 'bs_vars', array(
             'nonce'       =>  wp_create_nonce( 'cf7_bs_spam_protector' ),
-            'expiration'  =>  time() + 60 * 120,
+            'expiration'  =>  time() + 60 * 60 * $expiration_interval,
             'ajaxUrl'     =>  admin_url( 'admin-ajax.php' ),
         ) );
@@ -116 +117 @@
             // Before sanitizing
             Bs_Spam_Protector_Functions::logit(array(
-                'nonce'          =>  $_POST['nonce'],
+                'nonce'         =>  $_POST['nonce'],
                 'form_id'       =>  $_POST['form_id'],
                 'expiration'    =>  $_POST['expiration'],
@@ -161 +162 @@
 
     public function ajax_get_validation_meta() {
-        $expiration = time() + 60 * 120;
+        $expiration_interval = get_option( 'bs_spam_protector_expiration_interval' );
+        $expiration = time() + 60 * 60 * $expiration_interval;
         $nonce = wp_create_nonce( 'cf7_bs_spam_protector' );
 
@@ -178 +180 @@
         $secret_key = get_option( 'bs_spam_protector_secret_key' );
         $submission = WPCF7_Submission::get_instance();
-        $container_post_id = $submission->get_meta('container_post_id');
+        $container_post_id = $submission->get_meta( 'container_post_id' );
         $log_flag = get_option( 'bs_spam_protector_log_checkbox', false );
 
@@ -254 +256 @@
 
             // Form filled out too quickly
-            // TODO: interval settings
         } elseif ( $filling_form_time < $expected_filling_form_time ) {
             $submission->add_spam_log(array(
                 'agent' => 'bs_spam_protector',
-                'reason' => "Form filled out too quickly (In " . $filling_form_time . " second(s), " . $expected_filling_form_time . " second(s) expected.)",
+                'reason' => "Form filled out too quickly (In " . $filling_form_time . " second(s), " . $expected_filling_form_time . " second(s) expected).",
             ));
 
@@ -299 +300 @@
     function get_filling_form_time() {
         $expiration = intval( $_POST['bs_hf_expiration'] );
-        $start_filling_form_timestamp = $expiration - 60 * 120; // TODO: make only one setting value, search: '60 * 120* in the code
+        $expiration_interval = get_option( 'bs_spam_protector_expiration_interval' );
+        $start_filling_form_timestamp = $expiration - 60 * 60 * $expiration_interval;
         $finish_filling_form_timestamp = time() - 2; // 2 - time for network delays
 
@@ -327 +329 @@
         $posted_data = WPCF7_Submission::get_instance()->get_posted_data();
         // Let's remove tech fields
-        unset($posted_data['bs_hf_nonce']);
-        unset($posted_data['bs_hf_expiration']);
-        unset($posted_data['bs_hf_validation_key']);
-        unset($posted_data['bs_hf_form_id']);
-
-        $container_post_id = WPCF7_Submission::get_instance()->get_meta('container_post_id');
+        unset( $posted_data['bs_hf_nonce'] );
+        unset( $posted_data['bs_hf_expiration'] );
+        unset( $posted_data['bs_hf_validation_key'] );
+        unset( $posted_data['bs_hf_form_id'] );
 
         foreach ( $posted_data as $field_name => $field_value ) {
@@ -349 +349 @@
                 // Separate time computation for files, because a user can pass an empty file field
                 case 'file':
-                    $expected_filling_field_time = $this->get_expected_filling_time_for_file_field_type( $field_name, $container_post_id );
+                    $expected_filling_field_time = $this->get_expected_filling_time_for_file_field_type( $field_name );
+                    break;
+                case 'textarea':
+                    $expected_filling_field_time = $this->get_expected_filling_time_for_textarea_field_type( $field_name );
                     break;
                 default:
@@ -380 +383 @@
     }
 
-    function get_expected_filling_time_for_file_field_type( $field_name, $container_post_id ) {
+    function get_expected_filling_time_for_file_field_type( $field_name ) {
         if ( ! isset( $_FILES[$field_name] ) ) {
             return 0;
@@ -393 +396 @@
     }
 
+    function get_expected_filling_time_for_textarea_field_type( $field_name ) {
+        $textarea_content = $_POST[$field_name];
+        $content_size = mb_strlen( $textarea_content );
+        $expected_time = round( $content_size / 10 );
+
+        return $expected_time;
+    }
+
+    function prepare_data_for_flamingo_inbound( $args ) {
+        // Let's save SPAM Protector fields to the meta section
+        $args['meta']['bs_hf_nonce'] = $args['fields']['bs_hf_nonce'];
+        $args['meta']['bs_hf_expiration'] = $args['fields']['bs_hf_expiration'];
+        $args['meta']['bs_hf_validation_key'] = $args['fields']['bs_hf_validation_key'];
+        $args['meta']['bs_hf_form_id'] = $args['fields']['bs_hf_form_id'];
+
+        $filling_form_time = $this->get_filling_form_time();
+        $expected_filling_form_time = $this->get_min_expected_filling_form_time();
+        $args['meta']['filling_time'] = $filling_form_time;
+        $args['meta']['expected_filling_time'] = $expected_filling_form_time;
+
+        unset( $args['fields']['bs_hf_nonce'] );
+        unset( $args['fields']['bs_hf_expiration'] );
+        unset( $args['fields']['bs_hf_validation_key'] );
+        unset( $args['fields']['bs_hf_form_id'] );
+
+        return $args;
+    }
+
 }