Switch to our own session handler

This seems to fix some race conditions when storing _mf_captcha_code.
lichtmetzger · May 17, 2023 · 1a316b9 · 1a316b9
1 parent a1c76bb
commit 1a316b9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/mega-forms-local-captcha.php b/mega-forms-local-captcha.php
@@ -5,7 +5,7 @@
  * Text Domain:       mega-forms-local-captcha
  * Domain Path:       /languages
  * Description:       Integrates a local captcha by MobiCMS into Mega Forms.
- * Version:           1.1
+ * Version:           1.2
  * Requires at least: 6.0
  * Author:            Qbus Internetagentur GmbH
  * Author URI:        https://qbus.de

diff --git a/src/Initialize.php b/src/Initialize.php
@@ -13,13 +13,21 @@
 
 class Initialize {
     public function __construct() {
+        add_action( 'init', [$this, 'startSession'], 1 );
+
         // Register translations before everything else
         $translations = new Translations;
         add_action( 'init', [$translations, 'register'], 5 );
 
         add_action( 'init', [$this, 'loadMain'], 10 );
     }
 
+    public function startSession() {
+        if ( ! session_id() ) {
+            session_start();
+        }
+    }
+
     public function loadMain() {
         new Settings;
         new Views;

diff --git a/src/Submissions.php b/src/Submissions.php
@@ -20,7 +20,8 @@ public function validate($object) {
         // If MobiCMS captcha is enabled, validate it
 		if (mfget_option('mobicaptcha_status', false)) {
 			$result = mfpost('_mf_captcha_code', $object->posted, '');
-			$session = mf_session()->get('_mf_captcha_code');
+			//$session = mf_session()->get('_mf_captcha_code');
+			$session = $_SESSION['_mf_captcha_code'];
 			$codes = array_map('strtolower', explode(',', $session));
 
 			if ($result !== null && $codes !== null) {

diff --git a/src/Views.php b/src/Views.php
@@ -21,7 +21,7 @@ public function afterHiddenInputs() {
         // If MobiCMS Captcha is enabled, load it
 		if (mfget_option('mobicaptcha_status', false)) {
 			$code = (string) new Code;
-            $storedCode = mf_session()->get('_mf_captcha_code');
+            $storedCode = $_SESSION['_mf_captcha_code'];
 
             /* 
              * When embedding a contact form on an Elementor page, _mf_captcha_code is set multiple times,
@@ -34,9 +34,9 @@ public function afterHiddenInputs() {
              * 
             */
             if(!$storedCode) {
-                mf_session()->set('_mf_captcha_code', $code);
+                $_SESSION['_mf_captcha_code'] = $code;
             } else {
-                mf_session()->set('_mf_captcha_code', $storedCode.','.$code);
+                $_SESSION['_mf_captcha_code'] = $storedCode.','.$code;
             }
 
 			echo