wip

Author: osbre

src/Plugin.php

@@ -48,18 +48,15 @@ public function onInit(): void
     {
         $tracking = ! $this->trackingRules->hasExcludedIp() && ! $this->trackingRules->hasExcludedUserRole();
 
-        if ($tracking && $this->settings->get(SettingName::NOSCRIPT)) {
-            AddNoScriptTag::register();
-        }
-
-        if (! $tracking) {
-            AddInactiveComment::register();
-        }
-
         if ($tracking) {
             $this->scripts->push(new AnalyticsScript);
         } else {
             $this->scripts->push(new InactiveScript);
+            AddInactiveComment::register();
+        }
+
+        if ($tracking && $this->settings->get(SettingName::NOSCRIPT)) {
+            AddNoScriptTag::register();
         }
 
         if ($this->settings->boolean(SettingName::AUTOMATED_EVENTS)) {

src/TrackingRules.php

@@ -24,9 +24,16 @@ public function hasExcludedIp(): bool
 
     public function hasExcludedUserRole(): bool
     {
-        if (! is_user_logged_in()) return false;
+        if (! is_user_logged_in()) {
+            return false;
+        }
 
         $needle = $this->settings->array(SettingName::EXCLUDED_ROLES);
+
+        if ($needle === []) {
+            return true;
+        }
+
         $current = wp_get_current_user()->roles;
 
         return array_intersect($needle, $current) !== [];