adjust caching

Signed-off-by: matdave <[email protected]>

Author: matdave

_build/config.json

@@ -29,7 +29,8 @@
             "OnManagerPageBeforeRender",
             "OnManagerLogin",
             "OnWebLogin",
-            "OnMODXInit"
+            "OnMODXInit",
+            "OnLoadWebDocument"
           ]
         }
       ]

_build/gpm.json

@@ -26,7 +26,8 @@
         "OnManagerPageBeforeRender",
         "OnManagerLogin",
         "OnWebLogin",
-        "OnMODXInit"
+        "OnMODXInit",
+        "OnLoadWebDocument"
       ]
     }
   ],

core/components/fred/src/Elements/Event/OnLoadWebDocument.php

@@ -2,7 +2,7 @@
 
 namespace Fred\Elements\Event;
 
-class OnLoadWebDocument
+class OnLoadWebDocument extends Event
 {
     use \Fred\Traits\Elements\Event\OnLoadWebDocument;
 }

core/components/fred/src/Traits/Elements/Event/OnLoadWebDocument.php

@@ -9,10 +9,10 @@ trait OnLoadWebDocument
     use User;
     public function run()
     {
-        if (!$this->canFred()) {
+        if (!isset($_GET['fred'])) {
             return;
         }
-        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
+        if (!$this->canFred()) {
             return;
         }
         $this->modx->resource->set('cacheable', 0);

core/components/fred/src/Traits/Elements/Event/OnMODXInit.php

@@ -9,10 +9,10 @@ trait OnMODXInit
     use User;
     public function run()
     {
-        if (!$this->canFred()) {
+        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
             return;
         }
-        if ($_GET['fred'] && intval($_GET['fred']) !== 2) {
+        if (!$this->canFred()) {
             return;
         }
 
@@ -21,9 +21,16 @@ public function run()
         if (empty($params) || empty($params['themeSettingsPrefix']) || empty($params['themeSettings']) || !is_array($params['themeSettings'])) {
             return;
         }
+        $this->modx->setOption('cache_resource', false);
+        $this->modx->setOption('pageshrink.cache_resource_shrink', false);
+        $this->modx->setOption('pageshrink.resource_shrink', false);
 
         foreach ($params['themeSettings'] as $name => $value) {
-            $this->modx->setOption($params['themeSettingsPrefix'] . '.setting.' . $name, $value);
+            $key = $params['themeSettingsPrefix'] . '.setting.' . $name;
+            $this->modx->setOption($key, $value);
+            if($this->modx->context) {
+                $this->modx->context->config[$key] = $value;
+            }
         }
     }
 }

core/components/fred/src/Traits/User.php

@@ -9,7 +9,13 @@ 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))) {
+        if (!(
+            $this->modx->user->hasSessionContext('mgr') ||
+            (
+                $this->modx->resource &&
+                $this->modx->user->hasSessionContext($this->modx->resource->context_key)
+            )
+        )) {
             return false;
         }
         if (!$this->modx->hasPermission('fred')) {

core/components/fred/src/v2/Elements/Event/OnLoadWebDocument.php

@@ -2,7 +2,7 @@
 
 namespace Fred\v2\Elements\Event;
 
-class OnLoadWebDocument
+class OnLoadWebDocument extends Event
 {
     use \Fred\Traits\Elements\Event\OnLoadWebDocument;
 }