From 0810c183c396e78a8d7219c6a50ffa269c2a6bbb Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Thu, 9 Jul 2020 14:37:01 +0100
Subject: [PATCH] settings.php using new global config system, updater.php
 tweaked

---
 lib/settings-update.php |  4 ++--
 lib/settings.php        | 34 ++++++++++++++++++++++++----------
 lib/updater.php         |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/settings-update.php b/lib/settings-update.php
index 79524e6..02eb089 100644
--- a/lib/settings-update.php
+++ b/lib/settings-update.php
@@ -113,10 +113,10 @@ if (!$demoMode && true === isset($_SESSION['loggedIn']) && $_SESSION['loggedIn']
 	$refreshFM = $_POST['changedFileSettings'] == "true" ? "true" : "false";
 
     // Update global config settings file
-    $ICEcoderSettingsFromFile = $settingsClass->getSystemConfigSettings();
+    $ICEcoderSettingsFromFile = $settingsClass->getConfigGlobalSettings();
     $ICEcoderSettingsFromFile['multiUser'] = isset($_POST['multiUser']) && $_POST['multiUser'];
     $ICEcoderSettingsFromFile['enableRegistration'] = isset($_POST['enableRegistration']) && $_POST['enableRegistration'];
-    $settingsClass->setSystemConfigSettings($ICEcoderSettingsFromFile);
+    $settingsClass->setConfigGlobalSettings($ICEcoderSettingsFromFile);
 
 	// If we've changed langugage, reload ICEcoder now
 	if ($languageUserChanged) {
diff --git a/lib/settings.php b/lib/settings.php
index 174d9bc..0f11123 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -1,6 +1,5 @@
 <?php
 // Establish settings and users template filenames
-$configSettings = 'config-settings.php';
 $configUsersTemplate = 'template-users.php';
 
 require_once dirname(__FILE__) . "/../classes/_ExtraProcesses.php";
@@ -14,22 +13,37 @@ $systemClass = new \ICEcoder\System();
 
 // Create a new config file if it doesn't exist yet.
 // The reason we create it, is so it has PHP write permissions, meaning we can update it later
-if (false === file_exists(dirname(__FILE__) . "/../data/" . $configSettings)) {
-    // Include our params to make use of (as $newConfigSettingsFile)
-    include dirname(__FILE__) . "/template-system.php";
-    if ($fConfigSettings = fopen(dirname(__FILE__) . "/../data/" . $configSettings, 'w')) {
-        fwrite($fConfigSettings, $newConfigSettingsFile);
-        fclose($fConfigSettings);
-    } else {
+if (false === $settingsClass->getConfigGlobalFileDetails()['exists']) {
+    if (false === $settingsClass->setConfigGlobalSettings($settingsClass->getConfigGlobalTemplate())) {
         $reqsPassed = false;
         $reqsFailures = ["phpCreateConfig"];
         include dirname(__FILE__) . "/requirements.php";
     }
 }
 
+// Check config settings file exists
+if (false === $settingsClass->getConfigGlobalFileDetails()['exists']) {
+    $reqsPassed = false;
+    $reqsFailures = ["phpFileExists"];
+    include dirname(__FILE__) . "/requirements.php";
+}
+
+// Check we can read config settings file
+if (false === $settingsClass->getConfigGlobalFileDetails()['readable']) {
+    $reqsPassed = false;
+    $reqsFailures = ["phpReadFile"];
+    include dirname(__FILE__) . "/requirements.php";
+}
+
+// Check we can write config settings file
+if (false === $settingsClass->getConfigGlobalFileDetails()['writable']) {
+    $reqsPassed = false;
+    $reqsFailures = ["phpWriteFile"];
+    include dirname(__FILE__) . "/requirements.php";
+}
+
 // Load config settings
-$systemClass->invalidateOPCache(dirname(__FILE__) . "/../data/" . $configSettings);
-include dirname(__FILE__) . "/../data/" . $configSettings;
+$ICEcoderSettings = $settingsClass->getConfigGlobalSettings();
 
 // Load common functions
 include_once dirname(__FILE__) . "/settings-common.php";
diff --git a/lib/updater.php b/lib/updater.php
index 8816f15..0f83bd6 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -178,7 +178,7 @@ function copyOverSettings($icvInfo) {
 			die("Cannot update config file data/".$configSettings.". Please check write permissions on data/ and try again");
 		}
 	}
-	transposeSettings(PATH."data/template-system.php","config-settings.php","config-settings.php");
+	transposeSettings(PATH."data/template-global-settings.php","config-global.php","config-global.php");
 
 	// Users template settings
 	echo 'Transposing users template settings...<br>';