Changeset 2589865

Timestamp:

08/27/2021 01:39:59 PM (5 years ago)

Author:

outerbridge

Message:

v4.1.0 - 210827 - Fixed problem with comments form validation. Working with WP5.8

File:

• humancaptcha/trunk/outerbridge-humancaptcha.php (modified) (10 diffs)

humancaptcha/trunk/outerbridge-humancaptcha.php

@@ -5 +5 @@
 Description: HumanCaptcha uses questions that require human logic to answer them and which machines cannot easily answer.
 Author: Outerbridge
-Version: 4.0.0
+Version: 4.1.0
 Author URI: https://outerbridge.co.uk/
 Text Domain: humancaptcha
@@ -14 +14 @@
 /**
  *
+ *  v4.1.0  210827  Fixed problem with comments form validation.  Working with WP5.8
+ *
  *  v4.0.0  210611  Fixed session issue, thanks to @tmuk.  Working with WP5.7
- *
  *  v3.1    200116  Improved foreign character handling
  *  v3.0    180105  Improved accessibility (thanks to Ondrej), moved admin menu to Settings, tidied admin page, added Settings link to Plugins page
@@ -40 +41 @@
  */
 
-$obr_humancaptcha = new obr_humancaptcha;
-
 global $wpdb;
     
@@ -53 +52 @@
     
     // version
-    public $obr_humancaptcha_version = '4.0.0';
+    public $obr_humancaptcha_version = '4.1.0';
     
     function __construct(){
@@ -70 +69 @@
         add_action('admin_menu', array($this, 'obr_admin_menu'));
         add_action('init', array($this, 'obr_init'));
-        add_action( 'wp_loaded', array( $this, 'obr_close_session' ), 30 );
+        //add_action( 'wp_loaded', array( $this, 'obr_close_session' ), 30 );
 
         add_filter('plugin_action_links_'.plugin_basename(__FILE__), array($this, 'obr_plugin_settings_link'));
@@ -186 +185 @@
         global $user_ID;
         if (!$user_ID){
+            if (!session_id()){
+                session_start();
+            }
             $selected = $this->obr_select_question();
             $question = $selected['question'];
             $answer = $selected['answer'];
-            session_start();
-            $_SESSION['obr_answer'] = md5(strtolower(trim($answer)));
+            $_SESSION[ 'obranswer' ] = md5( strtolower( trim( $answer ) ) );
             session_write_close();
             // use the comment-form-email class as it works better with 2011
@@ -224 +225 @@
         $question = $selected[ 'question' ];
         $answer = $selected[ 'answer' ];
-        session_start();
-        $_SESSION[ 'obr_answer' ] = md5( strtolower( trim( $answer ) ) );
+        if ( !session_id() ) {
+            session_start();
+        }
+        $_SESSION[ 'obranswer' ] = md5( strtolower( trim( $answer ) ) );
         session_write_close();
         $outputfield = '<p><label for="answer">' . stripslashes( $question ) . '</label><br /><input type="text" name="answer" id="answer" class="input" value="" size="25" tabindex="20" /></p>';
@@ -257 +260 @@
             $errors->add('obr_error', __('Error: please fill the required field (humancaptcha).', 'humancaptcha'));
         } else {
-            $user_answer = md5(strtolower(trim($_POST['answer'])));
-            session_start();
-            $obr_answer = strtolower(trim($_SESSION['obr_answer']));
+            $useranswer = md5(strtolower(trim($_POST['answer'])));
+            if ( !session_id() ) {
+                session_start();
+            }
+            $obranswer = strtolower(trim($_SESSION['obranswer']));
             session_write_close();
-            if ($user_answer != $obr_answer){
+            if ($useranswer != $obranswer){
                 $errors->add('obr_error', __('Error: your answer to the humancaptcha question is incorrect.', 'humancaptcha'));
             }
@@ -282 +287 @@
             wp_die(__('Error: please fill the required field (humancaptcha).', 'humancaptcha'));
         }
-        $user_answer = md5(strtolower(trim($_POST['answer'])));
-        $obr_answer = strtolower(trim($_SESSION['obr_answer']));
+        $useranswer = md5(strtolower(trim($_POST['answer'])));
+        $obranswer = strtolower(trim($_SESSION['obranswer']));
         session_write_close();
-        if ($user_answer != $obr_answer){
+        if ($useranswer != $obranswer){
             wp_die(__('Error: your answer to the humancaptcha question is incorrect.  Use your browser\'s back button to try again.', 'humancaptcha'));
         }
@@ -510 +515 @@
     }
 }
-?>
+
+$obr_humancaptcha = new obr_humancaptcha;
+