Changeset 3232302

Timestamp:

01/30/2025 09:07:47 PM (13 months ago)

Author:

jrozanski

Message:

Version 1.0.9

Location:

wide-angle-analytics/trunk

Files:

• readme.txt (modified) (2 diffs)
• types/WideAngleAttributes.php (modified) (3 diffs)
• types/WideAngleGenerator.php (modified) (3 diffs)
• types/WideAngleHelpers.php (modified) (1 diff)
• views/admin_settings.php (modified) (2 diffs)
• wide-angle-analytics.php (modified) (8 diffs)

wide-angle-analytics/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.5.2
 Requires PHP: 7.2
-Stable tag: 1.0.8
+Stable tag: 1.0.9
 License: GPLv2
 
@@ -62 +62 @@
 
 == Changelog ==
+v1.0.9
+- Correct the API type from "supress" to "suppress"
+
 V1.0.8
 - Expose DNT Flag override

wide-angle-analytics/trunk/types/WideAngleAttributes.php

@@ -7 +7 @@
   public $exclusionString;
   public $includeParamsString;
-  public $supressDnt;
+  public $suppressDnt;
   private $helpers;
 
-  public function __construct($siteId, $trackerDomain, $ignoreHash, $exclusionString, $includeParamsString, $fingerprint, $supressDnt) {
+  public function __construct($siteId, $trackerDomain, $ignoreHash, $exclusionString, $includeParamsString, $fingerprint, $suppressDnt) {
     $this->siteId = $siteId;
     $this->trackerDomain = $trackerDomain;
@@ -18 +18 @@
     $this->fingerprint = $fingerprint;
     $this->ePrivacyMode = $ePrivacyMode;
-    $this->supressDnt = $supressDnt;
+    $this->suppressDnt = $suppressDnt;
     $this->helpers = new WideAngleHelpers();
   }
@@ -28 +28 @@
       'ignore_hash' => $this->ignoreHash,
       'fingerprint' => $this->fingerprint,
-      'supress_dnt' => $this->supressDnt,
+      'suppress_dnt' => $this->suppressDnt,
       'exclusion_paths' => $this->generateExclusionsAttribute(),
       'include_params' => $this->generateIncludeParamsAttribute()

wide-angle-analytics/trunk/types/WideAngleGenerator.php

@@ -16 +16 @@
     $this->includeParams    = $attributes['include_params'];
     $this->fingerprint      = $attributes['fingerprint'];
-    $this->supressDnt       = $attributes['supress_dnt'];
+    $this->suppressDnt       = $attributes['suppress_dnt'];
   }
 
@@ -34 +34 @@
     $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)    . "\"": '';
-    $supressDntAttribute    = $this->supressDnt != ''           ? "data-waa-dnt-supress=\""   . esc_attr($this->supressDnt)     . "\"": 'data-waa-dnt-supress="false"';
+    $suppressDntAttribute    = $this->suppressDnt != ''           ? "data-waa-dnt-suppress=\""   . esc_attr($this->suppressDnt)     . "\"": 'data-waa-dnt-suppress="false"';
     $script = <<<EOD
 <script async defer
@@ -40 +40 @@
   $fingerprintAttribute
   $ignoreHashAttribute
-  $supressDntAttribute
+  $suppressDntAttribute
   $includeParamsAttribute
   $pathExlusionsAttribute></script>

wide-angle-analytics/trunk/types/WideAngleHelpers.php

@@ -30 +30 @@
   }
 
-  function validateSupressDntFlag($name, $supressDnt) {
-    if(filter_var($supressDnt, FILTER_VALIDATE_BOOLEAN)) {
-      return WideAngleValidated::createValid($name, $supressDnt, "true");
+  function validateSuppressDntFlag($name, $suppressDnt) {
+    if(filter_var($suppressDnt, FILTER_VALIDATE_BOOLEAN)) {
+      return WideAngleValidated::createValid($name, $suppressDnt, "true");
     } else {
-      return WideAngleValidated::createValid($name, $supressDnt, "false");
+      return WideAngleValidated::createValid($name, $suppressDnt, "false");
     }
   }

wide-angle-analytics/trunk/views/admin_settings.php

@@ -3 +3 @@
 $trackerDomain        = wp_unslash($this->settings[self::WAA_CONF_TRACKER_DOMAIN]);
 $ignoreHash           = filter_var($this->settings[self::WAA_CONF_IGNORE_HASH], FILTER_VALIDATE_BOOLEAN);
-$supressDnt           = filter_var($this->settings[self::WAA_CONF_SUPRESS_DNT], FILTER_VALIDATE_BOOLEAN);
+$suppressDnt           = filter_var($this->settings[self::WAA_CONF_SUPPRESS_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]));
@@ -129 +129 @@
           </tr>
           <tr>
-            <th scope="row"><label>Supress Do-Not-Track</label></th>
+            <th scope="row"><label>Suppress Do-Not-Track</label></th>
             <td>
               <fieldset>
-                <legend class="screen-reader-text"><span>Supress Do-Not-Track</span></legend>
+                <legend class="screen-reader-text"><span>Suppress Do-Not-Track</span></legend>
                 <label>
-                  <input id="waa_supress_dnt" type="checkbox" name="waa_supress_dnt" <?php if($supressDnt) { echo "checked"; } ?>/> Supress
+                  <input id="waa_suppress_dnt" type="checkbox" name="waa_suppress_dnt" <?php if($suppressDnt) { echo "checked"; } ?>/> Suppress
                 </label>
               </fieldset>

wide-angle-analytics/trunk/wide-angle-analytics.php

@@ -6 +6 @@
   Author:               Wide Angle Analytics by Input Objects GmbH
   Author URI:           https://wideangle.co
-  Version:              1.0.8
+  Version:              1.0.9
   Requires at least:    5.2
   Requires PHP:         7.2
@@ -22 +22 @@
   const WAA_CONF_INC_PARAMS               = "waa_inc_params";
   const WAA_CONF_IGNORE_HASH              = "waa_ignore_hash";
-  const WAA_CONF_SUPRESS_DNT              = "waa_supress_dnt";
+  const WAA_CONF_SUPPRESS_DNT              = "waa_suppress_dnt";
   const WAA_CONF_ATTRIBUTES               = "waa_attributes";
 
@@ -124 +124 @@
         $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']));
-        $waaSupressDnt      = $this->plugin->helpers->validateSupressDntFlag(self::WAA_CONF_SUPRESS_DNT, sanitize_text_field($_REQUEST['waa_supress_dnt']));
+        $waaSuppressDnt      = $this->plugin->helpers->validateSuppressDntFlag(self::WAA_CONF_SUPPRESS_DNT, sanitize_text_field($_REQUEST['waa_suppress_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, $waaSupressDnt);
+        $merged = array($waaSiteId, $waaTrackerDomain, $waaIgnoreHash, $waaIncParams, $waaExclusionPaths, $waaSuppressDnt);
         $errors = array();
         foreach($merged as $validated) {
@@ -145 +145 @@
             $waaIncParams->get_value(),
             $waaFingerprint->get_value(),
-            $waaSupressDnt->get_value()
+            $waaSuppressDnt->get_value()
           );
           update_option(self::WAA_CONF_SITE_ID,         $waaSiteId->get_value());
@@ -153 +153 @@
           update_option(self::WAA_CONF_INC_PARAMS,      $waaIncParams->get_value());
           update_option(self::WAA_CONF_FINGERPRINT,     $waaFingerprint->get_value());
-          update_option(self::WAA_CONF_SUPRESS_DNT,     $waaSupressDnt->get_value());
+          update_option(self::WAA_CONF_SUPPRESS_DNT,     $waaSuppressDnt->get_value());
           update_option(self::WAA_CONF_ATTRIBUTES,      $attributes->generateAttributes());
           $this->message = __('Settings updated', $this->plugin->name);
@@ -168 +168 @@
       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_SUPRESS_DNT              => get_option(self::WAA_CONF_SUPRESS_DNT),
+      self::WAA_CONF_SUPPRESS_DNT              => get_option(self::WAA_CONF_SUPPRESS_DNT),
       self::WAA_CONF_ATTRIBUTES               => get_option(self::WAA_CONF_ATTRIBUTES)
     );
@@ -183 +183 @@
    *  - waa_inc_params
    *  - waa_ignore_hash
-   *  - waa_supress_dnt
+   *  - waa_suppress_dnt
    *  - waa_header_script
    *  - waa_footer_script
@@ -194 +194 @@
     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_SUPRESS_DNT, array('default' => 'false'));
+    register_setting($this->plugin->name, self::WAA_CONF_SUPPRESS_DNT, array('default' => 'false'));
     register_setting($this->plugin->name, self::WAA_CONF_ATTRIBUTES, array('type' => 'array'));
   }