From 3ff03dc4f0a72432b34c00da620272cf011e4ddd Mon Sep 17 00:00:00 2001
From: Yuchen Pei <me@ypei.me>
Date: Thu, 29 Jul 2021 14:17:20 +1000
Subject: Publishing h-node.org code.

- this is the h-node.org code, except
  - removed a js file (3x copies at three different locations) without license / copyright headers
    - /Js/linkToForm.js
    - /Public/Js/linkToForm.js
    - /admin/Public/Js/linkToForm.js
  - removed config files containing credentials
    - /Application/Include/params.php
    - /Config/Config.php
    - /admin/Application/Include/params.php
    - /admin/Config/Config.php
  - added license and copyright header to one php file
    - /admin/Library/ErrorReporting.php (almost identical to /Library/ErrorReporting.php which has the headers)
---
 .../Application/Controllers/BaseController.php     | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'h-source/Application/Controllers/BaseController.php')

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
+}
-- 
cgit v1.2.3