Merge pull request #17 from Crowdhandler/strip-ch-url-parameters

Removing crowdhandler specific query parameters and redirect to sanat…

Author: carl-wells-crowdhandler

README.txt

@@ -1,8 +1,8 @@
 === CrowdHandler virtual waiting room ===
 Contributors: rickmutt
 Tags: waiting room, traffic management, queue management, ecommerce, CrowdHandler, 
-Tested up to: 6.0
-Stable tag: 1.1.8
+Tested up to: 6.1.1
+Stable tag: 1.1.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -89,6 +89,8 @@ You can uninstall the plugin at any time to remove CrowdHandler from your site.
 
 
 == Changelog ==
+= 1.1.9 =
+* Compatibility change for crowdhHandler-php-skd release 1.0.5 and added crowdhandler diagnostics
 = 1.1.8 =
 * Compatible with WP v6.0 
 = 1.1.7 =

composer.lock

@@ -16,7 +16,7 @@
  * Plugin Name:       CrowdHandler virtual waiting room
  * Plugin URI:        https://signup.crowdhandler.com/?utm_source=WordPress&utm_medium=Plugin_Dir
  * Description:       During periods of heavy traffic, our queue management solution helps safeguard your website from crashing and protects your sales.
- * Version:           1.1.8
+ * Version:           1.1.9
  * Author:            CROWDHANDLER LTD
  * License:           GPL-2.0+
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
@@ -38,7 +38,7 @@
  * Start at version 0.1.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define('CROWDHANDLER_VERSION', '1.1.8');
+define('CROWDHANDLER_VERSION', '1.1.9');
 
 /**
  * The code that runs during plugin activation.

crowdhandler.php

@@ -0,0 +1,31 @@
+<?php
+
+class CrowdhandlerDiagnostics
+{
+
+	/**
+	 * @var array
+	 */
+    private $options;
+
+    public function __construct()
+	{
+		if (function_exists('get_option')) {
+			$this->options = get_option('crowdhandler_settings');
+		}
+	}
+
+	/**
+	 * Adds a crowdhandler header to the request
+	 */
+    public function addCHDiagnostics($headers)
+	{
+		if($this->options){
+			$indexOverride = (isset($this->options['crowdhandler_settings_field_override_index'])) ? '1' : '0';
+			$timestamp = new DateTime();
+			$formatedTime = $timestamp->format(DateTime::ISO8601);
+			$headers['x-crowdhandler-info'] = $this->options['crowdhandler_settings_field_public_key'] . '::' . $indexOverride . '::' . $formatedTime;
+		}
+		return $headers;
+	}
+}

includes/class-crowdhandler-diagnostics.php

@@ -47,15 +47,14 @@ public function checkRequest()
 		$this->gateKeeper = new GateKeeper($api);
 
 		$this->gateKeeper->setIgnoreUrls(
-			"/^((?!.*\?).*(\.(avi|css|eot|gif|ico|jpg|jpeg|js|json|mov|mp4|mpeg|mpg|og[g|v]|pdf|png|svg|ttf|txt|wmv|woff|woff2|xml))$)|(?!.*\?.*w[c|p]-.+).*(^.*w[c|p]-.+)|^((?!.*\?.*xmlrpc\.php).*xmlrpc.php)|\?rest_route=.+/"
+			"/^((?!.*\?).*(\.(avi|css|eot|gif|ico|jpg|jpeg|js|json|mov|mp4|mpeg|mpg|og[g|v]|pdf|png|svg|tiff|ttf|txt|wmv|woff|woff2|xml))$)|.*(^.*w[c|p]-.+)|^((?!.*\?.*xmlrpc\.php).*xmlrpc.php)|\?rest_route=.+/"
 		);
 
 		$isHostServer = $this->gateKeeper->ip === $_SERVER["SERVER_ADDR"];
 
 		if (!$isHostServer) {
 			$this->gateKeeper->setFailTrust(true);
 			$this->gateKeeper->checkRequest();
-			$this->gateKeeper->setCookie();
 			$this->gateKeeper->redirectIfNotPromoted();
 		}
 

includes/class-crowdhandler-gatekeeper.php

@@ -169,6 +169,9 @@ private function define_public_hooks()
 			$this->loader->add_action('plugins_loaded', $plugin_public, 'checkRequest');
 			$this->loader->add_action('shutdown', $plugin_public, 'recordPerformance');
 		}
+		
+		$diagnostics = new CrowdhandlerDiagnostics();
+		$this->loader->add_filter('wp_headers', $diagnostics, 'addCHDiagnostics', 999);
 	}
 
 	/**