Changeset 3340098

Timestamp:

08/06/2025 06:59:10 AM (5 months ago)

Author:

simpleanalytics

Message:

Update to version 1.68 from GitHub

Location:

simpleanalytics

Files:

• tags/1.68 (copied) (copied from simpleanalytics/trunk)
• tags/1.68/readme.txt (modified) (2 diffs)
• tags/1.68/src/TrackingPolicy.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/TrackingPolicy.php (modified) (2 diffs)

simpleanalytics/tags/1.68/readme.txt

@@ -7 +7 @@
 Tested up to: 6.8.2
 Requires PHP: 7.2.0
-Stable tag: 1.67
+Stable tag: 1.68
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -137 +137 @@
 
 == Changelog ==
+
+= 1.68 =
+* 2025-08-06
+* Changes:
+* fix: Handle IP address absence
+* Release 1.67: Code updates
+
 
 = 1.67 =

simpleanalytics/tags/1.68/src/TrackingPolicy.php

@@ -7 +7 @@
     public function shouldCollectAnalytics(): bool
     {
-        if ($this->clientIpExcluded($_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'])) {
+        if ($this->isClientIpExcluded()) {
             return false;
         }
@@ -15 +15 @@
         }
 
-        return ! $this->containsExcludedRole(wp_get_current_user()->roles);
+        return ! $this->containsExcludedRole();
     }
 
-    protected function clientIpExcluded(string $ip): bool
+    protected function isClientIpExcluded(): bool
     {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'];
+
+        if (empty($ip)) return false;
+
         return in_array($ip, Setting::array(SettingName::EXCLUDED_IP_ADDRESSES));
     }
 
-    protected function containsExcludedRole(array $roles): bool
+    protected function containsExcludedRole(): bool
     {
-        return array_intersect(Setting::array(SettingName::EXCLUDED_ROLES), $roles) !== [];
+        $currentRoles = wp_get_current_user()->roles;
+        $excludedRoles = Setting::array(SettingName::EXCLUDED_ROLES);
+
+        return array_intersect($excludedRoles, $currentRoles) !== [];
     }
 }

simpleanalytics/trunk/readme.txt

@@ -7 +7 @@
 Tested up to: 6.8.2
 Requires PHP: 7.2.0
-Stable tag: 1.67
+Stable tag: 1.68
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -137 +137 @@
 
 == Changelog ==
+
+= 1.68 =
+* 2025-08-06
+* Changes:
+* fix: Handle IP address absence
+* Release 1.67: Code updates
+
 
 = 1.67 =

simpleanalytics/trunk/src/TrackingPolicy.php

@@ -7 +7 @@
     public function shouldCollectAnalytics(): bool
     {
-        if ($this->clientIpExcluded($_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'])) {
+        if ($this->isClientIpExcluded()) {
             return false;
         }
@@ -15 +15 @@
         }
 
-        return ! $this->containsExcludedRole(wp_get_current_user()->roles);
+        return ! $this->containsExcludedRole();
     }
 
-    protected function clientIpExcluded(string $ip): bool
+    protected function isClientIpExcluded(): bool
     {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'];
+
+        if (empty($ip)) return false;
+
         return in_array($ip, Setting::array(SettingName::EXCLUDED_IP_ADDRESSES));
     }
 
-    protected function containsExcludedRole(array $roles): bool
+    protected function containsExcludedRole(): bool
     {
-        return array_intersect(Setting::array(SettingName::EXCLUDED_ROLES), $roles) !== [];
+        $currentRoles = wp_get_current_user()->roles;
+        $excludedRoles = Setting::array(SettingName::EXCLUDED_ROLES);
+
+        return array_intersect($excludedRoles, $currentRoles) !== [];
     }
 }