From a84dc6c677dda4184c5ba315955da4b4c04908b3 Mon Sep 17 00:00:00 2001
From: danpros <dan@danpros.com>
Date: Wed, 24 Mar 2021 23:05:18 +0700
Subject: [PATCH] Update htmly.php

Create the default setting on save
---
 system/htmly.php | 65 ++++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/system/htmly.php b/system/htmly.php
index 63dbd9d..4d9bd28 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -1272,18 +1272,17 @@ post('/admin/config', function () {
 
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
     if (login() && $proper) {
-        $newKey = from($_REQUEST, 'newKey');
-        $newValue = from($_REQUEST, 'newValue');
-
         $new_config = array();
         $new_Keys = array();
-        if (!empty($newKey)) {
-            $new_Keys[$newKey] = $newValue;
-        }
+
         foreach ($_POST as $name => $value) {
             if (substr($name, 0, 8) == "-config-") {
                 $name = str_replace("_", ".", substr($name, 8));
-                $new_config[$name] = $value;
+                if(!is_null(config($name))) {
+                    $new_config[$name] = $value;
+                } else {
+                    $new_Keys[$name] = $value;	
+                }
             }
         }
         save_config($new_config, $new_Keys);
@@ -1408,18 +1407,17 @@ post('/admin/config/reading', function () {
 
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
     if (login() && $proper) {
-        $newKey = from($_REQUEST, 'newKey');
-        $newValue = from($_REQUEST, 'newValue');
-
         $new_config = array();
         $new_Keys = array();
-        if (!empty($newKey)) {
-            $new_Keys[$newKey] = $newValue;
-        }
+
         foreach ($_POST as $name => $value) {
             if (substr($name, 0, 8) == "-config-") {
                 $name = str_replace("_", ".", substr($name, 8));
-                $new_config[$name] = $value;
+                if(!is_null(config($name))) {
+                    $new_config[$name] = $value;
+                } else {
+                    $new_Keys[$name] = $value;	
+                }
             }
         }
         save_config($new_config, $new_Keys);
@@ -1476,18 +1474,17 @@ post('/admin/config/widget', function () {
 
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
     if (login() && $proper) {
-        $newKey = from($_REQUEST, 'newKey');
-        $newValue = from($_REQUEST, 'newValue');
-
         $new_config = array();
         $new_Keys = array();
-        if (!empty($newKey)) {
-            $new_Keys[$newKey] = $newValue;
-        }
+
         foreach ($_POST as $name => $value) {
             if (substr($name, 0, 8) == "-config-") {
                 $name = str_replace("_", ".", substr($name, 8));
-                $new_config[$name] = $value;
+                if(!is_null(config($name))) {
+                    $new_config[$name] = $value;
+                } else {
+                    $new_Keys[$name] = $value;	
+                }
             }
         }
         save_config($new_config, $new_Keys);
@@ -1544,18 +1541,17 @@ post('/admin/config/metatags', function () {
 
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
     if (login() && $proper) {
-        $newKey = from($_REQUEST, 'newKey');
-        $newValue = from($_REQUEST, 'newValue');
-
         $new_config = array();
         $new_Keys = array();
-        if (!empty($newKey)) {
-            $new_Keys[$newKey] = $newValue;
-        }
+
         foreach ($_POST as $name => $value) {
             if (substr($name, 0, 8) == "-config-") {
                 $name = str_replace("_", ".", substr($name, 8));
-                $new_config[$name] = $value;
+                if(!is_null(config($name))) {
+                    $new_config[$name] = $value;
+                } else {
+                    $new_Keys[$name] = $value;	
+                }
             }
         }
         save_config($new_config, $new_Keys);
@@ -1612,18 +1608,17 @@ post('/admin/config/performance', function () {
 
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
     if (login() && $proper) {
-        $newKey = from($_REQUEST, 'newKey');
-        $newValue = from($_REQUEST, 'newValue');
-
         $new_config = array();
         $new_Keys = array();
-        if (!empty($newKey)) {
-            $new_Keys[$newKey] = $newValue;
-        }
+
         foreach ($_POST as $name => $value) {
             if (substr($name, 0, 8) == "-config-") {
                 $name = str_replace("_", ".", substr($name, 8));
-                $new_config[$name] = $value;
+                if(!is_null(config($name))) {
+                    $new_config[$name] = $value;
+                } else {
+                    $new_Keys[$name] = $value;	
+                }
             }
         }
         save_config($new_config, $new_Keys);