add user check to OnMODXInit

disable cache on Fred = 2 Signed-off-by: matdave <[email protected]>
modxcms · Nov 8, 2024 · d1edaf4 · d1edaf4
1 parent 102fd7e
commit d1edaf4
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 41 deletions.
diff --git a/core/components/fred/src/Elements/Event/OnLoadWebDocument.php b/core/components/fred/src/Elements/Event/OnLoadWebDocument.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Fred\Elements\Event;
+
+class OnLoadWebDocument
+{
+    use \Fred\Traits\Elements\Event\OnLoadWebDocument;
+}
diff --git a/core/components/fred/src/Elements/Event/OnMODXInit.php b/core/components/fred/src/Elements/Event/OnMODXInit.php
@@ -3,21 +3,6 @@
 
 class OnMODXInit extends Event
 {
-
-    public function run()
-    {
-        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
-            return;
-        }
-
-        $params = json_decode(file_get_contents('php://input'), true);
-
-        if (empty($params) || empty($params['themeSettingsPrefix']) || empty($params['themeSettings']) || !is_array($params['themeSettings'])) {
-            return;
-        }
-
-        foreach ($params['themeSettings'] as $name => $value) {
-            $this->modx->setOption($params['themeSettingsPrefix'] . '.setting.' . $name, $value);
-        }
-    }
+    use \Fred\Traits\Elements\Event\OnMODXInit;
 }
+
diff --git a/core/components/fred/src/Traits/Elements/Event/OnLoadWebDocument.php b/core/components/fred/src/Traits/Elements/Event/OnLoadWebDocument.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Fred\Traits\Elements\Event;
+
+use Fred\Traits\User;
+
+trait OnLoadWebDocument
+{
+    use User;
+    public function run()
+    {
+        if (!$this->canFred()) {
+            return;
+        }
+        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
+            return;
+        }
+        $this->modx->resource->set('cacheable', 0);
+    }
+}
diff --git a/core/components/fred/src/Traits/Elements/Event/OnMODXInit.php b/core/components/fred/src/Traits/Elements/Event/OnMODXInit.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Fred\Traits\Elements\Event;
+
+use Fred\Traits\User;
+
+trait OnMODXInit
+{
+    use User;
+    public function run()
+    {
+        if (!$this->canFred()) {
+            return;
+        }
+        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
+            return;
+        }
+
+        $params = json_decode(file_get_contents('php://input'), true);
+
+        if (empty($params) || empty($params['themeSettingsPrefix']) || empty($params['themeSettings']) || !is_array($params['themeSettings'])) {
+            return;
+        }
+
+        foreach ($params['themeSettings'] as $name => $value) {
+            $this->modx->setOption($params['themeSettingsPrefix'] . '.setting.' . $name, $value);
+        }
+    }
+}
diff --git a/core/components/fred/src/Traits/Elements/Event/OnWebPagePrerender.php b/core/components/fred/src/Traits/Elements/Event/OnWebPagePrerender.php
@@ -3,21 +3,17 @@
 namespace Fred\Traits\Elements\Event;
 
 use Firebase\JWT\JWT;
+use Fred\Traits\User;
 use Wa72\HtmlPageDom\HtmlPageCrawler;
 
 trait OnWebPagePrerender
 {
+    use User;
     public function run()
     {
         $theme = $this->fred->getTheme($this->modx->resource->template);
         if (!empty($theme)) {
-            if (!$this->modx->user) {
-                return;
-            }
-            if (!($this->modx->user->hasSessionContext('mgr') || $this->modx->user->hasSessionContext($this->modx->resource->context_key))) {
-                return;
-            }
-            if (!$this->modx->hasPermission('fred')) {
+            if (!$this->canFred()) {
                 return;
             }
 

diff --git a/core/components/fred/src/Traits/User.php b/core/components/fred/src/Traits/User.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Fred\Traits;
+
+trait User
+{
+    public function canFred(): bool
+    {
+        if (!$this->modx->user) {
+            return false;
+        }
+        if (!($this->modx->user->hasSessionContext('mgr') || $this->modx->user->hasSessionContext($this->modx->resource->context_key))) {
+            return false;
+        }
+        if (!$this->modx->hasPermission('fred')) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/core/components/fred/src/v2/Elements/Event/OnLoadWebDocument.php b/core/components/fred/src/v2/Elements/Event/OnLoadWebDocument.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Fred\v2\Elements\Event;
+
+class OnLoadWebDocument
+{
+    use \Fred\Traits\Elements\Event\OnLoadWebDocument;
+}
diff --git a/core/components/fred/src/v2/Elements/Event/OnMODXInit.php b/core/components/fred/src/v2/Elements/Event/OnMODXInit.php
@@ -3,21 +3,5 @@
 
 class OnMODXInit extends Event
 {
-
-    public function run()
-    {
-        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
-            return;
-        }
-
-        $params = json_decode(file_get_contents('php://input'), true);
-
-        if (empty($params) || empty($params['themeSettingsPrefix']) || empty($params['themeSettings']) || !is_array($params['themeSettings'])) {
-            return;
-        }
-
-        foreach ($params['themeSettings'] as $name => $value) {
-            $this->modx->setOption($params['themeSettingsPrefix'] . '.setting.' . $name, $value);
-        }
-    }
+    use \Fred\Traits\Elements\Event\OnMODXInit;
 }