add option

felixhahnweilheim · Jan 31, 2025 · eacd704 · eacd704
1 parent bb36a08
commit eacd704
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 16 deletions.
diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php
@@ -62,13 +62,25 @@ public function actionDarkColors()
     public function actionAdvanced()
     {
         $form = new AdvancedSettings();
-        $config = new Config();
-        $colorSettings = new ColorSettings();
-        $darkColorSettings = new DarkColorSettings();
 
-        if(!empty(Yii::$app->request->post())) {
-            $data = json_decode(Yii::$app->request->post()['AdvancedSettings']['settingsJson'], true);
+        if (!empty(Yii::$app->request->post())) {
 
+            $form->load(Yii::$app->request->post());
+
+            // Load settings if we should merge or do not load them if we should overwrite all
+            $loadSettings = ! $form->overwriteAll;
+
+            $config = new Config($loadSettings);
+            $colorSettings = new ColorSettings($loadSettings);
+            $darkColorSettings = new DarkColorSettings($loadSettings);
+
+            // Decode the imported json
+            $data = json_decode($form->settingsJson);
+
+            //$overWriteAll = (bool) Yii::$app->request->post()['AdvancedSettings']['overwriteAll'];
+            //$data = json_decode(Yii::$app->request->post()['AdvancedSettings']['settingsJson'], true);
+
+            // Load the imported data into the models
             $config->load($data);
             $colorSettings->load($data);
             $darkColorSettings->load($data);

diff --git a/models/AbstractColorSettings.php b/models/AbstractColorSettings.php
@@ -13,6 +13,8 @@ abstract class AbstractColorSettings extends \yii\base\Model
      */
     public const PREFIX = '';
 
+    public bool $autoLoadSettings = true;
+
     public $configurableColors = [];
     public $hasWarnings = false;
 
@@ -53,12 +55,23 @@ abstract public function getColors(): array;
 
     abstract protected function getColorFallback(string $color): string;
 
+    public function __construct($autoLoadSettings = true) {
+        $this->autoLoadSettings = $autoLoadSettings;
+    }
+
     public function init()
     {
         parent::init();
 
         $this->configurableColors = array_merge(static::MAIN_COLORS, static::TEXT_COLORS, static::BACKGROUND_COLORS);
 
+        if ($this->autoLoadSettings) {
+            $this->loadSettings();
+        }
+    }
+
+    public function loadSettings()
+    {
         $settings = static::getSettings();
         foreach($this->configurableColors as $color) {
             $this->$color = $settings->get(static::PREFIX . $color);

diff --git a/models/AdvancedSettings.php b/models/AdvancedSettings.php
@@ -5,12 +5,12 @@
 use humhub\modules\flexTheme\models\Config;
 use humhub\modules\flexTheme\models\ColorSettings;
 use humhub\modules\flexTheme\models\DarkColorSettings;
-
 use Yii;
 
 class AdvancedSettings extends \yii\base\Model
 {
     public $settingsJson;
+    public bool $overwriteAll = false;
 
     public function init()
     {
@@ -24,21 +24,24 @@ public function init()
     public function attributeLabels()
     {
         $labels['settingsJson'] = 'Settings JSON';
+        $labels['overwriteAll'] = Yii::t('FlexThemeModule.admin', 'Overwrite all Settings');
 
         return $labels;
     }
 
     public function attributeHints()
     {
         $hints['settingsJson'] = '<b>' . Yii::t('FlexThemeModule.admin', 'WARNING') . '</b>' . ': ' . Yii::t('FlexThemeModule.admin', 'Your settings will be overwritten!');
-
+        $hints['overwriteAll'] = Yii::t('FlexThemeModule.admin', 'With this option all stored settings will be deleted, only the imported settings remain.');
+
         return $hints;
     }
 
     public function rules()
     {
         return [
-            [['settingsJson'], 'isValidJSON']
+            [['settingsJson'], 'isValidJSON'],
+            [['overwriteAll'], 'boolean'],
         ];
     }
 

diff --git a/models/Config.php b/models/Config.php
@@ -16,6 +16,8 @@
  */
 class Config extends \yii\base\Model
 {
+    public bool $autoLoadSettings = true;
+
     // Module settings
     public const CONFIG_NAMES = ['commentLink', 'likeLink', 'likeIcon', 'likeIconFull', 'likeIconColor', 'showTopicMenu', 'showUploadAsButtons'];
     public $commentLink;
@@ -26,17 +28,21 @@ class Config extends \yii\base\Model
     public $showTopicMenu;
     public $showUploadAsButtons;
 
-    public static function getSetting(string $setting_name): string
-    {
-        // Note: return can be empty
-        return Yii::$app->getModule('flex-theme')->settings->get($setting_name);
+    public function __construct($autoLoadSettings = true) {
+        $this->autoLoadSettings = $autoLoadSettings;
     }
 
     public function init()
     {
-
         parent::init();
 
+        if ($this->autoLoadSettings) {
+            $this->loadSettings();
+        }
+    }
+
+    public function loadSettings()
+    {
         $settings = Yii::$app->getModule('flex-theme')->settings;
 
         $this->commentLink = $settings->get('commentLink', 'text');
@@ -48,6 +54,12 @@ public function init()
         $this->showUploadAsButtons = $settings->get('showUploadAsButtons');
     }
 
+    public static function getSetting(string $setting_name): string
+    {
+        // Note: return can be empty
+        return Yii::$app->getModule('flex-theme')->settings->get($setting_name);
+    }
+
     public function attributeLabels()
     {
 

diff --git a/views/config/advanced.php b/views/config/advanced.php
@@ -8,9 +8,9 @@
 <div class="panel-body">
     <?php $form = ActiveForm::begin(['id' => 'configure-form']);?>
 
-        <?= $form->beginCollapsibleFields(Yii::t('FlexThemeModule.admin', 'Import/Export')); ?>
-            <?= $form->field($model, 'settingsJson')->textarea(['rows' => '12']); ?>
-        <?= $form->endCollapsibleFields(); ?>
+        <h2><?= Yii::t('FlexThemeModule.admin', 'Import/Export') ?></h2>
+        <?= $form->field($model, 'settingsJson')->textarea(['rows' => '12']); ?>
+        <?= $form->field($model, 'overwriteAll')->checkbox(); ?>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('base', 'Save'), ['class' => 'btn btn-primary', 'data-ui-loader' => '']) ?>