Save to context settings for non-global theme settings

modxcms · Oct 17, 2024 · ee7a442 · ee7a442
1 parent fb2e5bf
commit ee7a442
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 13 deletions.
diff --git a/core/components/fred/model/fred/fredtheme.class.php b/core/components/fred/model/fred/fredtheme.class.php
@@ -289,7 +289,7 @@ private function syncThemeSetting($setting, $group = '')
         $systemSetting->save();
     }
 
-    public function saveThemeSettings($settingValues)
+    public function saveThemeSettings($settingValues, $ctx)
     {
         $settings = $this->get('settings');
         if (empty($settings)) {
@@ -308,16 +308,20 @@ public function saveThemeSettings($settingValues)
         foreach ($settings as $setting) {
             if (isset($setting['group']) && is_array($setting['settings'])) {
                 foreach ($setting['settings'] as $groupSetting) {
-                    $keys[] = $groupSetting['name'];
+                    $keys[$groupSetting['name']] = [
+                        'group' => $setting['group'],
+                        'global' => isset($groupSetting['global']) ? $groupSetting['global'] : true
+                    ];
                 }
                 continue;
             }
 
-            $keys[] = $setting['name'];
+            $keys[$setting['name']] = [
+                'group' => '',
+                'global' => isset($setting['global']) ? $setting['global'] : true
+            ];
         }
 
-        $keys = array_flip($keys);
-
         foreach ($settingValues as $name => $value) {
             if (!isset($keys[$name])) {
                 continue;
@@ -328,6 +332,22 @@ public function saveThemeSettings($settingValues)
                 continue;
             }
 
+            $newValue = $this->themeSettingValueToModxPlaceholder($value);
+            if ($setting->get('value') === $newValue) {
+                continue;
+            }
+
+            if ($keys[$name]['global'] === false) {
+                $setting = $this->xpdo->getObject('modContextSetting', ['namespace' => $this->namespace, 'context_key' => $ctx, 'key' => $this->getThemeSettingKey($name)]);
+                if (!$setting) {
+                    $setting = $this->xpdo->newObject('modContextSetting');
+                    $setting->set('namespace', $this->namespace);
+                    $setting->set('key', $this->getThemeSettingKey($name));
+                    $setting->set('context_key', $ctx);
+                    $setting->set('area', $keys[$name]['group']);
+                }
+            }
+
             $setting->set('value', $this->themeSettingValueToModxPlaceholder($value));
             $setting->save();
         }

diff --git a/core/components/fred/src/Endpoint/Ajax/SaveContent.php b/core/components/fred/src/Endpoint/Ajax/SaveContent.php
@@ -238,7 +238,7 @@ public function process(): string
         }
 
         $theme = $this->fred->getTheme($this->object->template);
-        $theme->saveThemeSettings($this->body['themeSettings']);
+        $theme->saveThemeSettings($this->body['themeSettings'], $this->object->Context->key);
 
         // unify resource rendering
         $renderResource = new \Fred\RenderResource($this->object, $this->modx, $this->body['data'], $this->body['pageSettings']);

diff --git a/core/components/fred/src/Model/FredTheme.php b/core/components/fred/src/Model/FredTheme.php
@@ -2,6 +2,7 @@
 
 namespace Fred\Model;
 
+use MODX\Revolution\modContext;
 use MODX\Revolution\modContextSetting;
 use MODX\Revolution\modLexiconEntry;
 use MODX\Revolution\modNamespace;
@@ -318,7 +319,7 @@ private function syncThemeSetting($setting, $group = '')
         $systemSetting->save();
     }
 
-    public function saveThemeSettings($settingValues)
+    public function saveThemeSettings($settingValues, $ctx)
     {
         $settings = $this->get('settings');
         if (empty($settings)) {
@@ -337,16 +338,20 @@ public function saveThemeSettings($settingValues)
         foreach ($settings as $setting) {
             if (isset($setting['group']) && is_array($setting['settings'])) {
                 foreach ($setting['settings'] as $groupSetting) {
-                    $keys[] = $groupSetting['name'];
+                    $keys[$groupSetting['name']] = [
+                        'group' => $setting['group'],
+                        'global' => isset($groupSetting['global']) ? $groupSetting['global'] : true
+                    ];
                 }
                 continue;
             }
 
-            $keys[] = $setting['name'];
+            $keys[$setting['name']] = [
+                'group' => '',
+                'global' => isset($setting['global']) ? $setting['global'] : true
+            ];
         }
 
-        $keys = array_flip($keys);
-
         foreach ($settingValues as $name => $value) {
             if (!isset($keys[$name])) {
                 continue;
@@ -357,7 +362,23 @@ public function saveThemeSettings($settingValues)
                 continue;
             }
 
-            $setting->set('value', $this->themeSettingValueToModxPlaceholder($value));
+            $newValue = $this->themeSettingValueToModxPlaceholder($value);
+            if ($setting->get('value') === $newValue) {
+                continue;
+            }
+
+            if ($keys[$name]['global'] === false) {
+                $setting = $this->xpdo->getObject(modContextSetting::class, ['namespace' => $this->namespace, 'context_key' => $ctx, 'key' => $this->getThemeSettingKey($name)]);
+                if (!$setting) {
+                    $setting = $this->xpdo->newObject(modContextSetting::class);
+                    $setting->set('namespace', $this->namespace);
+                    $setting->set('key', $this->getThemeSettingKey($name));
+                    $setting->set('context_key', $ctx);
+                    $setting->set('area', $keys[$name]['group']);
+                }
+            }
+
+            $setting->set('value', $newValue);
             $setting->save();
         }
 

diff --git a/core/components/fred/src/v2/Endpoint/Ajax/SaveContent.php b/core/components/fred/src/v2/Endpoint/Ajax/SaveContent.php
@@ -232,7 +232,7 @@ public function process(): string
         }
 
         $theme = $this->fred->getTheme($this->object->template);
-        $theme->saveThemeSettings($this->body['themeSettings']);
+        $theme->saveThemeSettings($this->body['themeSettings'],$this->object->Context->key);
 
         // unify resource rendering
         $renderResource = new \Fred\v2\RenderResource($this->object, $this->modx, $this->body['data'], $this->body['pageSettings']);