Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-04 15:54:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

settings.php using new global config system, updater.php tweaked

Browse Source
This commit is contained in:
mattpass
2020-07-09 14:37:01 +01:00
parent 2e877b9ad8
commit 0810c183c3
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/settings-update.php
View File

@@ -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) {

34
lib/settings.php
View File

@@ -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";

2
lib/updater.php
View File

@@ -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>';