Changeset 3261814

Timestamp:

03/25/2025 10:17:20 PM (12 months ago)

Author:

oopspam

Message:

22. 1.2.30

Location:

oopspam-anti-spam/trunk

Files:

• OOPSpamAPI.php (modified) (1 diff)
• include/Background (added)
• include/Background/AsyncProcessor.php (added)
• include/UI/display-ham-entries.php (modified) (6 diffs)
• include/UI/display-spam-entries.php (modified) (6 diffs)
• integration/ContactForm7.php (modified) (1 diff)
• integration/WooCommerce.php (modified) (10 diffs)
• oopspam-antispam.php (modified) (2 diffs)
• options.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

oopspam-anti-spam/trunk/OOPSpamAPI.php

@@ -193 +193 @@
             "shouldBeSpam" => $isSpam,
             "sensitivityLevel" => $currentSensitivityLevel
-        );
-
-        error_log("OOPSpamAPI: Report parameters: " . json_encode($parameters));
-        
+        );        
         $jsonreply=$this->RequestToOOPSpamReportingAPI(json_encode($parameters));
         

oopspam-anti-spam/trunk/include/UI/display-ham-entries.php

@@ -152 +152 @@
     public static function get_ham_entries($per_page = 5, $page_number = 1, $search = "") {
         global $wpdb;
+        
+        // Validate and sanitize input parameters
+        $per_page = absint($per_page);
+        $page_number = absint($page_number);
+        $search = sanitize_text_field($search);
+        
         $table = $wpdb->prefix . 'oopspam_frm_ham_entries';
-    
+        
          // Start building the query
          $where = array();
@@ -160 +166 @@
          // Add search condition if search term is provided
          if (!empty($search)) {
+             // Use separate placeholders for each LIKE condition
              $search_term = '%' . $wpdb->esc_like($search) . '%';
              $where[] = "(form_id LIKE %s OR message LIKE %s OR ip LIKE %s OR email LIKE %s OR raw_entry LIKE %s)";
-             $values = array_merge($values, array($search_term, $search_term, $search_term, $search_term, $search_term));
+             $values = array_merge($values, array_fill(0, 5, $search_term));
          }
      
@@ -277 +284 @@
     public static function record_count() {
         global $wpdb;
-        $table = $wpdb->prefix . 'oopspam_frm_ham_entries';
-
-        return $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM %i", $table));
+        $table = $wpdb->prefix . 'oopspam_frm_ham_entries';
+        
+        $where = array();
+        $values = array($table);
+        
+        $sql = "SELECT COUNT(*) FROM %i";
+        
+        // Add search condition if search term is provided
+        if (!empty($_REQUEST['s'])) {
+            $search = sanitize_text_field($_REQUEST['s']);
+            $search_term = '%' . $wpdb->esc_like($search) . '%';
+            $where[] = "(form_id LIKE %s OR message LIKE %s OR ip LIKE %s OR email LIKE %s OR raw_entry LIKE %s)";
+            $values = array_merge($values, array_fill(0, 5, $search_term));
+        }
+        
+        // Combine WHERE clauses
+        if (!empty($where)) {
+            $sql .= " WHERE " . implode(" AND ", $where);
+        }
+        
+        return $wpdb->get_var($wpdb->prepare($sql, $values));
     }
 
@@ -393 +418 @@
         }
 
-        $response = wp_remote_get("https://reallyfreegeoip.org/json/{$ip}");
+        $args = array(
+            'timeout' => 5,
+            'redirection' => 5,
+            'httpversion' => '1.1',
+            'blocking' => true,
+            'sslverify' => true
+        );
+
+        $response = wp_remote_get("https://reallyfreegeoip.org/json/{$ip}", $args);
+        
         if (is_wp_error($response)) {
+            error_log('IP Geolocation Error: ' . $response->get_error_message());
             return '';
         }
 
+        if (wp_remote_retrieve_response_code($response) !== 200) {
+            error_log('IP Geolocation Error: Non-200 response code');
+            return '';
+        }
+
         $body = wp_remote_retrieve_body($response);
+        if (empty($body)) {
+            return '';
+        }
+
         $data = json_decode($body, true);
         if (isset($data['country_code'])) {
@@ -480 +524 @@
      */
     public function prepare_items() {
-
         $this->_column_headers = $this->get_column_info();
+
+        // Handle individual actions
+        $action = $this->current_action();
+        if ($action === 'report') {
+            if (isset($_GET['ham']) && isset($_GET['_wpnonce'])) {
+                $entry_id = absint($_GET['ham']);
+                if (wp_verify_nonce($_GET['_wpnonce'], 'sp_report_ham')) {
+                    self::report_ham_entry($entry_id);
+                    wp_redirect(remove_query_arg(['action', 'ham', '_wpnonce']));
+                    exit;
+                }
+            }
+        }
 
         /** Process bulk action */
         $this->process_bulk_action();
 
-        $per_page     = $this->get_items_per_page( 'entries_per_page', 10 );
+        $per_page = $this->get_items_per_page('entries_per_page', 10);
         $current_page = $this->get_pagenum();
-        $total_items  = self::record_count();
-
-        $this->set_pagination_args( [
-            'total_items' => $total_items, //We have to calculate the total number of items
-            'per_page'    => $per_page //We have to determine how many items to show on a page
-        ] );
-
-        if (isset($_POST['page']) && isset($_POST['s'])) {
-            $this->items = self::get_ham_entries($per_page, $current_page, $_POST['s']);
-        } else {
-            $this->items = self::get_ham_entries( $per_page, $current_page, "" );
+        
+        // Get search query from either POST or GET
+        $search = '';
+        if (!empty($_REQUEST['s'])) {
+            $search = sanitize_text_field($_REQUEST['s']);
+            // Limit search term length to prevent excessive long queries
+            $search = substr($search, 0, 100);
         }
+        
+        $total_items = self::record_count();
+        
+        $this->set_pagination_args([
+            'total_items' => $total_items,
+            'per_page'    => $per_page
+        ]);
+
+        $this->items = self::get_ham_entries($per_page, $current_page, $search);
     }
 
     public function process_bulk_action() {
-
-        //Detect when a bulk action is being triggered...
-        if ('bulk-report' === $this->current_action()) {
-            $report_ids = isset($_POST['bulk-delete']) ? array_map('intval', $_POST['bulk-delete']) : [];
-    
-            if (!empty($report_ids)) {
-                foreach ($report_ids as $id) {
-                    // Report each selected entry as spam
-                    self::report_ham_entry($id);
-                }
-                // Add a message to notify the user of success
-                echo '<div class="updated"><p>Selected entries have been reported as spam.</p></div>';
-            }
-        }
-        
-        if ( 'report' === $this->current_action() ) {
-
-            // In our file that handles the request, verify the nonce.
-            $nonce = esc_attr( $_GET['_wpnonce'] );
-
-            if (!isset( $_GET['_wpnonce'] ) ||  !wp_verify_nonce( $nonce, 'sp_report_ham' ) ) {
-                die( 'Not allowed!' );
-            }
-            else {
-                self::report_ham_entry( absint( $_GET['ham'] ) );
-
-                // esc_url_raw() is used to prevent converting ampersand in url to "#038;"
-                // add_query_arg() return the current url
-                // wp_redirect( esc_url_raw(add_query_arg()) );
-                wp_redirect( admin_url( 'admin.php?page=wp_oopspam_frm_ham_entries' ) );
-                exit;
-            }
-
-        }
-        if ( 'delete' === $this->current_action() ) {
-
-            // In our file that handles the request, verify the nonce.
-            $nonce = esc_attr( $_GET['_wpnonce'] );
-
-            if (!isset( $_GET['_wpnonce'] ) ||  !wp_verify_nonce( $nonce, 'sp_delete_ham' ) ) {
-                die( 'Not allowed!' );
-            }
-            else {
-                self::delete_ham_entry( absint( $_GET['ham'] ) );
-
-                        // esc_url_raw() is used to prevent converting ampersand in url to "#038;"
-                        // add_query_arg() return the current url
-                        // wp_redirect( esc_url_raw(add_query_arg()) );
-                        wp_redirect( admin_url( 'admin.php?page=wp_oopspam_frm_ham_entries' ) );
-                exit;
-            }
-
-        }
-
-        // If the delete bulk action is triggered
-        if ( ( isset( $_POST['action'] ) && $_POST['action'] == 'bulk-delete' )
-             || ( isset( $_POST['action2'] ) && $_POST['action2'] == 'bulk-delete' )
-        ) {
-
-            $delete_ids = esc_sql( $_POST['bulk-delete'] );
-
-            // loop over the array of record IDs and delete them
-            foreach ( $delete_ids as $id ) {
-                self::delete_ham_entry( $id );
-            }
-
-            // esc_url_raw() is used to prevent converting ampersand in url to "#038;"
-                // add_query_arg() return the current url
-                wp_redirect( esc_url_raw(add_query_arg()) );
-            exit;
-        }
-    }
+    // Security check
+    if (isset($_POST['_wpnonce']) && !empty($_POST['_wpnonce'])) {
+        $nonce = filter_input(INPUT_POST, '_wpnonce', FILTER_UNSAFE_RAW);
+        $nonce = sanitize_text_field($nonce);
+        if (!wp_verify_nonce($nonce, 'bulk-' . $this->_args['plural'])) {
+            wp_die('Security check failed!');
+        }
+    }
+
+    $action = $this->current_action();
+    if (in_array($action, ['bulk-delete', 'bulk-report'])) {
+        $entry_ids = isset($_POST['bulk-delete']) ? array_map('absint', $_POST['bulk-delete']) : array();
+        if (!empty($entry_ids)) {
+            // Add JavaScript for async processing
+            add_action('admin_footer', function() use ($entry_ids, $action) {
+                ?>
+                <style>
+                    .oopspam-progress {
+                        background: #f0f0f1;
+                        border: 1px solid #c3c4c7;
+                        padding: 10px;
+                        margin: 10px 0;
+                        border-radius: 4px;
+                        display: none;
+                    }
+                    .oopspam-progress.active {
+                        display: block;
+                    }
+                </style>
+                <script type="text/javascript">
+                jQuery(document).ready(function($) {
+                    let remainingIds = <?php echo json_encode($entry_ids); ?>;
+                    let processed = 0;
+                    let total = remainingIds.length;
+                    
+                    // Add progress div after the description and before the table
+                    $('<div id="oopspam-progress" class="oopspam-progress"><div class="progress-text"></div></div>')
+                        .insertBefore('.wp-list-table');
+                    
+                    let $progress = $('#oopspam-progress');
+                    let $progressText = $progress.find('.progress-text');
+                    
+                    function updateProgress(processed, total) {
+                        $progress.addClass('active');
+                        $progressText.html('Processing: ' + processed + ' of ' + total + ' entries... (' + Math.round((processed/total) * 100) + '%)');
+                    }
+                    
+                    function processNextEntry() {
+                        updateProgress(processed, total);
+                        
+                        $.ajax({
+                            url: ajaxurl,
+                            type: 'POST',
+                            data: {
+                                action: 'process_bulk_entries',
+                                nonce: '<?php echo wp_create_nonce('bulk-entries'); ?>',
+                                entry_ids: remainingIds,
+                                bulk_action: '<?php echo $action; ?>',
+                                entry_type: 'ham'
+                            },
+                            success: function(response) {
+                                if (response.success) {
+                                    processed++;
+                                    remainingIds = response.data.remaining;
+                                    
+                                    if (response.data.complete) {
+                                        $progressText.html('Processing complete! Reloading page...');
+                                        setTimeout(function() {
+                                            location.reload();
+                                        }, 1000);
+                                    } else {
+                                        processNextEntry();
+                                    }
+                                } else {
+                                    $progressText.html('Error occurred during processing.');
+                                }
+                            },
+                            error: function() {
+                                $progressText.html('Error occurred during processing.');
+                            }
+                        });
+                    }
+                    
+                    processNextEntry();
+                });
+                </script>
+                <?php
+            });
+        }
+    }
+}
 
 }
@@ -638 +718 @@
                     <div id="post-body-content">
                         <div class="meta-box-sortables ui-sortable">
-                            <form method="get"> <!-- Changed from post to get -->
-                                <input type="hidden" name="page" value="<?php echo esc_attr($_REQUEST['page']) ?>" />
+                            <form method="post">
                                 <?php 
                                 $this->entries_obj->prepare_items();
-                                $this->entries_obj->search_box('search', 'search_id');
+                                $this->entries_obj->search_box('Search Entries', 'search_id');
+                                wp_nonce_field('bulk-' . $this->entries_obj->_args['plural']);
                                 $this->entries_obj->display(); 
                                 ?>

oopspam-anti-spam/trunk/include/UI/display-spam-entries.php

@@ -159 +159 @@
     public static function get_spam_entries($per_page = 5, $page_number = 1, $search = "") {
         global $wpdb;
+        
+        // Validate and sanitize input parameters
+        $per_page = absint($per_page);
+        $page_number = absint($page_number);
+        $search = sanitize_text_field($search);
+        
         $table = $wpdb->prefix . 'oopspam_frm_spam_entries';
         
@@ -167 +173 @@
         // Add search condition if search term is provided
         if (!empty($search)) {
+            // Use separate placeholders for each LIKE condition
             $search_term = '%' . $wpdb->esc_like($search) . '%';
             $where[] = "(form_id LIKE %s OR message LIKE %s OR ip LIKE %s OR email LIKE %s OR raw_entry LIKE %s)";
-            $values = array_merge($values, array($search_term, $search_term, $search_term, $search_term, $search_term));
+            $values = array_merge($values, array_fill(0, 5, $search_term));
         }
 
@@ -571 +578 @@
     public static function record_count() {
         global $wpdb;
-        $table = $wpdb->prefix . 'oopspam_frm_spam_entries';
-
-        $sql = $wpdb->prepare("SELECT COUNT(*) FROM %i WHERE 1=1", $table);
-        $values = array();
+        $table = $wpdb->prefix . 'oopspam_frm_spam_entries';
+        
+        $where = array();
+        $values = array($table);
+        
+        $sql = "SELECT COUNT(*) FROM %i";
+        
+        // Add search condition if search term is provided
+        if (!empty($_REQUEST['s'])) {
+            $search = sanitize_text_field($_REQUEST['s']);
+            $search_term = '%' . $wpdb->esc_like($search) . '%';
+            $where[] = "(form_id LIKE %s OR message LIKE %s OR ip LIKE %s OR email LIKE %s OR raw_entry LIKE %s)";
+            $values = array_merge($values, array_fill(0, 5, $search_term));
+        }
         
         // Add reason filter if selected
         if (isset($_GET['filter_reason']) && !empty($_GET['filter_reason'])) {
-            $sql = $wpdb->prepare(
-                "SELECT COUNT(*) FROM %i WHERE reason = %s",
-                $table,
-                sanitize_text_field($_GET['filter_reason'])
-            );
-        }
-        
-        return $wpdb->get_var($sql);
-    }
-
+            $where[] = "reason = %s";
+            $values[] = sanitize_text_field($_GET['filter_reason']);
+        }
+        
+        // Combine WHERE clauses
+        if (!empty($where)) {
+            $sql .= " WHERE " . implode(" AND ", $where);
+        }
+        
+        return $wpdb->get_var($wpdb->prepare($sql, $values));
+    }
 
     /** Text displayed when no spam entry is available */
@@ -760 +778 @@
      */
     public function prepare_items() {
-
         $this->_column_headers = $this->get_column_info();
+
+        // Handle individual actions
+        $action = $this->current_action();
+        if ($action === 'report') {
+            if (isset($_GET['spam']) && isset($_GET['_wpnonce'])) {
+                $entry_id = absint($_GET['spam']);
+                if (wp_verify_nonce($_GET['_wpnonce'], 'sp_report_spam')) {
+                    self::report_spam_entry($entry_id);
+                    wp_redirect(remove_query_arg(['action', 'spam', '_wpnonce']));
+                    exit;
+                }
+            }
+        }
 
         /** Process bulk action */
         $this->process_bulk_action();
 
-        $per_page     = $this->get_items_per_page( 'entries_per_page', 10 );
+        $per_page = $this->get_items_per_page('entries_per_page', 10);
         $current_page = $this->get_pagenum();
-        $total_items  = self::record_count();
-
-        $this->set_pagination_args( [
-            'total_items' => $total_items, //We have to calculate the total number of items
-            'per_page'    => $per_page //We have to determine how many items to show on a page
-        ] );
-
-        if (isset($_POST['page']) && isset($_POST['s'])) {
-            $this->items = self::get_spam_entries($per_page, $current_page, $_POST['s']);
-        } else {
-            $this->items = self::get_spam_entries( $per_page, $current_page, "" );
-        }
+        
+        // Sanitize search input
+        $search = '';
+        if (!empty($_REQUEST['s'])) {
+            $search = sanitize_text_field($_REQUEST['s']);
+            // Limit search term length to prevent excessive long queries
+            $search = substr($search, 0, 100);
+        }
+        
+        $total_items = self::record_count();
+        
+        $this->set_pagination_args([
+            'total_items' => $total_items,
+            'per_page'    => $per_page
+        ]);
+
+        $this->items = self::get_spam_entries($per_page, $current_page, $search);
     }
 
     public function process_bulk_action() {
-
-        //Detect when a bulk action is being triggered...
-        if ('bulk-report' === $this->current_action()) {
-            
-            $report_ids = isset($_POST['bulk-delete']) ? array_map('intval', $_POST['bulk-delete']) : [];
-    
-            if (!empty($report_ids)) {
-                foreach ($report_ids as $id) {
-                    // Report each selected entry as ham
-                    self::report_spam_entry($id);
-                }
-                // Add a message to notify the user of success
-                echo '<div class="updated"><p>Selected entries have been reported as ham.</p></div>';
-            }
-        }
-        if ( 'report' === $this->current_action() ) {
-
-            // Verify the nonce.
-            $nonce = esc_attr( $_GET['_wpnonce'] );
-
-            if (!isset( $_GET['_wpnonce'] ) ||  !wp_verify_nonce( $nonce, 'sp_report_spam' ) ) {
-                die( 'Not allowed!' );
-            }
-            else {
-                self::report_spam_entry( absint( $_GET['spam'] ) );
-                wp_redirect( admin_url( 'admin.php?page=wp_oopspam_frm_spam_entries' ) );
-                exit;
-            }
-
-        }
-        if ( 'delete' === $this->current_action() ) {
-
-            // Verify the nonce.
-            $nonce = esc_attr( $_GET['_wpnonce'] );
-
-            if (!isset( $_GET['_wpnonce'] ) ||  !wp_verify_nonce( $nonce, 'sp_delete_spam' ) ) {
-                die( 'Not allowed!' );
-            }
-            else {
-                self::delete_spam_entry( absint( $_GET['spam'] ) );
-                        wp_redirect( admin_url( 'admin.php?page=wp_oopspam_frm_spam_entries' ) );
-                exit;
-            }
-
-        }
-        if ( 'notify' === $this->current_action() ) {
-
-            // Verify the nonce.
-            $nonce = esc_attr( $_GET['_wpnonce'] );
-
-            if (!isset( $_GET['_wpnonce'] ) ||  !wp_verify_nonce( $nonce, 'sp_notify_spam' ) ) {
-                die( 'Not allowed!' );
-            }
-            else {
-                self::notify_spam_entry( absint( $_GET['spam'] ) );
-            }
-
-        }
-
-        // If the delete bulk action is triggered
-        if ( ( isset( $_POST['action'] ) && $_POST['action'] == 'bulk-delete' )
-             || ( isset( $_POST['action2'] ) && $_POST['action2'] == 'bulk-delete' )
-        ) {
-
-            $delete_ids = esc_sql( $_POST['bulk-delete'] );
-
-            // loop over the array of record IDs and delete them
-            foreach ( $delete_ids as $id ) {
-                self::delete_spam_entry( $id );
-            }
-
-            // esc_url_raw() is used to prevent converting ampersand in url to "#038;"
-                // add_query_arg() return the current url
-                wp_redirect( esc_url_raw(add_query_arg()) );
-            exit;
-        }
-    }
+    // Security check
+    if (isset($_POST['_wpnonce']) && !empty($_POST['_wpnonce'])) {
+        $nonce = filter_input(INPUT_POST, '_wpnonce', FILTER_UNSAFE_RAW);
+        $nonce = sanitize_text_field($nonce);
+        if (!wp_verify_nonce($nonce, 'bulk-' . $this->_args['plural'])) {
+            wp_die('Security check failed!');
+        }
+    }
+
+    $action = $this->current_action();
+    if (in_array($action, ['bulk-delete', 'bulk-report'])) {
+        $entry_ids = isset($_POST['bulk-delete']) ? array_map('absint', $_POST['bulk-delete']) : array();
+        if (!empty($entry_ids)) {
+            // Add JavaScript for async processing
+            add_action('admin_footer', function() use ($entry_ids, $action) {
+                ?>
+                <style>
+                    .oopspam-progress {
+                        background: #f0f0f1;
+                        border: 1px solid #c3c4c7;
+                        padding: 10px;
+                        margin: 10px 0;
+                        border-radius: 4px;
+                        display: none;
+                    }
+                    .oopspam-progress.active {
+                        display: block;
+                    }
+                </style>
+                <script type="text/javascript">
+                jQuery(document).ready(function($) {
+                    let remainingIds = <?php echo json_encode($entry_ids); ?>;
+                    let processed = 0;
+                    let total = remainingIds.length;
+                    
+                    // Add progress div after the description and before the table
+                    $('<div id="oopspam-progress" class="oopspam-progress"><div class="progress-text"></div></div>')
+                        .insertBefore('.wp-list-table');
+                    
+                    let $progress = $('#oopspam-progress');
+                    let $progressText = $progress.find('.progress-text');
+                    
+                    function updateProgress(processed, total) {
+                        $progress.addClass('active');
+                        $progressText.html('Processing: ' + processed + ' of ' + total + ' entries... (' + Math.round((processed/total) * 100) + '%)');
+                    }
+                    
+                    function processNextEntry() {
+                        updateProgress(processed, total);
+                        
+                        $.ajax({
+                            url: ajaxurl,
+                            type: 'POST',
+                            data: {
+                                action: 'process_bulk_entries',
+                                nonce: '<?php echo wp_create_nonce('bulk-entries'); ?>',
+                                entry_ids: remainingIds,
+                                bulk_action: '<?php echo $action; ?>',
+                                entry_type: 'spam'
+                            },
+                            success: function(response) {
+                                if (response.success) {
+                                    processed++;
+                                    remainingIds = response.data.remaining;
+                                    
+                                    if (response.data.complete) {
+                                        $progressText.html('Processing complete! Reloading page...');
+                                        setTimeout(function() {
+                                            location.reload();
+                                        }, 1000);
+                                    } else {
+                                        processNextEntry();
+                                    }
+                                } else {
+                                    $progressText.html('Error occurred during processing.');
+                                }
+                            },
+                            error: function() {
+                                $progressText.html('Error occurred during processing.');
+                            }
+                        });
+                    }
+                    
+                    processNextEntry();
+                });
+                </script>
+                <?php
+            });
+        }
+    }
+}
 
     function column_ip($item) {
@@ -873 +922 @@
         }
 
-        $response = wp_remote_get("https://reallyfreegeoip.org/json/{$ip}");
+        $args = array(
+            'timeout' => 5,
+            'redirection' => 5,
+            'httpversion' => '1.1',
+            'blocking' => true,
+            'sslverify' => true
+        );
+
+        $response = wp_remote_get("https://reallyfreegeoip.org/json/{$ip}", $args);
+        
         if (is_wp_error($response)) {
+            error_log('IP Geolocation Error: ' . $response->get_error_message());
             return '';
         }
 
+        if (wp_remote_retrieve_response_code($response) !== 200) {
+            error_log('IP Geolocation Error: Non-200 response code');
+            return '';
+        }
+
         $body = wp_remote_retrieve_body($response);
+        if (empty($body)) {
+            return '';
+        }
+
         $data = json_decode($body, true);
         if (isset($data['country_code'])) {
@@ -952 +1020 @@
                     <div id="post-body-content">
                         <div class="meta-box-sortables ui-sortable">
-                            <form method="get"> <!-- Changed from post to get -->
-                                <input type="hidden" name="page" value="<?php echo esc_attr($_REQUEST['page']) ?>" />
+                            <form method="post">
                                 <?php 
                                 $this->entries_obj->prepare_items();
-                                $this->entries_obj->search_box('search', 'search_id');
+                                $this->entries_obj->search_box('Search Entries', 'search_id');
+                                wp_nonce_field('bulk-' . $this->entries_obj->_args['plural']);
                                 $this->entries_obj->display(); 
                                 ?>

oopspam-anti-spam/trunk/integration/ContactForm7.php

@@ -22 +22 @@
         }
 
+        // Check for default email field first
         if (isset($_POST["your-email"])) {
             $email = sanitize_email($_POST["your-email"]);
+        } else {
+            // If default email field not found, look for any field containing 'email'
+            foreach ($_POST as $field_name => $field_value) {
+                if (is_string($field_name) && stripos($field_name, 'email') !== false) {
+                    $email = sanitize_email($field_value);
+                    break;
+                }
+            }
         }
 

oopspam-anti-spam/trunk/integration/WooCommerce.php

@@ -121 +121 @@
                 wp_die($error_to_show);
             }
-
+        }
             // Now check with OOPSpam API
-            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']));
+            $message = isset($post['order_comments']) ? sanitize_text_field($post['order_comments']) : '';
+            if (empty($message) && isset($data['customer_note'])) {
+                $message = sanitize_text_field($data['customer_note']);
+            }
+            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']), $message);
             if ($showError) {
                 $error_to_show = $this->get_error_message();
                 wc_add_notice( esc_html__( $error_to_show ), 'error' );
             }
-        }
+        
     }    
     
@@ -135 +139 @@
         
         $data = json_decode($order, true);
-
+        
         // Check for allowed email/IP
         $hasAllowedEmail = isset($data['billing']['email']) ? $this->isEmailAllowed($data['billing']['email'], $data) : false;
@@ -181 +185 @@
                 wp_die($error_to_show);
             }
-
+        }
             // Now check with OOPSpam API
-            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']));
+            $message = isset($data['customer_note']) ? sanitize_text_field($data['customer_note']) : '';
+            if (empty($message) && isset($data['order_comments'])) {
+                $message = sanitize_text_field($data['order_comments']);
+            }
+            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']), $message);
             if ($showError) {
                 $error_to_show = $this->get_error_message();
                 wc_add_notice( esc_html__( $error_to_show ), 'error' );
             }
-        }
+        
     }    
 
@@ -239 +247 @@
 
             // Now check with OOPSpam API
-            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']));
+            $message = isset($data['customer_note']) ? sanitize_text_field($data['customer_note']) : '';
+            if (empty($message) && isset($posted_data['order_comments'])) {
+                $message = sanitize_text_field($posted_data['order_comments']);
+            }
+            $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($data['billing']['email']), $message);
             if ($showError) {
                 $error_to_show = $this->get_error_message();
@@ -249 +261 @@
     function oopspam_checkout_process() {
 
-        $email = "";
+        $email = ""; $message = "";
+        $message = isset($_POST['order_comments']) ? sanitize_text_field($_POST['order_comments']) : '';
+        if (empty($message) && isset($_POST['customer_note'])) {
+            $message = sanitize_text_field($_POST['customer_note']);
+        }
         if (isset($_POST["billing_email"]) && is_email($_POST["billing_email"])) {
             $email = $_POST["billing_email"];
         }
-        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email));
+        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email), sanitize_text_field($message));
         if ($showError) {
             $error_to_show = $this->get_error_message();
@@ -401 +417 @@
 
         // OOPSpam check
-        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email));
+        $message = isset($_POST['order_comments']) ? sanitize_text_field($_POST['order_comments']) : '';
+        if (empty($message) && isset($_POST['customer_note'])) {
+            $message = sanitize_text_field($_POST['customer_note']);
+        }
+        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email), $message);
         if ($showError) {
             $error_to_show = $this->get_error_message();
@@ -453 +473 @@
 
         // OOPSpam check
-        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email));
+        $message = isset($_POST['order_comments']) ? sanitize_text_field($_POST['order_comments']) : '';
+        if (empty($message) && isset($_POST['customer_note'])) {
+            $message = sanitize_text_field($_POST['customer_note']);
+        }
+        $showError = $this->checkEmailAndIPInOOPSpam(sanitize_email($email), $message);
 
         if ($showError) {
@@ -464 +488 @@
     }
 
-    public function checkEmailAndIPInOOPSpam($email)
+    public function checkEmailAndIPInOOPSpam($email, $message)
     {
 
@@ -478 +502 @@
 
         if (!empty($userIP) || !empty($email)) {
-            $detectionResult = oopspamantispam_call_OOPSpam("", $userIP, $email, true, "woo");
+            $detectionResult = oopspamantispam_call_OOPSpam($message, $userIP, $email, true, "woo");
             if (!isset($detectionResult["isItHam"])) {
                 return false;
@@ -485 +509 @@
             $frmEntry = [
                 "Score" => $detectionResult["Score"],
-                "Message" => "",
+                "Message" => $message,
                 "IP" => $userIP,
                 "Email" => $email,

oopspam-anti-spam/trunk/oopspam-antispam.php

@@ -4 +4 @@
  * Plugin URI: https://www.oopspam.com/
  * Description: Stop bots and manual spam from reaching you in comments & contact forms. All with high accuracy, accessibility, and privacy.
- * Version: 1.2.29
+ * Version: 1.2.30
  * Author: OOPSpam
  * Author URI: https://www.oopspam.com/
@@ -40 +40 @@
 require_once dirname(__FILE__) . '/include/UI/display-spam-entries.php';
 require_once dirname(__FILE__) . '/include/oopspam-rate-limiting.php';
+require_once dirname(__FILE__) . '/include/Background/AsyncProcessor.php';
 
 add_action('init', 'oopspam_do_output_buffer');

oopspam-anti-spam/trunk/options.php

@@ -24 +24 @@
     );
 
+}
+
+add_action('wp_ajax_update_cloud_providers_setting', 'oopspam_update_cloud_providers_setting');
+
+function oopspam_update_cloud_providers_setting() {
+    // Verify nonce
+    if (!check_ajax_referer('oopspam_update_cloud_providers', 'nonce', false)) {
+        wp_send_json_error('Invalid security token');
+        return;
+    }
+
+    // Get current settings
+    $options = get_option('oopspamantispam_ipfiltering_settings', array());
+    
+    // Update based on enable parameter
+    $enable = isset($_POST['enable']) && filter_var($_POST['enable'], FILTER_VALIDATE_BOOLEAN);
+    if (!is_array($options)) {
+        $options = array();
+    }
+    
+    if ($enable) {
+        $options['oopspam_block_cloud_providers'] = "1";
+    } else {
+        unset($options['oopspam_block_cloud_providers']);
+    }
+    
+    // Save the updated settings
+    if (update_option('oopspamantispam_ipfiltering_settings', $options)) {
+        wp_send_json_success('Setting updated successfully');
+    } else {
+        wp_send_json_error('Failed to update setting');
+    }
 }
 
@@ -1486 +1518 @@
             var rangeTextOutput = document.getElementById('range_text');
             rangeTextOutput.value = thresholdDescriptions[rangeInput.value];
+
+            // Send AJAX request to update cloud providers setting
+            var value = parseInt(rangeInput.value);
+            var enableCloudProviders = value >= 4;
+            
+            jQuery.post(ajaxurl, {
+                action: 'update_cloud_providers_setting',
+                nonce: '<?php echo wp_create_nonce("oopspam_update_cloud_providers"); ?>',
+                enable: enableCloudProviders
+            });
         }
 

oopspam-anti-spam/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.6
 Tested up to: 6.7
-Stable tag: 1.2.29
+Stable tag: 1.2.30
 License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
 Stop bots and manual spam from reaching you in comments & contact forms. All with high accuracy, accessibility, and privacy. 
@@ -106 +106 @@
 
 == Changelog ==
+= 1.2.30 =
+* **IMPROVEMENT:** Bulk actions are now processed asynchronously with a progress bar in the Form Spam and Form Ham Entries tables
+* **IMPROVEMENT:** [Contact Form 7] Enhanced extraction method for email field value if the default is missing
+* **IMPROVEMENT:** [WooCommerce] "Block URLs in message" setting now applies to Order Notes as well
+* **IMPROVEMENT:** "Block Cloud Providers" is now automatically enabled for any sensitivity level above Moderate
+* **FIX:** [WooCommerce] Resolved issue where spam protection didn't work in the Block Checkout
+* **FIX:** Resolved issue with bulk actions not running in the Form Spam and Form Ham Entries tables
+* **FIX:** Resolved search functionality issue in the Form Spam and Form Ham Entries tables
 = 1.2.29 =
 * **NEW:** Added support for Multi-site/Network installations