maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

get defaults from configparser

Browse Source
This commit is contained in:
Ante de Baas
2020-05-30 10:08:05 +02:00
parent 0fde1ce7e9
commit 1454d8d40f
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
install/lib/class.FroxlorInstall.php
View File

@@ -505,6 +505,17 @@ class FroxlorInstall
$this->_updateSetting($upd_stmt, 'error', 'system', 'errorlog_level'); $this->_updateSetting($upd_stmt, 'error', 'system', 'errorlog_level');
} }
$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
foreach ($distros as $_distribution) {
if($this->_data['distribution'] == str_replace(".xml", "", strtolower(basename($_distribution)))) {
$dist = new \Froxlor\Config\ConfigParser($_distribution);
$defaults = $dist->getDefaults();
foreach ($defaults->property as $property) {
$this->_updateSetting($upd_stmt, $property->value, $property->settinggroup, $property->varname);
}
}
}
if (file_exists(dirname(__DIR__).'/../lib/configfiles/'.$this->_data['distribution'].'.xml')) { if (file_exists(dirname(__DIR__).'/../lib/configfiles/'.$this->_data['distribution'].'.xml')) {
$xml = simplexml_load_file(dirname(__DIR__).'/../lib/configfiles/'.$this->_data['distribution'].'.xml'); $xml = simplexml_load_file(dirname(__DIR__).'/../lib/configfiles/'.$this->_data['distribution'].'.xml');
foreach($xml->distribution->defaults->property as $property) { foreach($xml->distribution->defaults->property as $property) {

50
lib/Froxlor/Config/ConfigParser.php
View File

@@ -39,6 +39,13 @@ class ConfigParser
*/ */
private $services = array(); private $services = array();
/**
* Holding the available defaults in the XML
*
* @var array
*/
private $defaults = array();
/** /**
* Store the parsed SimpleXMLElement for usage * Store the parsed SimpleXMLElement for usage
* *
@@ -147,7 +154,7 @@ class ConfigParser
* *
* @return bool * @return bool
*/ */
private function parse() private function parseServices()
{ {
// We only want to parse the stuff one time // We only want to parse the stuff one time
if ($this->isparsed == true) { if ($this->isparsed == true) {
@@ -174,6 +181,29 @@ class ConfigParser
return true; return true;
} }
/**
* Parse the XML and populate $this->services
*
* @return bool
*/
private function parseDefaults()
{
// We only want to parse the stuff one time
if ($this->isparsed == true) {
return true;
}
// Get all defaults
$defaults = $this->xml->xpath('//defaults');
foreach ($defaults as $default) {
$this->defaults = $default;
}
// Switch flag to indicate we parsed our data
$this->isparsed = true;
return true;
}
/** /**
* Return all services defined by the XML * Return all services defined by the XML
* *
@@ -184,9 +214,25 @@ class ConfigParser
public function getServices() public function getServices()
{ {
// Let's parse this shit(!) // Let's parse this shit(!)
$this->parse(); $this->parseServices();
// Return our carefully searched for services // Return our carefully searched for services
return $this->services; return $this->services;
} }
/**
* Return all defaults defined by the XML
*
* The array will hold ConfigDefaults - Objects for further handling
*
* @return array
*/
public function getDefaults()
{
// Let's parse this shit(!)
$this->parseDefaults();
// Return our carefully searched for defaults
return $this->defaults;
}
} }