Commit 261d487d authored by Ad Schellevis's avatar Ad Schellevis

add isValid public method on config class

parent f1c11390
...@@ -59,7 +59,16 @@ class Config extends Singleton ...@@ -59,7 +59,16 @@ class Config extends Singleton
* status field: valid config loaded * status field: valid config loaded
* @var bool * @var bool
*/ */
private $isValid = false; private $statusIsValid = false;
/**
* @return bool return (last known) status of this configuration
*/
public function isValid()
{
return $this->statusIsValid;
}
/** /**
* serialize xml to array structure (backwards compatibility mode) * serialize xml to array structure (backwards compatibility mode)
...@@ -155,7 +164,7 @@ class Config extends Singleton ...@@ -155,7 +164,7 @@ class Config extends Singleton
*/ */
private function checkvalid() private function checkvalid()
{ {
if (!$this->isValid) { if (!$this->statusIsValid) {
throw new ConfigException('no valid config loaded') ; throw new ConfigException('no valid config loaded') ;
} }
} }
...@@ -241,7 +250,7 @@ class Config extends Singleton ...@@ -241,7 +250,7 @@ class Config extends Singleton
$this->simplexml = simplexml_import_dom($this->configxml); $this->simplexml = simplexml_import_dom($this->configxml);
restore_error_handler(); restore_error_handler();
$this->isValid = true; $this->statusIsValid = true;
} }
/** /**
...@@ -333,7 +342,7 @@ class Config extends Singleton ...@@ -333,7 +342,7 @@ class Config extends Singleton
public function restoreBackup($filename) public function restoreBackup($filename)
{ {
if ($this->isValid) { if ($this->statusIsValid) {
// if current config is valid, // if current config is valid,
$configxml = $this->configxml; $configxml = $this->configxml;
$simplexml = $this->simplexml; $simplexml = $this->simplexml;
...@@ -346,7 +355,7 @@ class Config extends Singleton ...@@ -346,7 +355,7 @@ class Config extends Singleton
// copy / load failed, restore previous version // copy / load failed, restore previous version
$this->configxml = $configxml; $this->configxml = $configxml;
$this->simplexml = $simplexml; $this->simplexml = $simplexml;
$this->isValid = true; $this->statusIsValid = true;
$this->save(null, true); $this->save(null, true);
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment