tnhfw / tnh-fw

core/libraries/FormValidation.php

Indentation +94 added lines, -94 removed lines

@@ -22,10 +22,10 @@ 
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-    */
+     */
 
 
-     class FormValidation{
+        class FormValidation{
 		 
         /**
          * The form validation status
@@ -60,7 +60,7 @@ 
          */
         protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
         
-		/**
+        /**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
@@ -100,7 +100,7 @@ 
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
-		   //Load form validation language message
+            //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
             $this->_errorsMessages  = array(
@@ -162,13 +162,13 @@ 
         /**
          * Set the form validation data
          * @param array $data the values to be validated
-		 *
+         *
          * @return FormValidation Current instance of object.
          */
         public function setData(array $data){
             $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
             $this->data = $data;
-			return $this;
+            return $this;
         }
 
         /**
@@ -179,11 +179,11 @@ 
             return $this->data;
         }
 
-		/**
-		* Get the validation function name to validate a rule
-		*
-		* @return string the function name
-		*/
+        /**
+         * Get the validation function name to validate a rule
+         *
+         * @return string the function name
+         */
         protected function _toCallCase($funcName, $prefix='_validate') {
             $funcName = strtolower($funcName);
             $finalFuncName = $prefix;
@@ -253,12 +253,12 @@ 
             $this->_forceFail = false;
 
             foreach ($this->getData() as $inputName => $inputVal) {
-    			if(is_array($this->data[$inputName])){
-    				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
-    			}
-    			else{
-    				$this->data[$inputName] = trim($this->data[$inputName]);
-    			}
+                if(is_array($this->data[$inputName])){
+                    $this->data[$inputName] = array_map('trim', $this->data[$inputName]);
+                }
+                else{
+                    $this->data[$inputName] = trim($this->data[$inputName]);
+                }
 
                 if (array_key_exists($inputName, $this->_rules)) {
                     foreach ($this->_parseRuleString($this->_rules[$inputName]) as $eachRule) {
@@ -274,7 +274,7 @@ 
          *
          * @param string $inputField Name of the field or the data key to add a rule to
          * @param string $ruleSets PIPE seperated string of rules
-		 *
+         *
          * @return FormValidation Current instance of object.
          */
         public function setRule($inputField, $inputLabel, $ruleSets) {
@@ -288,8 +288,8 @@ 
          * Takes an array of rules and uses setRule() to set them, accepts an array
          * of rule names rather than a pipe-delimited string as well.
          * @param array $ruleSets
-		 *
-		 * @return FormValidation Current instance of object.
+         *
+         * @return FormValidation Current instance of object.
          */
         public function setRules(array $ruleSets) {
             foreach ($ruleSets as $ruleSet) {
@@ -311,7 +311,7 @@ 
          * @param string $start Before block of errors gets displayed, HTML allowed.
          * @param string $end After the block of errors gets displayed, HTML allowed.
          *
-		 * @return FormValidation Current instance of object.
+         * @return FormValidation Current instance of object.
          */
         public function setErrorsDelimiter($start, $end) {
             $this->_allErrorsDelimiter[0] = $start;
@@ -326,7 +326,7 @@ 
          * @param string $start Displayed before each error.
          * @param string $end Displayed after each error.
          * 
-		 * @return FormValidation Current instance of object.
+         * @return FormValidation Current instance of object.
          */
         public function setErrorDelimiter($start, $end) {
             $this->_eachErrorDelimiter[0] = $start;
@@ -334,21 +334,21 @@ 
             return $this;
         }
 
-		/**
-		* Get the each errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorDelimiter() {
+        /**
+         * Get the each errors delimiters
+         *
+         * @return array
+         */
+        public function getErrorDelimiter() {
             return $this->_eachErrorDelimiter;
         }
 
-		/**
-		* Get the all errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorsDelimiter() {
+        /**
+         * Get the all errors delimiters
+         *
+         * @return array
+         */
+        public function getErrorsDelimiter() {
             return $this->_allErrorsDelimiter;
         }
 
@@ -386,7 +386,7 @@ 
          *
          * @param string $inputName The form input name or data key
          * @param string $errorMessage Error to display
-		 *
+         *
          * @return formValidation Current instance of the object
          */
         public function setCustomError($inputName, $errorMessage) {
@@ -423,17 +423,17 @@ 
          *
          * @param boolean $limit number of error to display or return
          * @param boolean $echo Whether or not the values are to be returned or displayed
-		 *
+         *
          * @return string Errors formatted for output
          */
         public function displayErrors($limit = null, $echo = true) {
             list($errorsStart, $errorsEnd) = $this->_allErrorsDelimiter;
             list($errorStart, $errorEnd) = $this->_eachErrorDelimiter;
             $errorOutput = $errorsStart;
-    		$i = 0;
+            $i = 0;
             if (!empty($this->_errors)) {
                 foreach ($this->_errors as $fieldName => $error) {
-        	    	if ($i === $limit) { 
+                    if ($i === $limit) { 
                         break; 
                     }
                     $errorOutput .= $errorStart;
@@ -461,7 +461,7 @@ 
          * Breaks up a PIPE seperated string of rules, and puts them into an array.
          *
          * @param string $ruleString String to be parsed.
-		 *
+         *
          * @return array Array of each value in original string.
          */
         protected function _parseRuleString($ruleString) {
@@ -474,10 +474,10 @@ 
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
-                     $ruleSets[] = $regexRule[0];
-                 }
-                 $ruleStringRegex = explode('|', $ruleStringTemp);
+                    if(!empty($regexRule[0])){
+                        $ruleSets[] = $regexRule[0];
+                    }
+                    $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
                     if($rule){
@@ -493,7 +493,7 @@ 
                 } else {
                     $ruleSets[] = $ruleString;
                 }
-             }
+                }
             return $ruleSets;
         }
 
@@ -501,7 +501,7 @@ 
          * Returns whether or not a field obtains the rule "required".
          *
          * @param string $fieldName Field to check if required.
-		 *
+         *
          * @return boolean Whether or not the field is required.
          */
         protected function _fieldIsRequired($fieldName) {
@@ -536,13 +536,13 @@ 
             return;
         }
 
-		/**
-		* Set error for the given field or key
-		*
-		* @param string $inputName the input or key name
-		* @param string $ruleName the rule name
-		* @param array|string $replacements
-		*/
+        /**
+         * Set error for the given field or key
+         *
+         * @param string $inputName the input or key name
+         * @param string $ruleName the rule name
+         * @param array|string $replacements
+         */
         protected function _setError($inputName, $ruleName, $replacements = array()) {
             $rulePhraseKeyParts = explode(',', $ruleName);
             $rulePhrase = null;
@@ -559,7 +559,7 @@ 
             }
             // Type cast to array in case it's a string
             $replacements = (array) $replacements;
-			$replacementCount = count($replacements);
+            $replacementCount = count($replacements);
             for ($i = 1; $i <= $replacementCount; $i++) {
                 $key = $i - 1;
                 $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
@@ -577,11 +577,11 @@ 
          *
          * @param type $inputArg
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runCallback($inputArg, $callbackFunc) {
-			return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
+            return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
         }
 
         /**
@@ -590,7 +590,7 @@ 
          * arguments.
          *
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runEmptyCallback($callbackFunc) {
@@ -601,7 +601,7 @@ 
          * Gets a specific label of a specific field input name.
          *
          * @param string $inputName
-		 *
+         *
          * @return string
          */
         protected function _getLabel($inputName) {
@@ -614,7 +614,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("required")
          * @param  array  $ruleArgs  the rules argument
          */
-		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
                 $callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
@@ -622,8 +622,8 @@ 
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
             } 
-			else if($inputVal == '') {
-				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
+            else if($inputVal == '') {
+                $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
 
@@ -647,10 +647,10 @@ 
          */
         protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
             if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
-				$result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
-				if(! $result){
-					$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-				}
+                $result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
+                if(! $result){
+                    $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+                }
             }
         }
 
@@ -682,7 +682,7 @@ 
                         continue;
                     }
                 } 
-				else{
+                else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -774,7 +774,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("less_than")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal >= $ruleArgs[1]) { 
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -790,7 +790,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("greater_than")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal <= $ruleArgs[1]) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -806,7 +806,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("numeric")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (! is_numeric($inputVal)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -822,18 +822,18 @@ 
          * @param  string $ruleName  the rule name for this validation ("exists")
          * @param  array  $ruleArgs  the rules argument
          */
-		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		if (! is_object($this->databaseInstance)){
+            if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
                 if(isset($obj->database)){
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-    			                                       ->where($column, $inputVal);
-    		$this->databaseInstance->get();
+            list($table, $column) = explode('.', $ruleArgs[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal);
+            $this->databaseInstance->get();
             if ($this->databaseInstance->numRows() <= 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
@@ -848,7 +848,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("is_unique")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
@@ -856,11 +856,11 @@ 
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-    			                                      ->where($column, $inputVal);
-    		$this->databaseInstance->get();
-    		if ($this->databaseInstance->numRows() > 0) {
+            list($table, $column) = explode('.', $ruleArgs[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal);
+            $this->databaseInstance->get();
+            if ($this->databaseInstance->numRows() > 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
@@ -874,25 +874,25 @@ 
          * @param  string $ruleName  the rule name for this validation ("is_unique_update")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		if (! is_object($this->databaseInstance)){
+            if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
                 if(isset($obj->database)){
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
-    			return;
-    		}
-    		list($table, $column) = explode('.', $data[0]);
-    		list($field, $val)    = explode('=', $data[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-                                			          ->where($column, $inputVal)
-                                            		  ->where($field, '!=', trim($val));
+            $data = explode(',', $ruleArgs[1]);
+            if(count($data) < 2){
+                return;
+            }
+            list($table, $column) = explode('.', $data[0]);
+            list($field, $val)    = explode('=', $data[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal)
+                                                        ->where($field, '!=', trim($val));
             $this->databaseInstance->get();
-    		if ($this->databaseInstance->numRows() > 0) {
+            if ($this->databaseInstance->numRows() > 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
@@ -908,7 +908,7 @@ 
          */
         protected function _validateInList($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		$list = explode(',', $ruleArgs[1]);
+            $list = explode(',', $ruleArgs[1]);
             $list = array_map('trim', $list);
             if (! in_array($inputVal, $list)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -926,7 +926,7 @@ 
          */
         protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		$regex = $ruleArgs[1];
+            $regex = $ruleArgs[1];
             if (! preg_match($regex, $inputVal)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;

core/libraries/Pagination.php

Indentation +42 added lines, -42 removed lines

@@ -1,32 +1,32 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
     class Pagination{
         
-		/**
+        /**
          * The list of loaded config
          * @var array
          */
@@ -49,15 +49,15 @@ 
                 if (empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					if (! empty($overwriteConfig)){
-						$config = array_merge($config, $overwriteConfig);
-					}
-					$this->config = $config;
+                else{
+                    if (! empty($overwriteConfig)){
+                        $config = array_merge($config, $overwriteConfig);
+                    }
+                    $this->config = $config;
                     //put it gobally
-					Config::setAll($config);
-					unset($config);
-				}
+                    Config::setAll($config);
+                    unset($config);
+                }
             }
             else{
                 show_error('Unable to find the pagination configuration file');
@@ -94,11 +94,11 @@ 
             return $this->paginationQueryString;
         }
 
-         /**
-         * Set the value of the pagination query string
-         * @param string $paginationQueryString the new value
-         * @return object
-         */
+            /**
+             * Set the value of the pagination query string
+             * @param string $paginationQueryString the new value
+             * @return object
+             */
         public function setPaginationQueryString($paginationQueryString){
             $this->paginationQueryString = $paginationQueryString;
             return $this;
@@ -117,7 +117,7 @@ 
             $queryString = Url::queryString();
             $currentUrl = Url::current();
             $query = '';
-             if ($queryString == ''){
+                if ($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
             }
             else{
@@ -150,7 +150,7 @@ 
          */
         public function getLink($totalRows, $currentPageNumber){
             $numberOfLink = $this->config['nb_link'];
-			$numberOfRowPerPage = $this->config['pagination_per_page'];
+            $numberOfRowPerPage = $this->config['pagination_per_page'];
             if (empty($this->paginationQueryString)){
                 //determine the pagination query string value
                 $this->determinePaginationQueryStringValue();
@@ -164,8 +164,8 @@ 
             $numberOfRowPerPage = (int) $numberOfRowPerPage;
 			
             if ($currentPageNumber <= 0){
-				$currentPageNumber = 1;
-			}
+                $currentPageNumber = 1;
+            }
             if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0) {
                 return $navbar;
             }
@@ -206,7 +206,7 @@ 
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
             }
             else if ($currentPageNumber == $numberOfPage){
-               $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
+                $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
             return $navbar;

core/libraries/Browser.php

Indentation +28 added lines, -28 removed lines

@@ -1669,34 +1669,34 @@
         protected function checkPlatform()
         {
             $platformMaps = array(
-              'windows' => self::PLATFORM_WINDOWS,
-              'iPad' => self::PLATFORM_IPAD,
-              'iPod' => self::PLATFORM_IPOD,
-              'iPhone' => self::PLATFORM_IPHONE,
-              'mac' => self::PLATFORM_APPLE,
-              'android' => self::PLATFORM_ANDROID,
-              'Silk' => self::PLATFORM_FIRE_OS,
-              'linux_smarttv' => self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV,
-              'linux' => self::PLATFORM_LINUX,
-              'Nokia' => self::PLATFORM_NOKIA,
-              'BlackBerry' => self::PLATFORM_BLACKBERRY,
-              'FreeBSD' => self::PLATFORM_FREEBSD,
-              'OpenBSD' => self::PLATFORM_OPENBSD,
-              'NetBSD' => self::PLATFORM_NETBSD,
-              'OpenSolaris' => self::PLATFORM_OPENSOLARIS,
-              'SunOS' => self::PLATFORM_SUNOS,
-              'OS\/2' => self::PLATFORM_OS2,
-              'BeOS' => self::PLATFORM_BEOS,
-              'win' => self::PLATFORM_WINDOWS,
-              'Playstation' => self::PLATFORM_PLAYSTATION,
-              'Roku' => self::PLATFORM_ROKU,
-              'iOS' => self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD,
-              'tvOS' => self::PLATFORM_APPLE_TV,
-              'curl' => self::PLATFORM_TERMINAL,
-              'CrOS' => self::PLATFORM_CHROME_OS,
-              'okhttp' => self::PLATFORM_JAVA_ANDROID,
-              'PostmanRuntime' => self::PLATFORM_POSTMAN,
-              'Iframely' => self::PLATFORM_I_FRAME
+                'windows' => self::PLATFORM_WINDOWS,
+                'iPad' => self::PLATFORM_IPAD,
+                'iPod' => self::PLATFORM_IPOD,
+                'iPhone' => self::PLATFORM_IPHONE,
+                'mac' => self::PLATFORM_APPLE,
+                'android' => self::PLATFORM_ANDROID,
+                'Silk' => self::PLATFORM_FIRE_OS,
+                'linux_smarttv' => self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV,
+                'linux' => self::PLATFORM_LINUX,
+                'Nokia' => self::PLATFORM_NOKIA,
+                'BlackBerry' => self::PLATFORM_BLACKBERRY,
+                'FreeBSD' => self::PLATFORM_FREEBSD,
+                'OpenBSD' => self::PLATFORM_OPENBSD,
+                'NetBSD' => self::PLATFORM_NETBSD,
+                'OpenSolaris' => self::PLATFORM_OPENSOLARIS,
+                'SunOS' => self::PLATFORM_SUNOS,
+                'OS\/2' => self::PLATFORM_OS2,
+                'BeOS' => self::PLATFORM_BEOS,
+                'win' => self::PLATFORM_WINDOWS,
+                'Playstation' => self::PLATFORM_PLAYSTATION,
+                'Roku' => self::PLATFORM_ROKU,
+                'iOS' => self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD,
+                'tvOS' => self::PLATFORM_APPLE_TV,
+                'curl' => self::PLATFORM_TERMINAL,
+                'CrOS' => self::PLATFORM_CHROME_OS,
+                'okhttp' => self::PLATFORM_JAVA_ANDROID,
+                'PostmanRuntime' => self::PLATFORM_POSTMAN,
+                'Iframely' => self::PLATFORM_I_FRAME
             );
 
             foreach ($platformMaps as $name => $value) {

core/functions/function_string.php

Indentation +68 added lines, -68 removed lines

@@ -1,71 +1,71 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	 *  @file function_string.php
-	 *
-	 *  This file contains the definition of the functions relating to the processing of strings characters.
-	 *
-	 *  @package	core
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @since 1.0.0
-	 *  @filesource
-	 */
+    /**
+     *  @file function_string.php
+     *
+     *  This file contains the definition of the functions relating to the processing of strings characters.
+     *
+     *  @package	core
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @since 1.0.0
+     *  @filesource
+     */
 
-	if(! function_exists('get_random_string')){
-		/**
-		 * Generate a random string
-		 * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
-		 * "alnum" for alpha-numeric characters and "num" for numbers.
-		 * By default it is "alnum".
-		 * @param  integer $length the length of the string to generate. By default it is 10.
-		 * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
-		 * @return string the generated string.
-		 */
-		function get_random_string($type = 'alnum', $length = 10, $lower = false){
-			$chars = array(
-							'alpha' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-							'alnum' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890',
-							'num' => '1234567890'
-						);
-			$str = null;
-			if(isset($chars[$type])){
-				$str = $chars[$type];
-			}
-			$random = null;
-			for($i = 0; $i < $length; $i++){
-				$random .= $str[mt_rand() % strlen($str)];
-			}
-			if($lower){
-				$random = strtolower($random);
-			}
-			return $random;
-		}
-	}
+    if(! function_exists('get_random_string')){
+        /**
+         * Generate a random string
+         * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
+         * "alnum" for alpha-numeric characters and "num" for numbers.
+         * By default it is "alnum".
+         * @param  integer $length the length of the string to generate. By default it is 10.
+         * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
+         * @return string the generated string.
+         */
+        function get_random_string($type = 'alnum', $length = 10, $lower = false){
+            $chars = array(
+                            'alpha' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
+                            'alnum' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890',
+                            'num' => '1234567890'
+                        );
+            $str = null;
+            if(isset($chars[$type])){
+                $str = $chars[$type];
+            }
+            $random = null;
+            for($i = 0; $i < $length; $i++){
+                $random .= $str[mt_rand() % strlen($str)];
+            }
+            if($lower){
+                $random = strtolower($random);
+            }
+            return $random;
+        }
+    }

tests/include/testsUtil.php

Indentation +11 added lines, -11 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-	/**
-	* Function to test private & protected method
-	*/
-	function run_private_protected_method($object, $method, array $args = array()){
-		$r = new ReflectionClass(get_class($object));
-		$m = $r->getMethod($method);
-		$m->setAccessible(true);
-		return $m->invokeArgs($object, $args);
-	}
+    /**
+     * Function to test private & protected method
+     */
+    function run_private_protected_method($object, $method, array $args = array()){
+        $r = new ReflectionClass(get_class($object));
+        $m = $r->getMethod($method);
+        $m->setAccessible(true);
+        return $m->invokeArgs($object, $args);
+    }
     
     /**
-	* Function to return the correct database configuration
-	*/
+     * Function to return the correct database configuration
+     */
     function get_db_config(){
         return array(
                     'driver'    =>  'sqlite',

tests/tnhfw/classes/DBSessionHandlerTest.php

Indentation +199 added lines, -199 removed lines

@@ -1,222 +1,222 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class DBSessionHandlerTest extends TestCase
-	{	
+    class DBSessionHandlerTest extends TestCase
+    {	
 	
-		private $db = null;
+        private $db = null;
 		
-		private $model = null;
+        private $model = null;
 		
-		private $secret = 'bXlzZWNyZXQ';
+        private $secret = 'bXlzZWNyZXQ';
 		
-		private static $config = null;
+        private static $config = null;
 		
-		public function __construct(){
+        public function __construct(){
             $cfg = get_db_config();
-			$this->db = new Database($cfg);
+            $this->db = new Database($cfg);
             $qr = new DatabaseQueryRunner($this->db->getPdo());
             $qr->setBenchmark(new Benchmark());
             $qr->setDriver('sqlite');
             $this->db->setQueryRunner($qr);
-		}
+        }
 		
-		public static function setUpBeforeClass()
-		{
-			require APPS_MODEL_PATH . 'DBSessionModel.php';
-			self::$config = new Config();
-			self::$config->init();
-		}
+        public static function setUpBeforeClass()
+        {
+            require APPS_MODEL_PATH . 'DBSessionModel.php';
+            self::$config = new Config();
+            self::$config->init();
+        }
 		
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-			$this->model = new DBSessionModel($this->db);
+        protected function setUp()
+        {
+            $this->model = new DBSessionModel($this->db);
             //to prevent old data conflict
-			$this->model->truncate();
-		}
+            $this->model->truncate();
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 
 		
 		
-		public function testUsingSessionConfiguration(){
-			//using value in the configuration
-			self::$config->set('session_save_path', 'DBSessionModel');
-			self::$config->set('session_secret', $this->secret);
-			$dbsh = new DBSessionHandler();
-			//assign Database instance manually
-			$o = &get_instance();
-			$o->database = $this->db;
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->close());
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//do update of existing data
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-			$this->assertTrue($dbsh->destroy('foo'));
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->gc(13));
-			$encoded = $dbsh->encode('foo');
-			$this->assertNotEmpty($encoded);
-			$this->assertEquals($dbsh->decode($encoded), 'foo');
-		}
-		
-		public function testWhenDataIsExpired(){
-			$dbsh = new DBSessionHandler($this->model);
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//put it in expired
-			$this->model->update('foo', array('s_time' => 1234567));
-			$this->assertNull($dbsh->read('foo'));
-		}
-		
-		public function testWhenDataAlreadyExistDoUpdate(){
-			$dbsh = new DBSessionHandler($this->model);
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//do update of existing data
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-		}
-		
-		public function testUsingCustomModelInstance(){
-			$dbsh = new DBSessionHandler($this->model);
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->close());
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//put it in expired
-			$this->model->update('foo', array('s_time' => 1234567));
-			
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			
-			//do update of existing data
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-			$this->assertTrue($dbsh->destroy('foo'));
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->gc(13));
-			$encoded = $dbsh->encode('foo');
-			$this->assertNotEmpty($encoded);
-			$this->assertEquals($dbsh->decode($encoded), 'foo');
-		}
-			
-			
-		public function testUsingCustomLogInstance(){
-			$dbsh = new DBSessionHandler($this->model, new Log());
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->close());
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//put it in expired
-			$this->model->update('foo', array('s_time' => 1234567));
-			
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			
-			//do update of existing data
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-			$this->assertTrue($dbsh->destroy('foo'));
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->gc(13));
-			$encoded = $dbsh->encode('foo');
-			$this->assertNotEmpty($encoded);
-			$this->assertEquals($dbsh->decode($encoded), 'foo');
-		}
-		
-		public function testUsingCustomLoaderInstance(){
-			$dbsh = new DBSessionHandler($this->model, null, new Loader());
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->close());
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//put it in expired
-			$this->model->update('foo', array('s_time' => 1234567));
-			
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			
-			//do update of existing data
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-			$this->assertTrue($dbsh->destroy('foo'));
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->gc(13));
-			$encoded = $dbsh->encode('foo');
-			$this->assertNotEmpty($encoded);
-			$this->assertEquals($dbsh->decode($encoded), 'foo');
-		}
-		
-		
-		public function testWhenModelInsanceIsNotSet(){
-			$dbsh = new DBSessionHandler(null, null, new Loader());
-			$dbsh->setSessionSecret($this->secret);
-			
-			$this->assertTrue($dbsh->open(null, null));
-			$this->assertTrue($dbsh->close());
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			$this->assertNotEmpty($dbsh->read('foo'));
-			$this->assertEquals($dbsh->read('foo'), '444');
-			//put it in expired
-			$this->model->update('foo', array('s_time' => 1234567));
-			
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->write('foo', '444'));
-			
-			//do update of existing data
-			$this->assertTrue($dbsh->write('tnh', '445'));
-			$this->assertTrue($dbsh->write('foo', '445'));
-			$this->assertEquals($dbsh->read('foo'), '445');	
-			$this->assertTrue($dbsh->destroy('foo'));
-			$this->assertNull($dbsh->read('foo'));
-			$this->assertTrue($dbsh->gc(13));
-			$encoded = $dbsh->encode('foo');
-			$this->assertNotEmpty($encoded);
-			$this->assertEquals($dbsh->decode($encoded), 'foo');
-		}
-		
-		public function testWhenModelTableColumnsIsNotSet(){
-			//session table is empty
-			$this->model->setSessionTableColumns(array());
-			$dbsh = new DBSessionHandler($this->model);
-			$this->assertTrue($dbsh->open(null, null));
-		}
-		
-		
-	}
\ No newline at end of file
+        public function testUsingSessionConfiguration(){
+            //using value in the configuration
+            self::$config->set('session_save_path', 'DBSessionModel');
+            self::$config->set('session_secret', $this->secret);
+            $dbsh = new DBSessionHandler();
+            //assign Database instance manually
+            $o = &get_instance();
+            $o->database = $this->db;
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->close());
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //do update of existing data
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+            $this->assertTrue($dbsh->destroy('foo'));
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->gc(13));
+            $encoded = $dbsh->encode('foo');
+            $this->assertNotEmpty($encoded);
+            $this->assertEquals($dbsh->decode($encoded), 'foo');
+        }
+		
+        public function testWhenDataIsExpired(){
+            $dbsh = new DBSessionHandler($this->model);
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //put it in expired
+            $this->model->update('foo', array('s_time' => 1234567));
+            $this->assertNull($dbsh->read('foo'));
+        }
+		
+        public function testWhenDataAlreadyExistDoUpdate(){
+            $dbsh = new DBSessionHandler($this->model);
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //do update of existing data
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+        }
+		
+        public function testUsingCustomModelInstance(){
+            $dbsh = new DBSessionHandler($this->model);
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->close());
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //put it in expired
+            $this->model->update('foo', array('s_time' => 1234567));
+			
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+			
+            //do update of existing data
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+            $this->assertTrue($dbsh->destroy('foo'));
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->gc(13));
+            $encoded = $dbsh->encode('foo');
+            $this->assertNotEmpty($encoded);
+            $this->assertEquals($dbsh->decode($encoded), 'foo');
+        }
+			
+			
+        public function testUsingCustomLogInstance(){
+            $dbsh = new DBSessionHandler($this->model, new Log());
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->close());
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //put it in expired
+            $this->model->update('foo', array('s_time' => 1234567));
+			
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+			
+            //do update of existing data
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+            $this->assertTrue($dbsh->destroy('foo'));
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->gc(13));
+            $encoded = $dbsh->encode('foo');
+            $this->assertNotEmpty($encoded);
+            $this->assertEquals($dbsh->decode($encoded), 'foo');
+        }
+		
+        public function testUsingCustomLoaderInstance(){
+            $dbsh = new DBSessionHandler($this->model, null, new Loader());
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->close());
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //put it in expired
+            $this->model->update('foo', array('s_time' => 1234567));
+			
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+			
+            //do update of existing data
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+            $this->assertTrue($dbsh->destroy('foo'));
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->gc(13));
+            $encoded = $dbsh->encode('foo');
+            $this->assertNotEmpty($encoded);
+            $this->assertEquals($dbsh->decode($encoded), 'foo');
+        }
+		
+		
+        public function testWhenModelInsanceIsNotSet(){
+            $dbsh = new DBSessionHandler(null, null, new Loader());
+            $dbsh->setSessionSecret($this->secret);
+			
+            $this->assertTrue($dbsh->open(null, null));
+            $this->assertTrue($dbsh->close());
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+            $this->assertNotEmpty($dbsh->read('foo'));
+            $this->assertEquals($dbsh->read('foo'), '444');
+            //put it in expired
+            $this->model->update('foo', array('s_time' => 1234567));
+			
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->write('foo', '444'));
+			
+            //do update of existing data
+            $this->assertTrue($dbsh->write('tnh', '445'));
+            $this->assertTrue($dbsh->write('foo', '445'));
+            $this->assertEquals($dbsh->read('foo'), '445');	
+            $this->assertTrue($dbsh->destroy('foo'));
+            $this->assertNull($dbsh->read('foo'));
+            $this->assertTrue($dbsh->gc(13));
+            $encoded = $dbsh->encode('foo');
+            $this->assertNotEmpty($encoded);
+            $this->assertEquals($dbsh->decode($encoded), 'foo');
+        }
+		
+        public function testWhenModelTableColumnsIsNotSet(){
+            //session table is empty
+            $this->model->setSessionTableColumns(array());
+            $dbsh = new DBSessionHandler($this->model);
+            $this->assertTrue($dbsh->open(null, null));
+        }
+		
+		
+    }
\ No newline at end of file

core/classes/Config.php

Indentation +175 added lines, -175 removed lines

@@ -1,190 +1,190 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Config{
+    class Config{
 		
-		/**
-		 * The list of loaded configuration
-		 * @var array
-		 */
-		private static $config = array();
+        /**
+         * The list of loaded configuration
+         * @var array
+         */
+        private static $config = array();
 
-		/**
-		 * The logger instance
-		 * @var object
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var object
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
-				$logger[0]->setLogger('Library::Config');
-				self::$logger = $logger[0];
-			}
-			return self::$logger;			
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                $logger = array();
+                $logger[0] =& class_loader('Log', 'classes');
+                $logger[0]->setLogger('Library::Config');
+                self::$logger = $logger[0];
+            }
+            return self::$logger;			
+        }
 
-		/**
-		 * Set the log instance for future use
-		 * @param object $logger the log object
-		 * @return object the log instance
-		 */
-		public static function setLogger($logger){
-			self::$logger = $logger;
-			return self::$logger;
-		}
+        /**
+         * Set the log instance for future use
+         * @param object $logger the log object
+         * @return object the log instance
+         */
+        public static function setLogger($logger){
+            self::$logger = $logger;
+            return self::$logger;
+        }
 
-		/**
-		 * Initialize the configuration by loading all the configuration from config file
-		 */
-		public static function init(){
-			$logger = static::getLogger();
-			$logger->debug('Initialization of the configuration');
-			self::$config = & load_configurations();
-			self::setBaseUrlUsingServerVar();
-			if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
-				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
-			}
-			$logger->info('Configuration initialized successfully');
-			$logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
-		}
+        /**
+         * Initialize the configuration by loading all the configuration from config file
+         */
+        public static function init(){
+            $logger = static::getLogger();
+            $logger->debug('Initialization of the configuration');
+            self::$config = & load_configurations();
+            self::setBaseUrlUsingServerVar();
+            if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
+                $logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
+            }
+            $logger->info('Configuration initialized successfully');
+            $logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
+        }
 
-		/**
-		 * Get the configuration item value
-		 * @param  string $item    the configuration item name to get
-		 * @param  mixed $default the default value to use if can not find the config item in the list
-		 * @return mixed          the config value if exist or the default value
-		 */
-		public static function get($item, $default = null){
-			$logger = static::getLogger();
-			if(array_key_exists($item, self::$config)){
-				return self::$config[$item];
-			}
-			$logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
-			return $default;
-		}
+        /**
+         * Get the configuration item value
+         * @param  string $item    the configuration item name to get
+         * @param  mixed $default the default value to use if can not find the config item in the list
+         * @return mixed          the config value if exist or the default value
+         */
+        public static function get($item, $default = null){
+            $logger = static::getLogger();
+            if(array_key_exists($item, self::$config)){
+                return self::$config[$item];
+            }
+            $logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
+            return $default;
+        }
 
-		/**
-		 * Set the configuration item value
-		 * @param string $item  the config item name to set
-		 * @param mixed $value the config item value
-		 */
-		public static function set($item, $value){
-			self::$config[$item] = $value;
-		}
+        /**
+         * Set the configuration item value
+         * @param string $item  the config item name to set
+         * @param mixed $value the config item value
+         */
+        public static function set($item, $value){
+            self::$config[$item] = $value;
+        }
 
-		/**
-		 * Get all the configuration values
-		 * @return array the config values
-		 */
-		public static function getAll(){
-			return self::$config;
-		}
+        /**
+         * Get all the configuration values
+         * @return array the config values
+         */
+        public static function getAll(){
+            return self::$config;
+        }
 
-		/**
-		 * Set the configuration values bu merged with the existing configuration
-		 * @param array $config the config values to add in the configuration list
-		 */
-		public static function setAll(array $config = array()){
-			self::$config = array_merge(self::$config, $config);
-		}
+        /**
+         * Set the configuration values bu merged with the existing configuration
+         * @param array $config the config values to add in the configuration list
+         */
+        public static function setAll(array $config = array()){
+            self::$config = array_merge(self::$config, $config);
+        }
 
-		/**
-		 * Delete the configuration item in the list
-		 * @param  string $item the config item name to be deleted
-		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
-		 */
-		public static function delete($item){
-			$logger = static::getLogger();
-			if(array_key_exists($item, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
-				unset(self::$config[$item]);
-				return true;
-			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
-				return false;
-			}
-		}
+        /**
+         * Delete the configuration item in the list
+         * @param  string $item the config item name to be deleted
+         * @return boolean true if the item exists and is deleted successfully otherwise will return false.
+         */
+        public static function delete($item){
+            $logger = static::getLogger();
+            if(array_key_exists($item, self::$config)){
+                $logger->info('Delete config item ['.$item.']');
+                unset(self::$config[$item]);
+                return true;
+            }
+            else{
+                $logger->warning('Config item ['.$item.'] to be deleted does not exists');
+                return false;
+            }
+        }
 
-		/**
-		 * Load the configuration file. This an alias to Loader::config()
-		 * @param  string $config the config name to be loaded
-		 */
-		public static function load($config){
-			Loader::config($config);
-		}
+        /**
+         * Load the configuration file. This an alias to Loader::config()
+         * @param  string $config the config name to be loaded
+         */
+        public static function load($config){
+            Loader::config($config);
+        }
 
-		/**
-		 * Set the configuration for "base_url" if is not set in the configuration
-		 */
-		private static function setBaseUrlUsingServerVar(){
-			$logger = static::getLogger();
-			if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
-					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
-				}
-				$baseUrl = null;
-				$protocol = 'http';
-				if(is_https()){
-					$protocol = 'https';
-				}
-				$protocol .='://';
+        /**
+         * Set the configuration for "base_url" if is not set in the configuration
+         */
+        private static function setBaseUrlUsingServerVar(){
+            $logger = static::getLogger();
+            if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
+                if(ENVIRONMENT == 'production'){
+                    $logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
+                }
+                $baseUrl = null;
+                $protocol = 'http';
+                if(is_https()){
+                    $protocol = 'https';
+                }
+                $protocol .='://';
 
-				if (isset($_SERVER['SERVER_ADDR'])){
-					$baseUrl = $_SERVER['SERVER_ADDR'];
-					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
-					}
-					$serverPort = 80;
-					if (isset($_SERVER['SERVER_PORT'])) {
-						$serverPort = $_SERVER['SERVER_PORT'];
-					}
-					$port = '';
-					if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
-						$port = ':'.$serverPort;
-					}
-					$baseUrl = $protocol . $baseUrl . $port . substr(
-																		$_SERVER['SCRIPT_NAME'], 
-																		0, 
-																		strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
-																	);
-				}
-				else{
-					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
-					$baseUrl = 'http://localhost/';
-				}
-				self::set('base_url', $baseUrl);
-			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
-		}
-	}
+                if (isset($_SERVER['SERVER_ADDR'])){
+                    $baseUrl = $_SERVER['SERVER_ADDR'];
+                    //check if the server is running under IPv6
+                    if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
+                        $baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+                    }
+                    $serverPort = 80;
+                    if (isset($_SERVER['SERVER_PORT'])) {
+                        $serverPort = $_SERVER['SERVER_PORT'];
+                    }
+                    $port = '';
+                    if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
+                        $port = ':'.$serverPort;
+                    }
+                    $baseUrl = $protocol . $baseUrl . $port . substr(
+                                                                        $_SERVER['SCRIPT_NAME'], 
+                                                                        0, 
+                                                                        strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
+                                                                    );
+                }
+                else{
+                    $logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
+                    $baseUrl = 'http://localhost/';
+                }
+                self::set('base_url', $baseUrl);
+            }
+            self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+        }
+    }

core/classes/Loader.php

Indentation +622 added lines, -622 removed lines

@@ -1,660 +1,660 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
-	class Loader{
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
+    class Loader{
 		
-		/**
-		 * List of loaded resources
-		 * @var array
-		 */
-		public static $loaded = array();
+        /**
+         * List of loaded resources
+         * @var array
+         */
+        public static $loaded = array();
 		
-		/**
-		 * The logger instance
-		 * @var object
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var object
+         */
+        private static $logger;
 
 
-		public function __construct(){
-			//add the resources already loaded during application bootstrap
-			//in the list to prevent duplicate or loading the resources again.
-			static::$loaded = class_loaded();
+        public function __construct(){
+            //add the resources already loaded during application bootstrap
+            //in the list to prevent duplicate or loading the resources again.
+            static::$loaded = class_loaded();
 			
-			//Load resources from autoload configuration
-			$this->loadResourcesFromAutoloadConfig();
-		}
+            //Load resources from autoload configuration
+            $this->loadResourcesFromAutoloadConfig();
+        }
 
-		/**
-		 * The signleton of the logger
-		 * @return object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
-				$logger[0]->setLogger('Library::Loader');
-				self::$logger = $logger[0];
-			}
-			return self::$logger;			
-		}
+        /**
+         * The signleton of the logger
+         * @return object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                $logger = array();
+                $logger[0] =& class_loader('Log', 'classes');
+                $logger[0]->setLogger('Library::Loader');
+                self::$logger = $logger[0];
+            }
+            return self::$logger;			
+        }
 
-		/**
-		 * Set the log instance for future use
-		 * @param object $logger the log object
-		 * @return object the log instance
-		 */
-		public static function setLogger($logger){
-			self::$logger = $logger;
-			return self::$logger;
-		}
+        /**
+         * Set the log instance for future use
+         * @param object $logger the log object
+         * @return object the log instance
+         */
+        public static function setLogger($logger){
+            self::$logger = $logger;
+            return self::$logger;
+        }
 
 		
-		/**
-		 * Load the model class
-		 *
-		 * @param  string $class    the class name to be loaded
-		 * @param  string $instance the name of the instance to use in super object
-		 *
-		 * @return void
-		 */
-		public static function model($class, $instance = null){
-			$logger = static::getLogger();
-			$class = str_ireplace('.php', '', $class);
-			$class = trim($class, '/\\');
-			$file = ucfirst($class).'.php';
-			$logger->debug('Loading model [' . $class . '] ...');
-			//************
-			if (! $instance){
-				$instance = self::getModelLibraryInstanceName($class);
-			}
-			//****************
-			if (isset(static::$loaded[$instance])){
-				$logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$classFilePath = APPS_MODEL_PATH . $file;
-			//first check if this model is in the module
-			$logger->debug('Checking model [' . $class . '] from module list ...');
-			//check if the request class contains module name
-			$moduleInfo = self::getModuleInfoForModelLibrary($class);
-			$module = $moduleInfo['module'];
-			$class  = $moduleInfo['class'];
+        /**
+         * Load the model class
+         *
+         * @param  string $class    the class name to be loaded
+         * @param  string $instance the name of the instance to use in super object
+         *
+         * @return void
+         */
+        public static function model($class, $instance = null){
+            $logger = static::getLogger();
+            $class = str_ireplace('.php', '', $class);
+            $class = trim($class, '/\\');
+            $file = ucfirst($class).'.php';
+            $logger->debug('Loading model [' . $class . '] ...');
+            //************
+            if (! $instance){
+                $instance = self::getModelLibraryInstanceName($class);
+            }
+            //****************
+            if (isset(static::$loaded[$instance])){
+                $logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $classFilePath = APPS_MODEL_PATH . $file;
+            //first check if this model is in the module
+            $logger->debug('Checking model [' . $class . '] from module list ...');
+            //check if the request class contains module name
+            $moduleInfo = self::getModuleInfoForModelLibrary($class);
+            $module = $moduleInfo['module'];
+            $class  = $moduleInfo['class'];
 			
-			$moduleModelFilePath = Module::findModelFullPath($class, $module);
-			if ($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
-				$classFilePath = $moduleModelFilePath;
-			}
-			else{
-				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
-			}
-			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
-			if (file_exists($classFilePath)){
-				require_once $classFilePath;
-				if (class_exists($class)){
-					$c = new $class();
-					$obj = & get_instance();
-					$obj->{$instance} = $c;
-					static::$loaded[$instance] = $class;
-					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				}
-				else{
-					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
-				}
-			}
-			else{
-				show_error('Unable to find the model [' . $class . ']');
-			}
-		}
+            $moduleModelFilePath = Module::findModelFullPath($class, $module);
+            if ($moduleModelFilePath){
+                $logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+                $classFilePath = $moduleModelFilePath;
+            }
+            else{
+                $logger->info('Cannot find model [' . $class . '] from modules using the default location');
+            }
+            $logger->info('The model file path to be loaded is [' . $classFilePath . ']');
+            if (file_exists($classFilePath)){
+                require_once $classFilePath;
+                if (class_exists($class)){
+                    $c = new $class();
+                    $obj = & get_instance();
+                    $obj->{$instance} = $c;
+                    static::$loaded[$instance] = $class;
+                    $logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
+                }
+                else{
+                    show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
+                }
+            }
+            else{
+                show_error('Unable to find the model [' . $class . ']');
+            }
+        }
 
 		
-		/**
-		 * Load the library class
-		 *
-		 * @param  string $class    the library class name to be loaded
-		 * @param  string $instance the instance name to use in super object
-		 * @param mixed $params the arguments to pass to the constructor
-		 *
-		 * @return void
-		 */
-		public static function library($class, $instance = null, array $params = array()){
-			$logger = static::getLogger();
-			$class = str_ireplace('.php', '', $class);
-			$class = trim($class, '/\\');
-			$file = ucfirst($class) .'.php';
-			$logger->debug('Loading library [' . $class . '] ...');
-			if (! $instance){
-				$instance = self::getModelLibraryInstanceName($class);
-			}
-			if (isset(static::$loaded[$instance])){
-				$logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$obj = & get_instance();
-			//Check and load Database library
-			if (strtolower($class) == 'database'){
-				$logger->info('This is the Database library ...');
-				$obj->{$instance} = & class_loader('Database', 'classes/database', $params);
-				static::$loaded[$instance] = $class;
-				$logger->info('Library Database loaded successfully.');
-				return;
-			}
-			$libraryFilePath = null;
-			$logger->debug('Check if this is a system library ...');
-			if (file_exists(CORE_LIBRARY_PATH . $file)){
-				$libraryFilePath = CORE_LIBRARY_PATH . $file;
-				$class = ucfirst($class);
-				$logger->info('This library is a system library');
-			}
-			else{
-				$logger->info('This library is not a system library');	
-				//first check if this library is in the module
-				$libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
-				//***************
-			}
-			if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
-				$libraryFilePath = LIBRARY_PATH . $file;
-			}
-			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
-			//*************************
-			self::loadLibrary($libraryFilePath, $class, $instance, $params);
-		}
+        /**
+         * Load the library class
+         *
+         * @param  string $class    the library class name to be loaded
+         * @param  string $instance the instance name to use in super object
+         * @param mixed $params the arguments to pass to the constructor
+         *
+         * @return void
+         */
+        public static function library($class, $instance = null, array $params = array()){
+            $logger = static::getLogger();
+            $class = str_ireplace('.php', '', $class);
+            $class = trim($class, '/\\');
+            $file = ucfirst($class) .'.php';
+            $logger->debug('Loading library [' . $class . '] ...');
+            if (! $instance){
+                $instance = self::getModelLibraryInstanceName($class);
+            }
+            if (isset(static::$loaded[$instance])){
+                $logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $obj = & get_instance();
+            //Check and load Database library
+            if (strtolower($class) == 'database'){
+                $logger->info('This is the Database library ...');
+                $obj->{$instance} = & class_loader('Database', 'classes/database', $params);
+                static::$loaded[$instance] = $class;
+                $logger->info('Library Database loaded successfully.');
+                return;
+            }
+            $libraryFilePath = null;
+            $logger->debug('Check if this is a system library ...');
+            if (file_exists(CORE_LIBRARY_PATH . $file)){
+                $libraryFilePath = CORE_LIBRARY_PATH . $file;
+                $class = ucfirst($class);
+                $logger->info('This library is a system library');
+            }
+            else{
+                $logger->info('This library is not a system library');	
+                //first check if this library is in the module
+                $libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
+                //***************
+            }
+            if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
+                $libraryFilePath = LIBRARY_PATH . $file;
+            }
+            $logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
+            //*************************
+            self::loadLibrary($libraryFilePath, $class, $instance, $params);
+        }
 
-		/**
-		 * Load the helper
-		 *
-		 * @param  string $function the helper name to be loaded
-		 *
-		 * @return void
-		 */
-		public static function functions($function){
-			$logger = static::getLogger();
-			$function = str_ireplace('.php', '', $function);
-			$function = trim($function, '/\\');
-			$function = str_ireplace('function_', '', $function);
-			$file = 'function_'.$function.'.php';
-			$logger->debug('Loading helper [' . $function . '] ...');
-			if (isset(static::$loaded['function_' . $function])){
-				$logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$functionFilePath = null;
-			//first check if this helper is in the module
-			$logger->debug('Checking helper [' . $function . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForFunction($function);
-			$module    = $moduleInfo['module'];
-			$function  = $moduleInfo['function'];
-			if(! empty($moduleInfo['file'])){
-				$file = $moduleInfo['file'];
-			}
-			$moduleFunctionPath = Module::findFunctionFullPath($function, $module);
-			if ($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
-				$functionFilePath = $moduleFunctionPath;
-			}
-			else{
-				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
-			}
-			if (! $functionFilePath){
-				$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-				foreach($searchDir as $dir){
-					$filePath = $dir . $file;
-					if (file_exists($filePath)){
-						$functionFilePath = $filePath;
-						//is already found not to continue
-						break;
-					}
-				}
-			}
-			$logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
-			if ($functionFilePath){
-				require_once $functionFilePath;
-				static::$loaded['function_' . $function] = $functionFilePath;
-				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
-			}
-			else{
-				show_error('Unable to find helper file [' . $file . ']');
-			}
-		}
+        /**
+         * Load the helper
+         *
+         * @param  string $function the helper name to be loaded
+         *
+         * @return void
+         */
+        public static function functions($function){
+            $logger = static::getLogger();
+            $function = str_ireplace('.php', '', $function);
+            $function = trim($function, '/\\');
+            $function = str_ireplace('function_', '', $function);
+            $file = 'function_'.$function.'.php';
+            $logger->debug('Loading helper [' . $function . '] ...');
+            if (isset(static::$loaded['function_' . $function])){
+                $logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $functionFilePath = null;
+            //first check if this helper is in the module
+            $logger->debug('Checking helper [' . $function . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForFunction($function);
+            $module    = $moduleInfo['module'];
+            $function  = $moduleInfo['function'];
+            if(! empty($moduleInfo['file'])){
+                $file = $moduleInfo['file'];
+            }
+            $moduleFunctionPath = Module::findFunctionFullPath($function, $module);
+            if ($moduleFunctionPath){
+                $logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+                $functionFilePath = $moduleFunctionPath;
+            }
+            else{
+                $logger->info('Cannot find helper [' . $function . '] from modules using the default location');
+            }
+            if (! $functionFilePath){
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
+                foreach($searchDir as $dir){
+                    $filePath = $dir . $file;
+                    if (file_exists($filePath)){
+                        $functionFilePath = $filePath;
+                        //is already found not to continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
+            if ($functionFilePath){
+                require_once $functionFilePath;
+                static::$loaded['function_' . $function] = $functionFilePath;
+                $logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
+            }
+            else{
+                show_error('Unable to find helper file [' . $file . ']');
+            }
+        }
 
-		/**
-		 * Load the configuration file
-		 *
-		 * @param  string $filename the configuration filename located at CONFIG_PATH or MODULE_PATH/config
-		 *
-		 * @return void
-		 */
-		public static function config($filename){
-			$logger = static::getLogger();
-			$filename = str_ireplace('.php', '', $filename);
-			$filename = trim($filename, '/\\');
-			$filename = str_ireplace('config_', '', $filename);
-			$file = 'config_'.$filename.'.php';
-			$logger->debug('Loading configuration [' . $filename . '] ...');
-			if (isset(static::$loaded['config_' . $filename])){
-				$logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$configFilePath = CONFIG_PATH . $file;
-			//first check if this config is in the module
-			$logger->debug('Checking config [' . $filename . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForConfig($filename);
-			$module    = $moduleInfo['module'];
-			$filename  = $moduleInfo['filename'];
-			$moduleConfigPath = Module::findConfigFullPath($filename, $module);
-			if ($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
-				$configFilePath = $moduleConfigPath;
-			}
-			else{
-				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
-			}
-			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
-			$config = array();
-			if (file_exists($configFilePath)){
-				require_once $configFilePath;
-				if (! empty($config) && is_array($config)){
-					Config::setAll($config);
-					static::$loaded['config_' . $filename] = $configFilePath;
-					$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
-					$logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
-					unset($config);
-				}
-			}
-			else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
-			}
-		}
+        /**
+         * Load the configuration file
+         *
+         * @param  string $filename the configuration filename located at CONFIG_PATH or MODULE_PATH/config
+         *
+         * @return void
+         */
+        public static function config($filename){
+            $logger = static::getLogger();
+            $filename = str_ireplace('.php', '', $filename);
+            $filename = trim($filename, '/\\');
+            $filename = str_ireplace('config_', '', $filename);
+            $file = 'config_'.$filename.'.php';
+            $logger->debug('Loading configuration [' . $filename . '] ...');
+            if (isset(static::$loaded['config_' . $filename])){
+                $logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $configFilePath = CONFIG_PATH . $file;
+            //first check if this config is in the module
+            $logger->debug('Checking config [' . $filename . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForConfig($filename);
+            $module    = $moduleInfo['module'];
+            $filename  = $moduleInfo['filename'];
+            $moduleConfigPath = Module::findConfigFullPath($filename, $module);
+            if ($moduleConfigPath){
+                $logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
+                $configFilePath = $moduleConfigPath;
+            }
+            else{
+                $logger->info('Cannot find config [' . $filename . '] from modules using the default location');
+            }
+            $logger->info('The config file path to be loaded is [' . $configFilePath . ']');
+            $config = array();
+            if (file_exists($configFilePath)){
+                require_once $configFilePath;
+                if (! empty($config) && is_array($config)){
+                    Config::setAll($config);
+                    static::$loaded['config_' . $filename] = $configFilePath;
+                    $logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
+                    $logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
+                    unset($config);
+                }
+            }
+            else{
+                show_error('Unable to find config file ['. $configFilePath . ']');
+            }
+        }
 
 
-		/**
-		 * Load the language
-		 *
-		 * @param  string $language the language name to be loaded
-		 *
-		 * @return void
-		 */
-		public static function lang($language){
-			$logger = static::getLogger();
-			$language = str_ireplace('.php', '', $language);
-			$language = trim($language, '/\\');
-			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Loading language [' . $language . '] ...');
-			if (isset(static::$loaded['lang_' . $language])){
-				$logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			//get the current language
-			$appLang = self::getAppLang();
-			$languageFilePath = null;
-			//first check if this language is in the module
-			$logger->debug('Checking language [' . $language . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForLanguage($language);
-			$module    = $moduleInfo['module'];
-			$language  = $moduleInfo['language'];
-			if(! empty($moduleInfo['file'])){
-				$file = $moduleInfo['file'];
-			}
-			$moduleLanguagePath = Module::findLanguageFullPath($language, $module, $appLang);
-			if ($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
-				$languageFilePath = $moduleLanguagePath;
-			}
-			else{
-				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
-			}
-			if (! $languageFilePath){
-				$searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
-				foreach($searchDir as $dir){
-					$filePath = $dir . $appLang . DS . $file;
-					if (file_exists($filePath)){
-						$languageFilePath = $filePath;
-						//already found no need continue
-						break;
-					}
-				}
-			}
-			$logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
-			self::loadLanguage($languageFilePath, $language);
-		}
+        /**
+         * Load the language
+         *
+         * @param  string $language the language name to be loaded
+         *
+         * @return void
+         */
+        public static function lang($language){
+            $logger = static::getLogger();
+            $language = str_ireplace('.php', '', $language);
+            $language = trim($language, '/\\');
+            $language = str_ireplace('lang_', '', $language);
+            $file = 'lang_'.$language.'.php';
+            $logger->debug('Loading language [' . $language . '] ...');
+            if (isset(static::$loaded['lang_' . $language])){
+                $logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            //get the current language
+            $appLang = self::getAppLang();
+            $languageFilePath = null;
+            //first check if this language is in the module
+            $logger->debug('Checking language [' . $language . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForLanguage($language);
+            $module    = $moduleInfo['module'];
+            $language  = $moduleInfo['language'];
+            if(! empty($moduleInfo['file'])){
+                $file = $moduleInfo['file'];
+            }
+            $moduleLanguagePath = Module::findLanguageFullPath($language, $module, $appLang);
+            if ($moduleLanguagePath){
+                $logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+                $languageFilePath = $moduleLanguagePath;
+            }
+            else{
+                $logger->info('Cannot find language [' . $language . '] from modules using the default location');
+            }
+            if (! $languageFilePath){
+                $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
+                foreach($searchDir as $dir){
+                    $filePath = $dir . $appLang . DS . $file;
+                    if (file_exists($filePath)){
+                        $languageFilePath = $filePath;
+                        //already found no need continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
+            self::loadLanguage($languageFilePath, $language);
+        }
 
-		/**
-		 * Return the current app language by default will use the value from cookie 
-		 * if can not found will use the default value from configuration
-		 * @return string the app language like "en", "fr"
-		 */
-		protected static function getAppLang(){
-			//determine the current language
-			$appLang = get_config('default_language');
-			//if the language exists in the cookie use it
-			$cfgKey = get_config('language_cookie_name');
-			$objCookie = & class_loader('Cookie');
-			$cookieLang = $objCookie->get($cfgKey);
-			if ($cookieLang){
-				$appLang = $cookieLang;
-			}
-			return $appLang;
-		}
-		/**
-		 * Get the module information for the model and library to load
-		 * @param  string $class the full class name like moduleName/className, className,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'class' => 'class_name'
-		 * )
-		 */
-		protected static function getModuleInfoForModelLibrary($class){
-			$module = null;
-			$obj = & get_instance();
-			if (strpos($class, '/') !== false){
-				$path = explode('/', $class);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$module = $path[0];
-					$class = ucfirst($path[1]);
-				}
-			}
-			else{
-				$class = ucfirst($class);
-			}
-			if (! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'class' => $class,
-						'module' => $module
-					);
-		}
+        /**
+         * Return the current app language by default will use the value from cookie 
+         * if can not found will use the default value from configuration
+         * @return string the app language like "en", "fr"
+         */
+        protected static function getAppLang(){
+            //determine the current language
+            $appLang = get_config('default_language');
+            //if the language exists in the cookie use it
+            $cfgKey = get_config('language_cookie_name');
+            $objCookie = & class_loader('Cookie');
+            $cookieLang = $objCookie->get($cfgKey);
+            if ($cookieLang){
+                $appLang = $cookieLang;
+            }
+            return $appLang;
+        }
+        /**
+         * Get the module information for the model and library to load
+         * @param  string $class the full class name like moduleName/className, className,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'class' => 'class_name'
+         * )
+         */
+        protected static function getModuleInfoForModelLibrary($class){
+            $module = null;
+            $obj = & get_instance();
+            if (strpos($class, '/') !== false){
+                $path = explode('/', $class);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $module = $path[0];
+                    $class = ucfirst($path[1]);
+                }
+            }
+            else{
+                $class = ucfirst($class);
+            }
+            if (! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'class' => $class,
+                        'module' => $module
+                    );
+        }
 
-		/**
-		 * Get the module information for the function to load
-		 * @param  string $function the function name like moduleName/functionName, functionName,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'function' => 'function'
-		 * 	'file' => 'file'
-		 * )
-		 */
-		protected static function getModuleInfoForFunction($function){
-			$module = null;
-			$file = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($function, '/') !== false){
-				$path = explode('/', $function);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$module = $path[0];
-					$function = 'function_' . $path[1];
-					$file = $path[0] . DS . $function.'.php';
-				}
-			}
-			if (! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'function' => $function,
-						'module' => $module,
-						'file' => $file
-					);
-		}
+        /**
+         * Get the module information for the function to load
+         * @param  string $function the function name like moduleName/functionName, functionName,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'function' => 'function'
+         * 	'file' => 'file'
+         * )
+         */
+        protected static function getModuleInfoForFunction($function){
+            $module = null;
+            $file = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($function, '/') !== false){
+                $path = explode('/', $function);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $module = $path[0];
+                    $function = 'function_' . $path[1];
+                    $file = $path[0] . DS . $function.'.php';
+                }
+            }
+            if (! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'function' => $function,
+                        'module' => $module,
+                        'file' => $file
+                    );
+        }
 
-		/**
-		 * Get the module information for the language to load
-		 * @param  string $language the language name like moduleName/languageName, languageName,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'language' => 'language'
-		 * 	'file' => 'file'
-		 * )
-		 */
-		protected static function getModuleInfoForLanguage($language){
-			$module = null;
-			$file = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($language, '/') !== false){
-				$path = explode('/', $language);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$module = $path[0];
-					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS .$language;
-				}
-			}
-			if (! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'language' => $language,
-						'module' => $module,
-						'file' => $file
-					);
-		}
+        /**
+         * Get the module information for the language to load
+         * @param  string $language the language name like moduleName/languageName, languageName,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'language' => 'language'
+         * 	'file' => 'file'
+         * )
+         */
+        protected static function getModuleInfoForLanguage($language){
+            $module = null;
+            $file = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($language, '/') !== false){
+                $path = explode('/', $language);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $module = $path[0];
+                    $language = 'lang_' . $path[1] . '.php';
+                    $file = $path[0] . DS .$language;
+                }
+            }
+            if (! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'language' => $language,
+                        'module' => $module,
+                        'file' => $file
+                    );
+        }
 
 
-		/**
-		 * Get the module information for the config to load
-		 * @param  string $filename the filename of the configuration file,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'filename' => 'filename'
-		 * )
-		 */
-		protected static function getModuleInfoForConfig($filename){
-			$module = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($filename, '/') !== false){
-				$path = explode('/', $filename);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$module = $path[0];
-					$filename = $path[1] . '.php';
-				}
-			}
-			if (! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'filename' => $filename,
-						'module' => $module
-					);
-		}
+        /**
+         * Get the module information for the config to load
+         * @param  string $filename the filename of the configuration file,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'filename' => 'filename'
+         * )
+         */
+        protected static function getModuleInfoForConfig($filename){
+            $module = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($filename, '/') !== false){
+                $path = explode('/', $filename);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $module = $path[0];
+                    $filename = $path[1] . '.php';
+                }
+            }
+            if (! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'filename' => $filename,
+                        'module' => $module
+                    );
+        }
 
-		/**
-		 * Get the name of model or library instance if is null
-		 * @param  string $class the class name to determine the instance
-		 * @return string        the instance name
-		 */
-		protected static function getModelLibraryInstanceName($class){
-			//for module
-			$instance = null;
-			if (strpos($class, '/') !== false){
-				$path = explode('/', $class);
-				if (isset($path[1])){
-					$instance = strtolower($path[1]);
-				}
-			}
-			else{
-				$instance = strtolower($class);
-			}
-			return $instance;
-		}
+        /**
+         * Get the name of model or library instance if is null
+         * @param  string $class the class name to determine the instance
+         * @return string        the instance name
+         */
+        protected static function getModelLibraryInstanceName($class){
+            //for module
+            $instance = null;
+            if (strpos($class, '/') !== false){
+                $path = explode('/', $class);
+                if (isset($path[1])){
+                    $instance = strtolower($path[1]);
+                }
+            }
+            else{
+                $instance = strtolower($class);
+            }
+            return $instance;
+        }
 
-		/**
-		 * Get the library file path using the module information
-		 * @param  string $class the class name
-		 * @return string|null        the library file path otherwise null will be returned
-		 */
-		protected static function getLibraryPathUsingModuleInfo($class){
-			$logger = static::getLogger();
-			$libraryFilePath = null;
-			$logger->debug('Checking library [' . $class . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForModelLibrary($class);
-			$module = $moduleInfo['module'];
-			$class  = $moduleInfo['class'];
-			$moduleLibraryPath = Module::findLibraryFullPath($class, $module);
-			if ($moduleLibraryPath){
-				$logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
-				$libraryFilePath = $moduleLibraryPath;
-			}
-			else{
-				$logger->info('Cannot find library [' . $class . '] from modules using the default location');
-			}
-			return $libraryFilePath;
-		}
+        /**
+         * Get the library file path using the module information
+         * @param  string $class the class name
+         * @return string|null        the library file path otherwise null will be returned
+         */
+        protected static function getLibraryPathUsingModuleInfo($class){
+            $logger = static::getLogger();
+            $libraryFilePath = null;
+            $logger->debug('Checking library [' . $class . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForModelLibrary($class);
+            $module = $moduleInfo['module'];
+            $class  = $moduleInfo['class'];
+            $moduleLibraryPath = Module::findLibraryFullPath($class, $module);
+            if ($moduleLibraryPath){
+                $logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+                $libraryFilePath = $moduleLibraryPath;
+            }
+            else{
+                $logger->info('Cannot find library [' . $class . '] from modules using the default location');
+            }
+            return $libraryFilePath;
+        }
 
-		/**
-		 * Load the library 
-		 * @param  string $libraryFilePath the file path of the library to load
-		 * @param  string $class           the class name
-		 * @param  string $instance        the instance
-		 * @param  array  $params          the parameter to use
-		 * @return void
-		 */
-		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
-			if ($libraryFilePath){
-				$logger = static::getLogger();
-				require_once $libraryFilePath;
-				if (class_exists($class)){
-					$c = $params ? new $class($params) : new $class();
-					$obj = & get_instance();
-					$obj->{$instance} = $c;
-					static::$loaded[$instance] = $class;
-					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				}
-				else{
-					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
-				}
-			}
-			else{
-				show_error('Unable to find library class [' . $class . ']');
-			}
-		}
+        /**
+         * Load the library 
+         * @param  string $libraryFilePath the file path of the library to load
+         * @param  string $class           the class name
+         * @param  string $instance        the instance
+         * @param  array  $params          the parameter to use
+         * @return void
+         */
+        protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
+            if ($libraryFilePath){
+                $logger = static::getLogger();
+                require_once $libraryFilePath;
+                if (class_exists($class)){
+                    $c = $params ? new $class($params) : new $class();
+                    $obj = & get_instance();
+                    $obj->{$instance} = $c;
+                    static::$loaded[$instance] = $class;
+                    $logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
+                }
+                else{
+                    show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
+                }
+            }
+            else{
+                show_error('Unable to find library class [' . $class . ']');
+            }
+        }
 
-		/**
-		 * Load the language 
-		 * @param  string $languageFilePath the file path of the language to load
-		 * @param  string $language           the language name
-		 * @return void
-		 */
-		protected static function loadLanguage($languageFilePath, $language){
-			if ($languageFilePath){
-				$logger = static::getLogger();
-				$lang = array();
-				require_once $languageFilePath;
-				if (! empty($lang) && is_array($lang)){
-					$logger->info('Language file  [' .$languageFilePath. '] contains the valid languages keys add them to language list');
-					//Note: may be here the class 'Lang' not yet loaded
-					$langObj =& class_loader('Lang', 'classes');
-					$langObj->addLangMessages($lang);
-					//free the memory
-					unset($lang);
-				}
-				static::$loaded['lang_' . $language] = $languageFilePath;
-				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			}
-			else{
-				show_error('Unable to find language [' . $language . ']');
-			}
-		}
+        /**
+         * Load the language 
+         * @param  string $languageFilePath the file path of the language to load
+         * @param  string $language           the language name
+         * @return void
+         */
+        protected static function loadLanguage($languageFilePath, $language){
+            if ($languageFilePath){
+                $logger = static::getLogger();
+                $lang = array();
+                require_once $languageFilePath;
+                if (! empty($lang) && is_array($lang)){
+                    $logger->info('Language file  [' .$languageFilePath. '] contains the valid languages keys add them to language list');
+                    //Note: may be here the class 'Lang' not yet loaded
+                    $langObj =& class_loader('Lang', 'classes');
+                    $langObj->addLangMessages($lang);
+                    //free the memory
+                    unset($lang);
+                }
+                static::$loaded['lang_' . $language] = $languageFilePath;
+                $logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
+            }
+            else{
+                show_error('Unable to find language [' . $language . ']');
+            }
+        }
 
 
 
 
-		/**
-		 * Get all the autoload using the configuration file
-		 * @return array
-		 */
-		private function getResourcesFromAutoloadConfig(){
-			$autoloads = array();
-			$autoloads['config']    = array();
-			$autoloads['languages'] = array();
-			$autoloads['libraries'] = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			//loading of the resources from autoload configuration file
-			if (file_exists(CONFIG_PATH . 'autoload.php')){
-				$autoload = array();
-				require_once CONFIG_PATH . 'autoload.php';
-				if (! empty($autoload) && is_array($autoload)){
-					$autoloads = array_merge($autoloads, $autoload);
-					unset($autoload);
-				}
-			}
-			//loading autoload configuration for modules
-			$modulesAutoloads = Module::getModulesAutoloadConfig();
-			if (! empty($modulesAutoloads) && is_array($modulesAutoloads)){
-				$autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
-			}
-			return $autoloads;
-		}
+        /**
+         * Get all the autoload using the configuration file
+         * @return array
+         */
+        private function getResourcesFromAutoloadConfig(){
+            $autoloads = array();
+            $autoloads['config']    = array();
+            $autoloads['languages'] = array();
+            $autoloads['libraries'] = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            //loading of the resources from autoload configuration file
+            if (file_exists(CONFIG_PATH . 'autoload.php')){
+                $autoload = array();
+                require_once CONFIG_PATH . 'autoload.php';
+                if (! empty($autoload) && is_array($autoload)){
+                    $autoloads = array_merge($autoloads, $autoload);
+                    unset($autoload);
+                }
+            }
+            //loading autoload configuration for modules
+            $modulesAutoloads = Module::getModulesAutoloadConfig();
+            if (! empty($modulesAutoloads) && is_array($modulesAutoloads)){
+                $autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
+            }
+            return $autoloads;
+        }
 
-		/**
-		 * Load the autoload configuration
-		 * @return void
-		 */
-		private function loadResourcesFromAutoloadConfig(){
-			$autoloads = array();
-			$autoloads['config']    = array();
-			$autoloads['languages'] = array();
-			$autoloads['libraries'] = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
+        /**
+         * Load the autoload configuration
+         * @return void
+         */
+        private function loadResourcesFromAutoloadConfig(){
+            $autoloads = array();
+            $autoloads['config']    = array();
+            $autoloads['languages'] = array();
+            $autoloads['libraries'] = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
 
-			$list = $this->getResourcesFromAutoloadConfig();
-			$autoloads = array_merge($autoloads, $list);
+            $list = $this->getResourcesFromAutoloadConfig();
+            $autoloads = array_merge($autoloads, $list);
 			
-			//config autoload
-			$this->loadAutoloadResourcesArray('config', $autoloads['config']);
+            //config autoload
+            $this->loadAutoloadResourcesArray('config', $autoloads['config']);
 			
-			//languages autoload
-			$this->loadAutoloadResourcesArray('lang', $autoloads['languages']);
+            //languages autoload
+            $this->loadAutoloadResourcesArray('lang', $autoloads['languages']);
 			
-			//libraries autoload
-			$this->loadAutoloadResourcesArray('library', $autoloads['libraries']);
+            //libraries autoload
+            $this->loadAutoloadResourcesArray('library', $autoloads['libraries']);
 
-			//models autoload
-			$this->loadAutoloadResourcesArray('model', $autoloads['models']);
+            //models autoload
+            $this->loadAutoloadResourcesArray('model', $autoloads['models']);
 			
-			//functions autoload
-			$this->loadAutoloadResourcesArray('functions', $autoloads['functions']);
-		}
+            //functions autoload
+            $this->loadAutoloadResourcesArray('functions', $autoloads['functions']);
+        }
 
-		/**
-		 * Load the resources autoload array
-		 * @param  string $method    this object method name to call
-		 * @param  array  $resources the resource to load
-		 * @return void            
-		 */
-		private function loadAutoloadResourcesArray($method, array $resources){
-			foreach ($resources as $name) {
-				$this->{$method}($name);
-			}
-		}
-	}
+        /**
+         * Load the resources autoload array
+         * @param  string $method    this object method name to call
+         * @param  array  $resources the resource to load
+         * @return void            
+         */
+        private function loadAutoloadResourcesArray($method, array $resources){
+            foreach ($resources as $name) {
+                $this->{$method}($name);
+            }
+        }
+    }

core/classes/Log.php

Indentation +266 added lines, -266 removed lines

@@ -1,297 +1,297 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Log{
+    class Log{
 		
-		/**
-		 * The defined constante for Log level
-		 */
-		const NONE = 99999999;
-		const FATAL = 500;
-		const ERROR = 400;
-		const WARNING = 300;
-		const INFO = 200;
-		const DEBUG = 100;
-		const ALL = -99999999;
+        /**
+         * The defined constante for Log level
+         */
+        const NONE = 99999999;
+        const FATAL = 500;
+        const ERROR = 400;
+        const WARNING = 300;
+        const INFO = 200;
+        const DEBUG = 100;
+        const ALL = -99999999;
 
-		/**
-		 * The logger name
-		 * @var string
-		 */
-		private $logger = 'ROOT_LOGGER';
+        /**
+         * The logger name
+         * @var string
+         */
+        private $logger = 'ROOT_LOGGER';
 		
-		/**
-		 * List of valid log level to be checked for the configuration
-		 * @var array
-		 */
-		private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
+        /**
+         * List of valid log level to be checked for the configuration
+         * @var array
+         */
+        private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
 
-		/**
-		 * Create new Log instance
-		 */
-		public function __construct(){
-		}
+        /**
+         * Create new Log instance
+         */
+        public function __construct(){
+        }
 
-		/**
-		 * Set the logger to identify each message in the log
-		 * @param string $logger the logger name
-		 */
-		public  function setLogger($logger){
-			$this->logger = $logger;
-		}
+        /**
+         * Set the logger to identify each message in the log
+         * @param string $logger the logger name
+         */
+        public  function setLogger($logger){
+            $this->logger = $logger;
+        }
 
-		/**
-		 * Save the fatal message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function fatal($message){
-			$this->writeLog($message, self::FATAL);
-		} 
+        /**
+         * Save the fatal message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function fatal($message){
+            $this->writeLog($message, self::FATAL);
+        } 
 		
-		/**
-		 * Save the error message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function error($message){
-			$this->writeLog($message, self::ERROR);
-		} 
+        /**
+         * Save the error message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function error($message){
+            $this->writeLog($message, self::ERROR);
+        } 
 
-		/**
-		 * Save the warning message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function warning($message){
-			$this->writeLog($message, self::WARNING);
-		} 
+        /**
+         * Save the warning message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function warning($message){
+            $this->writeLog($message, self::WARNING);
+        } 
 		
-		/**
-		 * Save the info message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function info($message){
-			$this->writeLog($message, self::INFO);
-		} 
+        /**
+         * Save the info message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function info($message){
+            $this->writeLog($message, self::INFO);
+        } 
 		
-		/**
-		 * Save the debug message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function debug($message){
-			$this->writeLog($message, self::DEBUG);
-		} 
+        /**
+         * Save the debug message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function debug($message){
+            $this->writeLog($message, self::DEBUG);
+        } 
 		
 		
-		/**
-		 * Save the log message
-		 * @param  string $message the log message to be saved
-		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
-		 * to allow check the log level threshold.
-		 */
-		public function writeLog($message, $level = self::INFO){
-			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
-				//so means no need log just stop here
-				return;
-			}
-			//check config log level
-			if(! self::isValidConfigLevel($configLogLevel)){
-				//NOTE: here need put the show_error() "logging" to false to prevent loop
-				show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
-			}
+        /**
+         * Save the log message
+         * @param  string $message the log message to be saved
+         * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
+         * to allow check the log level threshold.
+         */
+        public function writeLog($message, $level = self::INFO){
+            $configLogLevel = get_config('log_level');
+            if(! $configLogLevel){
+                //so means no need log just stop here
+                return;
+            }
+            //check config log level
+            if(! self::isValidConfigLevel($configLogLevel)){
+                //NOTE: here need put the show_error() "logging" to false to prevent loop
+                show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
+            }
 			
-			//check if config log_logger_name and current log can save log data
-			if(! $this->canSaveLogDataForLogger()){
-				return;
-			}
+            //check if config log_logger_name and current log can save log data
+            if(! $this->canSaveLogDataForLogger()){
+                return;
+            }
 			
-			//if $level is not an integer
-			if(! is_numeric($level)){
-				$level = self::getLevelValue($level);
-			}
+            //if $level is not an integer
+            if(! is_numeric($level)){
+                $level = self::getLevelValue($level);
+            }
 			
-			//check if can logging regarding the log level config
-			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
-				//can't log
-				return;
-			}
-			//check log file and directory
-			$path = $this->checkAndSetLogFileDirectory();
-			//save the log data
-			$this->saveLogData($path, $level, $message);
-		}	
+            //check if can logging regarding the log level config
+            $configLevel = self::getLevelValue($configLogLevel);
+            if($configLevel > $level){
+                //can't log
+                return;
+            }
+            //check log file and directory
+            $path = $this->checkAndSetLogFileDirectory();
+            //save the log data
+            $this->saveLogData($path, $level, $message);
+        }	
 
-		/**
-		 * Save the log data into file
-		 * @param  string $path    the path of the log file
-		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
-		 * @param  string $message the log message to save
-		 * @return void
-		 */
-		protected function saveLogData($path, $level, $message){
-			//may be at this time helper user_agent not yet included
-			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
+        /**
+         * Save the log data into file
+         * @param  string $path    the path of the log file
+         * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
+         * @param  string $message the log message to save
+         * @return void
+         */
+        protected function saveLogData($path, $level, $message){
+            //may be at this time helper user_agent not yet included
+            require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 			
-			///////////////////// date //////////////
-			$timestampWithMicro = microtime(true);
-			$microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
-			$dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
-			$logDate = $dateTime->format('Y-m-d H:i:s.u'); 
-			//ip
-			$ip = get_ip();
+            ///////////////////// date //////////////
+            $timestampWithMicro = microtime(true);
+            $microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
+            $dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
+            $logDate = $dateTime->format('Y-m-d H:i:s.u'); 
+            //ip
+            $ip = get_ip();
 			
-			//if $level is not an integer
-			if(! is_numeric($level)){
-				$level = self::getLevelValue($level);
-			}
+            //if $level is not an integer
+            if(! is_numeric($level)){
+                $level = self::getLevelValue($level);
+            }
 
-			//level name
-			$levelName = self::getLevelName($level);
+            //level name
+            $levelName = self::getLevelName($level);
 			
-			//debug info
-			$dtrace = debug_backtrace();
-			$fileInfo = $dtrace[0]['file'] == __FILE__ ? $dtrace[1] : $dtrace[0];
+            //debug info
+            $dtrace = debug_backtrace();
+            $fileInfo = $dtrace[0]['file'] == __FILE__ ? $dtrace[1] : $dtrace[0];
 			
-			$str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
-			$fp = fopen($path, 'a+');
-			if(is_resource($fp)){
-				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
-				fwrite($fp, $str);
-				fclose($fp);
-			}
-		}	
+            $str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
+            $fp = fopen($path, 'a+');
+            if(is_resource($fp)){
+                flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
+                fwrite($fp, $str);
+                fclose($fp);
+            }
+        }	
 
-		/**
-		 * Check if the current logger can save log data regarding the configuration
-		 * of logger filter
-		 * @return boolean
-		 */
-		protected function canSaveLogDataForLogger(){
-			if(! empty($this->logger)){
-				$configLoggersName = get_config('log_logger_name', array());
-				if (!empty($configLoggersName)) {
-					//for best comparaison put all string to lowercase
-					$configLoggersName = array_map('strtolower', $configLoggersName);
-					if(! in_array(strtolower($this->logger), $configLoggersName)){
-						return false;
-					}
-				}
-			}
-			return true;
-		}
+        /**
+         * Check if the current logger can save log data regarding the configuration
+         * of logger filter
+         * @return boolean
+         */
+        protected function canSaveLogDataForLogger(){
+            if(! empty($this->logger)){
+                $configLoggersName = get_config('log_logger_name', array());
+                if (!empty($configLoggersName)) {
+                    //for best comparaison put all string to lowercase
+                    $configLoggersName = array_map('strtolower', $configLoggersName);
+                    if(! in_array(strtolower($this->logger), $configLoggersName)){
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
 
-		/**
-		 * Check the file and directory 
-		 * @return string the log file path
-		 */
-		protected function checkAndSetLogFileDirectory(){
-			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
-				$logSavePath = LOGS_PATH;
-			}
+        /**
+         * Check the file and directory 
+         * @return string the log file path
+         */
+        protected function checkAndSetLogFileDirectory(){
+            $logSavePath = get_config('log_save_path');
+            if(! $logSavePath){
+                $logSavePath = LOGS_PATH;
+            }
 			
-			if(! is_dir($logSavePath) || !is_writable($logSavePath)){
-				//NOTE: here need put the show_error() "logging" to false to prevent loop
-				show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
-			}
+            if(! is_dir($logSavePath) || !is_writable($logSavePath)){
+                //NOTE: here need put the show_error() "logging" to false to prevent loop
+                show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
+            }
 			
-			$path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
-			if(! file_exists($path)){
-				touch($path);
-			}
-			return $path;
-		}
+            $path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
+            if(! file_exists($path)){
+                touch($path);
+            }
+            return $path;
+        }
 		
-		/**
-		 * Check if the given log level is valid
-		 *
-		 * @param  string  $level the log level
-		 *
-		 * @return boolean        true if the given log level is valid, false if not
-		 */
-		protected static function isValidConfigLevel($level){
-			$level = strtolower($level);
-			return in_array($level, self::$validConfigLevel);
-		}
+        /**
+         * Check if the given log level is valid
+         *
+         * @param  string  $level the log level
+         *
+         * @return boolean        true if the given log level is valid, false if not
+         */
+        protected static function isValidConfigLevel($level){
+            $level = strtolower($level);
+            return in_array($level, self::$validConfigLevel);
+        }
 
-		/**
-		 * Get the log level number for the given level string
-		 * @param  string $level the log level in string format
-		 * 
-		 * @return int        the log level in integer format using the predefined constants
-		 */
-		protected static function getLevelValue($level){
-			$level = strtolower($level);
-			$levelMaps = array(
-				'fatal'   => self::FATAL,
-				'error'   => self::ERROR,
-				'warning' => self::WARNING,
-				'warn'    => self::WARNING,
-				'info'    => self::INFO,
-				'debug'   => self::DEBUG,
-				'all'     => self::ALL
-			);
-			//the default value is NONE, so means no need test for NONE
-			$value = self::NONE;
-			foreach ($levelMaps as $k => $v) {
-				if($level == $k){
-					$value = $v;
-					break;
-				}
-			}
-			return $value;
-		}
+        /**
+         * Get the log level number for the given level string
+         * @param  string $level the log level in string format
+         * 
+         * @return int        the log level in integer format using the predefined constants
+         */
+        protected static function getLevelValue($level){
+            $level = strtolower($level);
+            $levelMaps = array(
+                'fatal'   => self::FATAL,
+                'error'   => self::ERROR,
+                'warning' => self::WARNING,
+                'warn'    => self::WARNING,
+                'info'    => self::INFO,
+                'debug'   => self::DEBUG,
+                'all'     => self::ALL
+            );
+            //the default value is NONE, so means no need test for NONE
+            $value = self::NONE;
+            foreach ($levelMaps as $k => $v) {
+                if($level == $k){
+                    $value = $v;
+                    break;
+                }
+            }
+            return $value;
+        }
 
-		/**
-		 * Get the log level string for the given log level integer
-		 * @param  integer $level the log level in integer format
-		 * @return string        the log level in string format
-		 */
-		protected static function getLevelName($level){
-			$levelMaps = array(
-				self::FATAL   => 'FATAL',
-				self::ERROR   => 'ERROR',
-				self::WARNING => 'WARNING',
-				self::INFO    => 'INFO',
-				self::DEBUG   => 'DEBUG'
-			);
-			$value = '';
-			foreach ($levelMaps as $k => $v) {
-				if($level == $k){
-					$value = $v;
-					break;
-				}
-			}
-			//no need for ALL
-			return $value;
-		}
+        /**
+         * Get the log level string for the given log level integer
+         * @param  integer $level the log level in integer format
+         * @return string        the log level in string format
+         */
+        protected static function getLevelName($level){
+            $levelMaps = array(
+                self::FATAL   => 'FATAL',
+                self::ERROR   => 'ERROR',
+                self::WARNING => 'WARNING',
+                self::INFO    => 'INFO',
+                self::DEBUG   => 'DEBUG'
+            );
+            $value = '';
+            foreach ($levelMaps as $k => $v) {
+                if($level == $k){
+                    $value = $v;
+                    break;
+                }
+            }
+            //no need for ALL
+            return $value;
+        }
 
-	}
+    }