lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with master

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-12 14:41:25 +00:00
parent 6d04247dc2
commit 67c7bd635a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View File

@ -59,7 +59,16 @@ class Config extends Singleton
* status field: valid config loaded
* @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)
@ -155,7 +164,7 @@ class Config extends Singleton
*/
private function checkvalid()
{
if (!$this->isValid) {
if (!$this->statusIsValid) {
throw new ConfigException('no valid config loaded') ;
}
}
@ -241,7 +250,7 @@ class Config extends Singleton
$this->simplexml = simplexml_import_dom($this->configxml);
restore_error_handler();
$this->isValid = true;
$this->statusIsValid = true;
}
/**
@ -333,7 +342,7 @@ class Config extends Singleton
public function restoreBackup($filename)
{
if ($this->isValid) {
if ($this->statusIsValid) {
// if current config is valid,
$configxml = $this->configxml;
$simplexml = $this->simplexml;
@ -346,7 +355,7 @@ class Config extends Singleton
// copy / load failed, restore previous version
$this->configxml = $configxml;
$this->simplexml = $simplexml;
$this->isValid = true;
$this->statusIsValid = true;
$this->save(null, true);
}
} else {