Deploy

nguyenanhung · Sep 10, 2021 · f58529e · f58529e
1 parent cf1610c
commit f58529e
Show file tree

Hide file tree

Showing 8 changed files with 1,029 additions and 1,035 deletions.
diff --git a/thirdParty/MX/Base.php b/thirdParty/MX/Base.php
@@ -1,64 +1,62 @@
 <?php
-defined('BASEPATH') or exit('No direct script access allowed');
-if (!class_exists('CI')) {
-	/* load MX core classes */
-	require_once dirname(__FILE__) . '/Lang.php';
-	require_once dirname(__FILE__) . '/Config.php';
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+/* load MX core classes */
+require_once dirname(__FILE__) . '/Lang.php';
+require_once dirname(__FILE__) . '/Config.php';
 
-	/**
-	 * Modular Extensions - HMVC
-	 *
-	 * Adapted from the CodeIgniter Core Classes
-	 *
-	 * @link         http://codeigniter.com
-	 *
-	 * Description:
-	 * This library extends the CodeIgniter CI_Controller class and creates an application
-	 * object allowing use of the HMVC design pattern.
-	 *
-	 * Install this file as application/third_party/MX/Base.php
-	 *
-	 * @copyright    Copyright (c) 2015 Wiredesignz
-	 * @version      5.5
-	 *
-	 * Permission is hereby granted, free of charge, to any person obtaining a copy
-	 * of this software and associated documentation files (the "Software"), to deal
-	 * in the Software without restriction, including without limitation the rights
-	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	 * copies of the Software, and to permit persons to whom the Software is
-	 * furnished to do so, subject to the following conditions:
-	 *
-	 * The above copyright notice and this permission notice shall be included in
-	 * all copies or substantial portions of the Software.
-	 *
-	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	 * THE SOFTWARE.
-	 **/
-	class CI extends CI_Controller
-	{
-		public static $APP;
+/**
+ * Modular Extensions - HMVC
+ *
+ * Adapted from the CodeIgniter Core Classes
+ *
+ * @link         http://codeigniter.com
+ *
+ * Description:
+ * This library extends the CodeIgniter CI_Controller class and creates an application
+ * object allowing use of the HMVC design pattern.
+ *
+ * Install this file as application/third_party/MX/Base.php
+ *
+ * @copyright    Copyright (c) 2015 Wiredesignz
+ * @version      5.5
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ **/
+class CI extends CI_Controller
+{
+	public static $APP;
 
-		public function __construct()
-		{
-			/* assign the application instance */
-			self::$APP = $this;
-			global $LANG, $CFG;
-			/* re-assign language and config for modules */
-			if (!$LANG instanceof MX_Lang) {
-				$LANG = new MX_Lang;
-			}
-			if (!$CFG instanceof MX_Config) {
-				$CFG = new MX_Config;
-			}
-			parent::__construct();
+	public function __construct()
+	{
+		/* assign the application instance */
+		self::$APP = $this;
+		global $LANG, $CFG;
+		/* re-assign language and config for modules */
+		if (!$LANG instanceof MX_Lang) {
+			$LANG = new MX_Lang;
+		}
+		if (!$CFG instanceof MX_Config) {
+			$CFG = new MX_Config;
 		}
+		parent::__construct();
 	}
-
-	/* create the application object */
-	new CI;
 }
+
+/* create the application object */
+new CI;
diff --git a/thirdParty/MX/CI.php b/thirdParty/MX/CI.php
@@ -1,62 +1,60 @@
 <?php
-defined('BASEPATH') or exit('No direct script access allowed');
-if (!class_exists('CI')) {
-	/* load MX core classes */
-	require_once dirname(__FILE__) . '/Lang.php';
-	require_once dirname(__FILE__) . '/Config.php';
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+/* load MX core classes */
+require_once dirname(__FILE__) . '/Lang.php';
+require_once dirname(__FILE__) . '/Config.php';
 
-	/**
-	 * Modular Extensions - HMVC
-	 *
-	 * Adapted from the CodeIgniter Core Classes
-	 *
-	 * @link         http://codeigniter.com
-	 *
-	 * Description:
-	 * This library creates a CI class which allows the use of modules in an application.
-	 *
-	 * Install this file as application/third_party/MX/Ci.php
-	 *
-	 * @copyright    Copyright (c) 2015 Wiredesignz
-	 * @version      5.5
-	 *
-	 * Permission is hereby granted, free of charge, to any person obtaining a copy
-	 * of this software and associated documentation files (the "Software"), to deal
-	 * in the Software without restriction, including without limitation the rights
-	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	 * copies of the Software, and to permit persons to whom the Software is
-	 * furnished to do so, subject to the following conditions:
-	 *
-	 * The above copyright notice and this permission notice shall be included in
-	 * all copies or substantial portions of the Software.
-	 *
-	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	 * THE SOFTWARE.
-	 **/
-	class CI
-	{
-		public static $APP;
+/**
+ * Modular Extensions - HMVC
+ *
+ * Adapted from the CodeIgniter Core Classes
+ *
+ * @link         http://codeigniter.com
+ *
+ * Description:
+ * This library creates a CI class which allows the use of modules in an application.
+ *
+ * Install this file as application/third_party/MX/Ci.php
+ *
+ * @copyright    Copyright (c) 2015 Wiredesignz
+ * @version      5.5
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ **/
+class CI
+{
+	public static $APP;
 
-		public function __construct()
-		{
-			/* assign the application instance */
-			self::$APP = CI_Controller::get_instance();
-			global $LANG, $CFG;
-			/* re-assign language and config for modules */
-			if (!$LANG instanceof MX_Lang) {
-				$LANG = new MX_Lang;
-			}
-			if (!$CFG instanceof MX_Config) {
-				$CFG = new MX_Config;
-			}
+	public function __construct()
+	{
+		/* assign the application instance */
+		self::$APP = CI_Controller::get_instance();
+		global $LANG, $CFG;
+		/* re-assign language and config for modules */
+		if (!$LANG instanceof MX_Lang) {
+			$LANG = new MX_Lang;
+		}
+		if (!$CFG instanceof MX_Config) {
+			$CFG = new MX_Config;
 		}
 	}
-
-	/* create the application object */
-	new CI;
 }
+
+/* create the application object */
+new CI;
diff --git a/thirdParty/MX/Config.php b/thirdParty/MX/Config.php
@@ -1,71 +1,70 @@
 <?php
-defined('BASEPATH') or exit('No direct script access allowed');
-if (!class_exists('MX_Config')) {
-	/**
-	 * Modular Extensions - HMVC
-	 *
-	 * Adapted from the CodeIgniter Core Classes
-	 *
-	 * @link         http://codeigniter.com
-	 *
-	 * Description:
-	 * This library extends the CodeIgniter CI_Config class
-	 * and adds features allowing use of modules and the HMVC design pattern.
-	 *
-	 * Install this file as application/third_party/MX/Config.php
-	 *
-	 * @copyright    Copyright (c) 2015 Wiredesignz
-	 * @version      5.5
-	 *
-	 * Permission is hereby granted, free of charge, to any person obtaining a copy
-	 * of this software and associated documentation files (the "Software"), to deal
-	 * in the Software without restriction, including without limitation the rights
-	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	 * copies of the Software, and to permit persons to whom the Software is
-	 * furnished to do so, subject to the following conditions:
-	 *
-	 * The above copyright notice and this permission notice shall be included in
-	 * all copies or substantial portions of the Software.
-	 *
-	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	 * THE SOFTWARE.
-	 **/
-	class MX_Config extends CI_Config
+(defined('BASEPATH')) OR exit('No direct script access allowed');
+
+/**
+ * Modular Extensions - HMVC
+ *
+ * Adapted from the CodeIgniter Core Classes
+ *
+ * @link         http://codeigniter.com
+ *
+ * Description:
+ * This library extends the CodeIgniter CI_Config class
+ * and adds features allowing use of modules and the HMVC design pattern.
+ *
+ * Install this file as application/third_party/MX/Config.php
+ *
+ * @copyright    Copyright (c) 2015 Wiredesignz
+ * @version      5.5
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ **/
+class MX_Config extends CI_Config
+{
+	public function load($file = '', $use_sections = false, $fail_gracefully = false, $_module = '')
 	{
-		public function load($file = '', $use_sections = false, $fail_gracefully = false, $_module = '')
-		{
-			if (in_array($file, $this->is_loaded, true)) {
-				return $this->item($file);
-			}
-			$_module or $_module = CI::$APP->router->fetch_module();
-			list($path, $file) = Modules::find($file, $_module, 'config/');
-			if ($path === false) {
-				parent::load($file, $use_sections, $fail_gracefully);
+		if (in_array($file, $this->is_loaded, true)) {
+			return $this->item($file);
+		}
+		$_module or $_module = CI::$APP->router->fetch_module();
+		list($path, $file) = Modules::find($file, $_module, 'config/');
+		if ($path === false) {
+			parent::load($file, $use_sections, $fail_gracefully);
 
-				return $this->item($file);
-			}
-			if ($config = Modules::load_file($file, $path, 'config')) {
-				/* reference to the config array */
-				$current_config =& $this->config;
-				if ($use_sections === true) {
-					if (isset($current_config[$file])) {
-						$current_config[$file] = array_merge($current_config[$file], $config);
-					} else {
-						$current_config[$file] = $config;
-					}
+			return $this->item($file);
+		}
+		if ($config = Modules::load_file($file, $path, 'config')) {
+			/* reference to the config array */
+			$current_config =& $this->config;
+			if ($use_sections === true) {
+				if (isset($current_config[$file])) {
+					$current_config[$file] = array_merge($current_config[$file], $config);
 				} else {
-					$current_config = array_merge($current_config, $config);
+					$current_config[$file] = $config;
 				}
-				$this->is_loaded[] = $file;
-				unset($config);
-
-				return $this->item($file);
+			} else {
+				$current_config = array_merge($current_config, $config);
 			}
+			$this->is_loaded[] = $file;
+			unset($config);
+
+			return $this->item($file);
 		}
 	}
 }