diff --git a/readme.txt b/readme.txt index 00c34b3..20a143e 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: web analytics, tracking, web traffic, analytics, statistics, stats Requires at least: 5.2 Tested up to: 6.5.2 Requires PHP: 7.2 -Stable tag: 1.0.9 +Stable tag: 1.0.8 License: GPLv2 Easily add Wide Angle Analytics tracker script to your WordPress site. You can quickly configure your web analytics tracker script. @@ -61,9 +61,6 @@ We run a business around serving the needs of our customer. That's you. You will find most of your answers in the [Knowledge Base](https://wideangle.co/documentation). Should you require further assistance, please [get in touch](https://wideangle.co/support) with our team. == Changelog == -v1.0.9 -- Correct the API type from "supress" to "suppress" - V1.0.8 - Expose DNT Flag override - Test with WordPress 6.5.2 diff --git a/types/WideAngleAttributes.php b/types/WideAngleAttributes.php index d797dc8..71413ef 100644 --- a/types/WideAngleAttributes.php +++ b/types/WideAngleAttributes.php @@ -6,10 +6,10 @@ class WideAngleAttributes { public $trackerDomain; public $exclusionString; public $includeParamsString; - public $suppressDnt; + public $supressDnt; private $helpers; - public function __construct($siteId, $trackerDomain, $ignoreHash, $exclusionString, $includeParamsString, $fingerprint, $suppressDnt) { + public function __construct($siteId, $trackerDomain, $ignoreHash, $exclusionString, $includeParamsString, $fingerprint, $supressDnt) { $this->siteId = $siteId; $this->trackerDomain = $trackerDomain; $this->ignoreHash = $ignoreHash; @@ -17,7 +17,7 @@ class WideAngleAttributes { $this->includeParamsString = $includeParamsString; $this->fingerprint = $fingerprint; $this->ePrivacyMode = $ePrivacyMode; - $this->suppressDnt = $suppressDnt; + $this->supressDnt = $supressDnt; $this->helpers = new WideAngleHelpers(); } @@ -27,7 +27,7 @@ class WideAngleAttributes { 'tracker_domain' => $this->trackerDomain, 'ignore_hash' => $this->ignoreHash, 'fingerprint' => $this->fingerprint, - 'suppress_dnt' => $this->suppressDnt, + 'supress_dnt' => $this->supressDnt, 'exclusion_paths' => $this->generateExclusionsAttribute(), 'include_params' => $this->generateIncludeParamsAttribute() ); diff --git a/types/WideAngleGenerator.php b/types/WideAngleGenerator.php index fc8ea87..effa479 100644 --- a/types/WideAngleGenerator.php +++ b/types/WideAngleGenerator.php @@ -15,7 +15,7 @@ class WideAngleGenerator { $this->exclusionPaths = $attributes['exclusion_paths']; $this->includeParams = $attributes['include_params']; $this->fingerprint = $attributes['fingerprint']; - $this->suppressDnt = $attributes['suppress_dnt']; + $this->supressDnt = $attributes['supress_dnt']; } @@ -33,13 +33,13 @@ EOD; $includeParamsAttribute = $this->includeParams != '' ? "data-waa-inc-params=\"" . esc_attr($this->includeParams) . "\"": ''; $ignoreHashAttribute = $this->ignoreHash != '' ? "data-waa-ignore-hash=\"" . esc_attr($this->ignoreHash) . "\"": 'data-waa-ignore-hash="false"'; $fingerprintAttribute = $this->fingerprint != '' ? "data-waa-fingerprint=\"" . esc_attr($this->fingerprint) . "\"": ''; - $suppressDntAttribute = $this->suppressDnt != '' ? "data-waa-dnt-suppress=\"" . esc_attr($this->suppressDnt) . "\"": 'data-waa-dnt-suppress="false"'; + $supressDntAttribute = $this->supressDnt != '' ? "data-waa-dnt-supress=\"" . esc_attr($this->supressDnt) . "\"": 'data-waa-dnt-supress="false"'; $script = << EOD; diff --git a/types/WideAngleHelpers.php b/types/WideAngleHelpers.php index 362f5c6..4cf4eef 100644 --- a/types/WideAngleHelpers.php +++ b/types/WideAngleHelpers.php @@ -29,11 +29,11 @@ class WideAngleHelpers { } } - function validateSuppressDntFlag($name, $suppressDnt) { - if(filter_var($suppressDnt, FILTER_VALIDATE_BOOLEAN)) { - return WideAngleValidated::createValid($name, $suppressDnt, "true"); + function validateSupressDntFlag($name, $supressDnt) { + if(filter_var($supressDnt, FILTER_VALIDATE_BOOLEAN)) { + return WideAngleValidated::createValid($name, $supressDnt, "true"); } else { - return WideAngleValidated::createValid($name, $suppressDnt, "false"); + return WideAngleValidated::createValid($name, $supressDnt, "false"); } } diff --git a/views/admin_settings.php b/views/admin_settings.php index 891df3e..92a86c8 100644 --- a/views/admin_settings.php +++ b/views/admin_settings.php @@ -2,7 +2,7 @@ $siteId = wp_unslash($this->settings[self::WAA_CONF_SITE_ID]); $trackerDomain = wp_unslash($this->settings[self::WAA_CONF_TRACKER_DOMAIN]); $ignoreHash = filter_var($this->settings[self::WAA_CONF_IGNORE_HASH], FILTER_VALIDATE_BOOLEAN); -$suppressDnt = filter_var($this->settings[self::WAA_CONF_SUPPRESS_DNT], FILTER_VALIDATE_BOOLEAN); +$supressDnt = filter_var($this->settings[self::WAA_CONF_SUPRESS_DNT], FILTER_VALIDATE_BOOLEAN); $fingerprint = filter_var($this->settings[self::WAA_CONF_FINGERPRINT], FILTER_VALIDATE_BOOLEAN); $parsedExclusions = $this->plugin->helpers->parseExclusionSetting(wp_unslash($this->settings[self::WAA_CONF_EXC_PATHS])); $parsedIncludeParams = $this->plugin->helpers->parseIncludeParamsSetting(wp_unslash($this->settings[self::WAA_CONF_INC_PARAMS])); @@ -128,12 +128,12 @@ $generator = new WideAngleGenerator($this->settings[self::WAA_CONF_AT - +
- Suppress Do-Not-Track + Supress Do-Not-Track

Wide Angle Analytics respects Do-Not-Track (DNT) browser flag by default. You override this behaviour and always ignore this flag. Please consult relevant laws and regulation whether overriding DNT requires user consent.

diff --git a/wide-angle-analytics.php b/wide-angle-analytics.php index d30e36b..bda8e50 100644 --- a/wide-angle-analytics.php +++ b/wide-angle-analytics.php @@ -5,7 +5,7 @@ Description: Easily enable and configure Wide Angle Analytics on your Wordpress site Author: Wide Angle Analytics by Input Objects GmbH Author URI: https://wideangle.co - Version: 1.0.9 + Version: 1.0.8 Requires at least: 5.2 Requires PHP: 7.2 License: GPL v2 @@ -21,7 +21,7 @@ class WideAngleAnalytics { const WAA_CONF_EXC_PATHS = "waa_exc_path"; const WAA_CONF_INC_PARAMS = "waa_inc_params"; const WAA_CONF_IGNORE_HASH = "waa_ignore_hash"; - const WAA_CONF_SUPPRESS_DNT = "waa_suppress_dnt"; + const WAA_CONF_SUPRESS_DNT = "waa_supress_dnt"; const WAA_CONF_ATTRIBUTES = "waa_attributes"; public function __construct() { @@ -123,12 +123,12 @@ class WideAngleAnalytics { $waaTrackerDomain = $this->plugin->helpers->validateTrackerDomain(self::WAA_CONF_TRACKER_DOMAIN, sanitize_text_field($_REQUEST['waa_tracker_domain'])); $waaIgnoreHash = $this->plugin->helpers->validateIgnoreHashFlag(self::WAA_CONF_IGNORE_HASH, sanitize_text_field($_REQUEST['waa_ignore_hash'])); $waaFingerprint = $this->plugin->helpers->validateFingerprint(self::WAA_CONF_FINGERPRINT, sanitize_text_field($_REQUEST['waa_fingerprint'])); - $waaSuppressDnt = $this->plugin->helpers->validateSuppressDntFlag(self::WAA_CONF_SUPPRESS_DNT, sanitize_text_field($_REQUEST['waa_suppress_dnt'])); + $waaSupressDnt = $this->plugin->helpers->validateSupressDntFlag(self::WAA_CONF_SUPRESS_DNT, sanitize_text_field($_REQUEST['waa_supress_dnt'])); $waaIncParams = $this->plugin->helpers->validateIncludeParams(self::WAA_CONF_INC_PARAMS, $_REQUEST); $waaExclusionPaths = $this->plugin->helpers->validateExclusionPathsRequest(self::WAA_CONF_EXC_PATHS, $_REQUEST); include_once( $this->plugin->folder . '/types/WideAngleAttributes.php'); - $merged = array($waaSiteId, $waaTrackerDomain, $waaIgnoreHash, $waaIncParams, $waaExclusionPaths, $waaSuppressDnt); + $merged = array($waaSiteId, $waaTrackerDomain, $waaIgnoreHash, $waaIncParams, $waaExclusionPaths, $waaSupressDnt); $errors = array(); foreach($merged as $validated) { if(!$validated->is_valid()) { @@ -144,7 +144,7 @@ class WideAngleAnalytics { $waaExclusionPaths->get_value(), $waaIncParams->get_value(), $waaFingerprint->get_value(), - $waaSuppressDnt->get_value() + $waaSupressDnt->get_value() ); update_option(self::WAA_CONF_SITE_ID, $waaSiteId->get_value()); update_option(self::WAA_CONF_TRACKER_DOMAIN, $waaTrackerDomain->get_value()); @@ -152,7 +152,7 @@ class WideAngleAnalytics { update_option(self::WAA_CONF_EXC_PATHS, $waaExclusionPaths->get_value()); update_option(self::WAA_CONF_INC_PARAMS, $waaIncParams->get_value()); update_option(self::WAA_CONF_FINGERPRINT, $waaFingerprint->get_value()); - update_option(self::WAA_CONF_SUPPRESS_DNT, $waaSuppressDnt->get_value()); + update_option(self::WAA_CONF_SUPRESS_DNT, $waaSupressDnt->get_value()); update_option(self::WAA_CONF_ATTRIBUTES, $attributes->generateAttributes()); $this->message = __('Settings updated', $this->plugin->name); } else { @@ -167,7 +167,7 @@ class WideAngleAnalytics { self::WAA_CONF_TRACKER_DOMAIN => get_option(self::WAA_CONF_TRACKER_DOMAIN), self::WAA_CONF_IGNORE_HASH => get_option(self::WAA_CONF_IGNORE_HASH), self::WAA_CONF_FINGERPRINT => get_option(self::WAA_CONF_FINGERPRINT), - self::WAA_CONF_SUPPRESS_DNT => get_option(self::WAA_CONF_SUPPRESS_DNT), + self::WAA_CONF_SUPRESS_DNT => get_option(self::WAA_CONF_SUPRESS_DNT), self::WAA_CONF_ATTRIBUTES => get_option(self::WAA_CONF_ATTRIBUTES) ); include_once( $this->plugin->folder . '/views/admin_settings.php' ); @@ -182,7 +182,7 @@ class WideAngleAnalytics { * - waa_exc_path * - waa_inc_params * - waa_ignore_hash - * - waa_suppress_dnt + * - waa_supress_dnt * - waa_header_script * - waa_footer_script */ @@ -193,7 +193,7 @@ class WideAngleAnalytics { register_setting($this->plugin->name, self::WAA_CONF_TRACKER_DOMAIN, array('default' => 'stats.wideangle.co')); register_setting($this->plugin->name, self::WAA_CONF_IGNORE_HASH, array('default' => 'false')); register_setting($this->plugin->name, self::WAA_CONF_FINGERPRINT, array('default' => 'false')); - register_setting($this->plugin->name, self::WAA_CONF_SUPPRESS_DNT, array('default' => 'false')); + register_setting($this->plugin->name, self::WAA_CONF_SUPRESS_DNT, array('default' => 'false')); register_setting($this->plugin->name, self::WAA_CONF_ATTRIBUTES, array('type' => 'array')); }