diff options
Diffstat (limited to 'h-source/Application/Controllers/BaseController.php')
| -rw-r--r-- | h-source/Application/Controllers/BaseController.php | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php index 5c5a197..ac2be1f 100644 --- a/h-source/Application/Controllers/BaseController.php +++ b/h-source/Application/Controllers/BaseController.php @@ -119,7 +119,7 @@ class BaseController extends Controller //check ft they are updating the website $updating = $this->m['ParamsModel']->select('updating')->where(array('id_par'=>1))->toList('updating')->send(); - + $data['updating_flag'] = 'no'; if (count($updating)>0) { @@ -128,30 +128,28 @@ class BaseController extends Controller } //get the configuration xml - if (Website::$useXmlConfigFile) + $xmlRes = $this->m['ParamsModel']->select('boxes_xml')->where(array('id_par'=>1))->toList('boxes_xml')->send(); + if (count($xmlRes)>0) { - $xmlConfigFile = rtrim(Website::$xmlConfigFileFolder,'/') . '/config.xml'; - - if (@simplexml_load_file($xmlConfigFile)) + $configXml = htmlspecialchars_decode($xmlRes[0],ENT_QUOTES); + + if (Website::$useXmlConfigFile) { - $this->_configXml = simplexml_load_file($xmlConfigFile); + $xmlConfigFile = rtrim(Website::$xmlConfigFileFolder,'/') . '/config.xml'; + if (@simplexml_load_file($xmlConfigFile)) + { + $this->_configXml = simplexml_load_file($xmlConfigFile); + } } - } - else - { - $xmlRes = $this->m['ParamsModel']->select('boxes_xml')->where(array('id_par'=>1))->toList('boxes_xml')->send(); - - if (count($xmlRes)>0) + else { - $configXml = htmlspecialchars_decode($xmlRes[0],ENT_QUOTES); - if (@simplexml_load_string($configXml)) { $this->_configXml = simplexml_load_string($configXml); } } - } + //elements of the top menu from the config.xml file //help link $mod = new BoxParser($this->getBox(array("top_menu","help_page_link"))); @@ -162,9 +160,9 @@ class BaseController extends Controller //link to the "discover your hardware" wiki page $data['discoverYourHardwareLink'] = $this->getModule(array('right_column','discover_your_hardware')); - + Distributions::setAllowedList(); - + $this->append($data); } @@ -302,4 +300,4 @@ class BaseController extends Controller } } -}
\ No newline at end of file +} |