Changeset 2499585

Timestamp:

03/19/2021 04:39:57 PM (5 years ago)

Author:

Erik Bernskiold

Message:

Update to version 3.0.3 from GitHub

Location:

ilmenite-cookie-consent

Files:

• tags/3.0.3 (copied) (copied from ilmenite-cookie-consent/trunk)
• tags/3.0.3/CHANGELOG.md (modified) (1 diff)
• tags/3.0.3/classes/class-consent.php (modified) (1 diff)
• tags/3.0.3/classes/class-trackers.php (modified) (2 diffs)
• tags/3.0.3/ilmenite-cookie-consent.php (modified) (2 diffs)
• tags/3.0.3/readme.txt (modified) (1 diff)
• trunk/CHANGELOG.md (modified) (1 diff)
• trunk/classes/class-consent.php (modified) (1 diff)
• trunk/classes/class-trackers.php (modified) (2 diffs)
• trunk/ilmenite-cookie-consent.php (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)

ilmenite-cookie-consent/tags/3.0.3/CHANGELOG.md

@@ -1 +1 @@
 # Changelog
+
+## [3.0.3] - 2021-03-19
+- Fixed a bug where domains were included in the disallow list even when they were supposed to be allowed. (#16)
 
 ## [3.0.2] - 2021-03-12

ilmenite-cookie-consent/tags/3.0.3/classes/class-consent.php

@@ -23 +23 @@
      */
     public static function has_full_consent() {
-        return in_array( [ 'analytics', 'marketing' ], self::get_consented_list(), true );
+        return self::has_consented_to( 'analytics' ) && self::has_consented_to( 'marketing' );
     }
 

ilmenite-cookie-consent/tags/3.0.3/classes/class-trackers.php

@@ -109 +109 @@
         }
 
+        if( ILCC_Consent::has_consented_to( 'marketing') ){
+            foreach ( self::get_marketing() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $allowlist[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
+        if( ILCC_Consent::has_consented_to( 'analytics') ){
+            foreach ( self::get_analytics() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $allowlist[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
         return implode( ',', $allowlist );
     }
@@ -121 +137 @@
         $disallow = [];
 
-        foreach ( self::get_all() as $domain ) {
-            if ( ! empty( $domain ) ) {
-                $disallow[] = '/' . addslashes( $domain ) . '/';
+        if( ! ILCC_Consent::has_consented_to( 'marketing') ){
+            foreach ( self::get_marketing() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $disallow[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
+        if( ! ILCC_Consent::has_consented_to( 'analytics') ){
+            foreach ( self::get_analytics() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $disallow[] = '/' . addslashes( $domain ) . '/';
+                }
             }
         }

ilmenite-cookie-consent/tags/3.0.3/ilmenite-cookie-consent.php

@@ -5 +5 @@
  *  Description:    A simple, developer-friendly WordPress plugin that lets visitors know that the site is using cookies.
  *  Author:         Bernskiold Media
- *  Version:        3.0.2
+ *  Version:        3.0.3
  *  Author URI:     http://www.bernskioldmedia.com/
  *  Text Domain:    ilmenite-cookie-consent
@@ -54 +54 @@
      * @var string
      */
-    public $version = '3.0.2';
+    public $version = '3.0.3';
 
     /**

ilmenite-cookie-consent/tags/3.0.3/readme.txt

@@ -144 +144 @@
 
 == Changelog ==
+
+= Version 3.0.3 =
+- Fixed a bug where domains were included in the disallow list even when they were supposed to be allowed. (#16)
 
 = Version 3.0.2 =

ilmenite-cookie-consent/trunk/CHANGELOG.md

@@ -1 +1 @@
 # Changelog
+
+## [3.0.3] - 2021-03-19
+- Fixed a bug where domains were included in the disallow list even when they were supposed to be allowed. (#16)
 
 ## [3.0.2] - 2021-03-12

ilmenite-cookie-consent/trunk/classes/class-consent.php

@@ -23 +23 @@
      */
     public static function has_full_consent() {
-        return in_array( [ 'analytics', 'marketing' ], self::get_consented_list(), true );
+        return self::has_consented_to( 'analytics' ) && self::has_consented_to( 'marketing' );
     }
 

ilmenite-cookie-consent/trunk/classes/class-trackers.php

@@ -109 +109 @@
         }
 
+        if( ILCC_Consent::has_consented_to( 'marketing') ){
+            foreach ( self::get_marketing() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $allowlist[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
+        if( ILCC_Consent::has_consented_to( 'analytics') ){
+            foreach ( self::get_analytics() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $allowlist[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
         return implode( ',', $allowlist );
     }
@@ -121 +137 @@
         $disallow = [];
 
-        foreach ( self::get_all() as $domain ) {
-            if ( ! empty( $domain ) ) {
-                $disallow[] = '/' . addslashes( $domain ) . '/';
+        if( ! ILCC_Consent::has_consented_to( 'marketing') ){
+            foreach ( self::get_marketing() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $disallow[] = '/' . addslashes( $domain ) . '/';
+                }
+            }
+        }
+
+        if( ! ILCC_Consent::has_consented_to( 'analytics') ){
+            foreach ( self::get_analytics() as $domain ) {
+                if ( ! empty( $domain ) ) {
+                    $disallow[] = '/' . addslashes( $domain ) . '/';
+                }
             }
         }

ilmenite-cookie-consent/trunk/ilmenite-cookie-consent.php

@@ -5 +5 @@
  *  Description:    A simple, developer-friendly WordPress plugin that lets visitors know that the site is using cookies.
  *  Author:         Bernskiold Media
- *  Version:        3.0.2
+ *  Version:        3.0.3
  *  Author URI:     http://www.bernskioldmedia.com/
  *  Text Domain:    ilmenite-cookie-consent
@@ -54 +54 @@
      * @var string
      */
-    public $version = '3.0.2';
+    public $version = '3.0.3';
 
     /**

ilmenite-cookie-consent/trunk/readme.txt

@@ -144 +144 @@
 
 == Changelog ==
+
+= Version 3.0.3 =
+- Fixed a bug where domains were included in the disallow list even when they were supposed to be allowed. (#16)
 
 = Version 3.0.2 =