Fix error with the Elementor Checkout Element.

hCaptcha · Jul 21, 2024 · 5f687da · 5f687da
1 parent a359d77
commit 5f687da
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/readme.txt b/readme.txt
@@ -565,6 +565,7 @@ Instructions for popular native integrations are below:
 * Fixed conflict with Ninja Forms Upload field.
 * Fixed Ninja Forms Ajax processing.
 * Fixed error in cron with Matomo Analytics.
+* Fixed error with the Elementor Checkout Element.
 
 = 4.3.1 =
 * Added a live form in the Contact Form 7 admin form view.

diff --git a/src/php/AutoVerify/AutoVerify.php b/src/php/AutoVerify/AutoVerify.php
@@ -73,13 +73,7 @@ public function widget_block_content_filter( $content, array $instance, WP_Widge
 	 * @noinspection ForgottenDebugOutputInspection
 	 */
 	public function verify_form(): void {
-		if ( ! Request::is_frontend() ) {
-			return;
-		}
-
-		$request_method = isset( $_SERVER['REQUEST_METHOD'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_METHOD'] ), FILTER_SANITIZE_FULL_SPECIAL_CHARS ) : '';
-
-		if ( 'POST' !== $request_method ) {
+		if ( ! Request::is_post() || ! Request::is_frontend() ) {
 			return;
 		}
 

diff --git a/src/php/GiveWP/Base.php b/src/php/GiveWP/Base.php
@@ -14,6 +14,7 @@
 
 use Give\DonationForms\ValueObjects\DonationFormErrorTypes;
 use HCaptcha\Helpers\HCaptcha;
+use HCaptcha\Helpers\Request;
 use WP_Error;
 
 /**
@@ -128,13 +129,7 @@ public function verify( $valid_data ): void {
 	 * @return void
 	 */
 	public function verify_block(): void {
-		// phpcs:disable WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended
-		$request_method = isset( $_SERVER['REQUEST_METHOD'] )
-			? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) )
-			: '';
-		// phpcs:enable WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Recommended
-
-		if ( 'POST' !== $request_method ) {
+		if ( ! Request::is_post() ) {
 			return;
 		}
 

diff --git a/src/php/Helpers/Request.php b/src/php/Helpers/Request.php
@@ -20,7 +20,7 @@ class Request {
 	 * @return bool
 	 */
 	public static function is_frontend(): bool {
-		return ! ( self::is_cli() || is_admin() || wp_doing_ajax() || self::is_rest() );
+		return ! ( self::is_cli() || is_admin() || wp_doing_ajax() || self::is_wc_ajax() || self::is_rest() );
 	}
 
 	/**
@@ -78,4 +78,27 @@ public static function is_rest(): bool {
 
 		return 0 === strpos( $current_url, $rest_url );
 	}
+
+	/**
+	 * Check if it is a POST request.
+	 *
+	 * @return bool
+	 */
+	public static function is_post(): bool {
+		$request_method = isset( $_SERVER['REQUEST_METHOD'] )
+			? strtoupper( filter_var( wp_unslash( $_SERVER['REQUEST_METHOD'] ), FILTER_SANITIZE_FULL_SPECIAL_CHARS ) )
+			: '';
+
+		return 'POST' === $request_method;
+	}
+
+	/**
+	 * Check if it is a WooCommerce AJAX request.
+	 *
+	 * @return bool
+	 */
+	public static function is_wc_ajax(): bool {
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		return isset( $_GET['wc-ajax'] );
+	}
 }