tnhfw / tnh-fw

tests/include/common.php

Braces +2 added lines, -4 removed lines

@@ -178,15 +178,13 @@
 	function clean_input($str){
 		if(is_array($str)){
 			$str = array_map('clean_input', $str);
-		}
-		else if(is_object($str)){
+		} else if(is_object($str)){
 			$obj = $str;
 			foreach ($str as $var => $value) {
 				$obj->$var = clean_input($value);
 			}
 			$str = $obj;
-		}
-		else{
+		} else{
 			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
 		}
 		return $str;

Spacing +36 added lines, -36 removed lines

@@ -29,14 +29,14 @@ 
 		//put the first letter of class to upper case 
 		$class = ucfirst($class);
 		static $classes = array();
-		if(isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
+		if (isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log') {
 			return $classes[$class];
 		}
 		$found = false;
 		foreach (array(ROOT_PATH, CORE_PATH) as $path) {
 			$file = $path . $dir . '/' . $class . '.php';
-			if(file_exists($file)){
-				if(class_exists($class, false) === false){
+			if (file_exists($file)) {
+				if (class_exists($class, false) === false) {
 					require_once $file;
 				}
 				//already found
@@ -44,7 +44,7 @@ 
 				break;
 			}
 		}
-		if(! $found){
+		if (!$found) {
 			//can't use show_error() at this time because some dependencies not yet loaded
 			set_http_status_header(503);
 			echo 'Cannot find the class [' . $class . ']';
@@ -54,7 +54,7 @@ 
 		/*
 		   TODO use the best method to get the Log instance
 		 */
-		if($class == 'Log'){
+		if ($class == 'Log') {
 			//can't use the instruction like "return new Log()" 
 			//because we need return the reference instance of the loaded class.
 			$log = new Log();
@@ -72,7 +72,7 @@ 
 
 	function & class_loaded($class = null){
 		static $list = array();
-		if($class != null){
+		if ($class != null) {
 			$list[strtolower($class)] = $class;
 		}
 		return $list;
@@ -80,7 +80,7 @@ 
 
 	function & load_configurations(array $overwrite_values = array()){
 		static $config;
-		if(empty($config)){
+		if (empty($config)) {
 			$file = CONFIG_PATH . 'config.php';
 			require_once $file;
 		
@@ -94,53 +94,53 @@ 
 	/**
 	*  @test
 	*/
-	function get_config($key, $default = null){
+	function get_config($key, $default = null) {
 		static $cfg;
-		if(empty($cfg)){
+		if (empty($cfg)) {
 			$cfg[0] = & load_configurations();
 		}
 		return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
 	}
 
-	function save_to_log($level, $message, $logger = null){
-		echo 'save_to_log('.$level . ',' . $message . ',' . $logger . ")\n";
+	function save_to_log($level, $message, $logger = null) {
+		echo 'save_to_log(' . $level . ',' . $message . ',' . $logger . ")\n";
 	}
 
 	
-	function set_http_status_header($code = 200, $text = null){
+	function set_http_status_header($code = 200, $text = null) {
 		echo 'header(' . $code . ', ' . $text . ')';
 		return true;
 	}
 
 	
-	function show_error($msg, $title = 'error', $logging = true){
+	function show_error($msg, $title = 'error', $logging = true) {
 		//show only and continue to help track of some error occured
 		echo 'show_error(' . $msg . ', ' . $title . ', ' . ($logging ? 'Y' : 'N') . ")\n";
 	}
 
-	function is_https(){
+	function is_https() {
 		return false;
 	}
 	
 	/**
 	*  @test
 	*/
-	function is_url($url){
+	function is_url($url) {
 		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
 	}
 		
-	function php_exception_handler($ex){
+	function php_exception_handler($ex) {
 		//show only and continue to help track of some error occured
-		echo 'php_exception_handler('.$ex->getMessage().', '.$ex->getFile().', '.$ex->getLine() . ")\n";
+		echo 'php_exception_handler(' . $ex->getMessage() . ', ' . $ex->getFile() . ', ' . $ex->getLine() . ")\n";
 	}
 	
 	
-	function php_error_handler($errno , $errstr, $errfile , $errline){
+	function php_error_handler($errno, $errstr, $errfile, $errline) {
 		//show only and continue to help track of some error occured
-		echo 'php_error_handler('.$errno .', ' . $errstr.', ' . $errfile.', '.$errline . ")\n";
+		echo 'php_error_handler(' . $errno . ', ' . $errstr . ', ' . $errfile . ', ' . $errline . ")\n";
 	}
 
-	function php_shudown_handler(){
+	function php_shudown_handler() {
 		return true;
 	}
 
@@ -148,11 +148,11 @@ 
 	/**
 	*  @test
 	*/
-	function attributes_to_string(array $attributes){
+	function attributes_to_string(array $attributes) {
 		$str = ' ';
 		//we check that the array passed as an argument is not empty.
-		if(! empty($attributes)){
-			foreach($attributes as $key => $value){
+		if (!empty($attributes)) {
+			foreach ($attributes as $key => $value) {
 				$key = trim(htmlspecialchars($key));
 				$value = trim(htmlspecialchars($value));
 				/*
@@ -162,35 +162,35 @@ 
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-				if($value && strpos('"', $value) !== false){
+				if ($value && strpos('"', $value) !== false) {
 					$value = addslashes($value);
 				}
-				$str .= $key.' = "'.$value.'" ';
+				$str .= $key . ' = "' . $value . '" ';
 			}
 		}
 		//remove the space after using rtrim()
 		return rtrim($str);
 	}
 
-	function stringfy_vars($var){
+	function stringfy_vars($var) {
 		return print_r($var, true);
 	}
 
 	/**
 	*  @test
 	*/
-	function clean_input($str){
-		if(is_array($str)){
+	function clean_input($str) {
+		if (is_array($str)) {
 			$str = array_map('clean_input', $str);
 		}
-		else if(is_object($str)){
+		else if (is_object($str)) {
 			$obj = $str;
 			foreach ($str as $var => $value) {
 				$obj->$var = clean_input($value);
 			}
 			$str = $obj;
 		}
-		else{
+		else {
 			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
 		}
 		return $str;
@@ -199,11 +199,11 @@ 
 	/**
 	*  @test
 	*/
-	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*') {
 		//get the string length
 		$len = strlen($str);
 		//if str is empty
-		if($len <= 0){
+		if ($len <= 0) {
 			return str_repeat($hiddenChar, 6);
 		}
 		//if the length is less than startCount and endCount
@@ -211,14 +211,14 @@ 
 		//or startCount is negative or endCount is negative
 		//return the full string hidden
 		
-		if((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
+		if ((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)) {
 			return str_repeat($hiddenChar, $len);
 		}
 		//the start non hidden string
 		$startNonHiddenStr = substr($str, 0, $startCount);
 		//the end non hidden string
 		$endNonHiddenStr = null;
-		if($endCount > 0){
+		if ($endCount > 0) {
 			$endNonHiddenStr = substr($str, - $endCount);
 		}
 		//the hidden string
@@ -227,12 +227,12 @@ 
 		return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
 	}
 	
-	function set_session_config(){
+	function set_session_config() {
 		return true;
 	}
 	
 	function & get_instance(){
-		if(! Controller::get_instance()){
+		if (!Controller::get_instance()) {
 			$c = new Controller();
 			return $c;
 		}

Indentation +201 added lines, -201 removed lines

@@ -1,240 +1,240 @@
 <?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.
+     */
 
 
-	function & class_loader($class, $dir = 'libraries', $params = null){
-		//put the first letter of class to upper case 
-		$class = ucfirst($class);
-		static $classes = array();
-		if(isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
-			return $classes[$class];
-		}
-		$found = false;
-		foreach (array(ROOT_PATH, CORE_PATH) as $path) {
-			$file = $path . $dir . '/' . $class . '.php';
-			if(file_exists($file)){
-				if(class_exists($class, false) === false){
-					require_once $file;
-				}
-				//already found
-				$found = true;
-				break;
-			}
-		}
-		if(! $found){
-			//can't use show_error() at this time because some dependencies not yet loaded
-			set_http_status_header(503);
-			echo 'Cannot find the class [' . $class . ']';
-			die();
-		}
+    function & class_loader($class, $dir = 'libraries', $params = null){
+        //put the first letter of class to upper case 
+        $class = ucfirst($class);
+        static $classes = array();
+        if(isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
+            return $classes[$class];
+        }
+        $found = false;
+        foreach (array(ROOT_PATH, CORE_PATH) as $path) {
+            $file = $path . $dir . '/' . $class . '.php';
+            if(file_exists($file)){
+                if(class_exists($class, false) === false){
+                    require_once $file;
+                }
+                //already found
+                $found = true;
+                break;
+            }
+        }
+        if(! $found){
+            //can't use show_error() at this time because some dependencies not yet loaded
+            set_http_status_header(503);
+            echo 'Cannot find the class [' . $class . ']';
+            die();
+        }
 		
-		/*
+        /*
 		   TODO use the best method to get the Log instance
 		 */
-		if($class == 'Log'){
-			//can't use the instruction like "return new Log()" 
-			//because we need return the reference instance of the loaded class.
-			$log = new Log();
-			return $log;
-		}
-		//track of loaded classes
-		class_loaded($class);
+        if($class == 'Log'){
+            //can't use the instruction like "return new Log()" 
+            //because we need return the reference instance of the loaded class.
+            $log = new Log();
+            return $log;
+        }
+        //track of loaded classes
+        class_loaded($class);
 		
-		//record the class instance
-		$classes[$class] = isset($params) ? new $class($params) : new $class();
+        //record the class instance
+        $classes[$class] = isset($params) ? new $class($params) : new $class();
 		
-		return $classes[$class];
-	}
+        return $classes[$class];
+    }
 
 
-	function & class_loaded($class = null){
-		static $list = array();
-		if($class != null){
-			$list[strtolower($class)] = $class;
-		}
-		return $list;
-	}
+    function & class_loaded($class = null){
+        static $list = array();
+        if($class != null){
+            $list[strtolower($class)] = $class;
+        }
+        return $list;
+    }
 
-	function & load_configurations(array $overwrite_values = array()){
-		static $config;
-		if(empty($config)){
-			$file = CONFIG_PATH . 'config.php';
-			require_once $file;
+    function & load_configurations(array $overwrite_values = array()){
+        static $config;
+        if(empty($config)){
+            $file = CONFIG_PATH . 'config.php';
+            require_once $file;
 		
-			foreach ($overwrite_values as $key => $value) {
-				$config[$key] = $value;
-			}
-		}
-		return $config;
-	}
+            foreach ($overwrite_values as $key => $value) {
+                $config[$key] = $value;
+            }
+        }
+        return $config;
+    }
 
-	/**
-	*  @test
-	*/
-	function get_config($key, $default = null){
-		static $cfg;
-		if(empty($cfg)){
-			$cfg[0] = & load_configurations();
-		}
-		return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
-	}
+    /**
+     *  @test
+     */
+    function get_config($key, $default = null){
+        static $cfg;
+        if(empty($cfg)){
+            $cfg[0] = & load_configurations();
+        }
+        return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
+    }
 
-	function save_to_log($level, $message, $logger = null){
-		echo 'save_to_log('.$level . ',' . $message . ',' . $logger . ")\n";
-	}
+    function save_to_log($level, $message, $logger = null){
+        echo 'save_to_log('.$level . ',' . $message . ',' . $logger . ")\n";
+    }
 
 	
-	function set_http_status_header($code = 200, $text = null){
-		echo 'header(' . $code . ', ' . $text . ')';
-		return true;
-	}
+    function set_http_status_header($code = 200, $text = null){
+        echo 'header(' . $code . ', ' . $text . ')';
+        return true;
+    }
 
 	
-	function show_error($msg, $title = 'error', $logging = true){
-		//show only and continue to help track of some error occured
-		echo 'show_error(' . $msg . ', ' . $title . ', ' . ($logging ? 'Y' : 'N') . ")\n";
-	}
+    function show_error($msg, $title = 'error', $logging = true){
+        //show only and continue to help track of some error occured
+        echo 'show_error(' . $msg . ', ' . $title . ', ' . ($logging ? 'Y' : 'N') . ")\n";
+    }
 
-	function is_https(){
-		return false;
-	}
+    function is_https(){
+        return false;
+    }
 	
-	/**
-	*  @test
-	*/
-	function is_url($url){
-		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
-	}
+    /**
+     *  @test
+     */
+    function is_url($url){
+        return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
+    }
 		
-	function php_exception_handler($ex){
-		//show only and continue to help track of some error occured
-		echo 'php_exception_handler('.$ex->getMessage().', '.$ex->getFile().', '.$ex->getLine() . ")\n";
-	}
+    function php_exception_handler($ex){
+        //show only and continue to help track of some error occured
+        echo 'php_exception_handler('.$ex->getMessage().', '.$ex->getFile().', '.$ex->getLine() . ")\n";
+    }
 	
 	
-	function php_error_handler($errno , $errstr, $errfile , $errline){
-		//show only and continue to help track of some error occured
-		echo 'php_error_handler('.$errno .', ' . $errstr.', ' . $errfile.', '.$errline . ")\n";
-	}
+    function php_error_handler($errno , $errstr, $errfile , $errline){
+        //show only and continue to help track of some error occured
+        echo 'php_error_handler('.$errno .', ' . $errstr.', ' . $errfile.', '.$errline . ")\n";
+    }
 
-	function php_shudown_handler(){
-		return true;
-	}
+    function php_shudown_handler(){
+        return true;
+    }
 
 
-	/**
-	*  @test
-	*/
-	function attributes_to_string(array $attributes){
-		$str = ' ';
-		//we check that the array passed as an argument is not empty.
-		if(! empty($attributes)){
-			foreach($attributes as $key => $value){
-				$key = trim(htmlspecialchars($key));
-				$value = trim(htmlspecialchars($value));
-				/*
+    /**
+     *  @test
+     */
+    function attributes_to_string(array $attributes){
+        $str = ' ';
+        //we check that the array passed as an argument is not empty.
+        if(! empty($attributes)){
+            foreach($attributes as $key => $value){
+                $key = trim(htmlspecialchars($key));
+                $value = trim(htmlspecialchars($value));
+                /*
 				* To predict the case where the string to convert contains the character "
 				* we check if this is the case we add a slash to solve this problem.
 				* For example:
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-				if($value && strpos('"', $value) !== false){
-					$value = addslashes($value);
-				}
-				$str .= $key.' = "'.$value.'" ';
-			}
-		}
-		//remove the space after using rtrim()
-		return rtrim($str);
-	}
+                if($value && strpos('"', $value) !== false){
+                    $value = addslashes($value);
+                }
+                $str .= $key.' = "'.$value.'" ';
+            }
+        }
+        //remove the space after using rtrim()
+        return rtrim($str);
+    }
 
-	function stringfy_vars($var){
-		return print_r($var, true);
-	}
+    function stringfy_vars($var){
+        return print_r($var, true);
+    }
 
-	/**
-	*  @test
-	*/
-	function clean_input($str){
-		if(is_array($str)){
-			$str = array_map('clean_input', $str);
-		}
-		else if(is_object($str)){
-			$obj = $str;
-			foreach ($str as $var => $value) {
-				$obj->$var = clean_input($value);
-			}
-			$str = $obj;
-		}
-		else{
-			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
-		}
-		return $str;
-	}
+    /**
+     *  @test
+     */
+    function clean_input($str){
+        if(is_array($str)){
+            $str = array_map('clean_input', $str);
+        }
+        else if(is_object($str)){
+            $obj = $str;
+            foreach ($str as $var => $value) {
+                $obj->$var = clean_input($value);
+            }
+            $str = $obj;
+        }
+        else{
+            $str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
+        }
+        return $str;
+    }
 	
-	/**
-	*  @test
-	*/
-	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
-		//get the string length
-		$len = strlen($str);
-		//if str is empty
-		if($len <= 0){
-			return str_repeat($hiddenChar, 6);
-		}
-		//if the length is less than startCount and endCount
-		//or the startCount and endCount length is 0
-		//or startCount is negative or endCount is negative
-		//return the full string hidden
+    /**
+     *  @test
+     */
+    function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+        //get the string length
+        $len = strlen($str);
+        //if str is empty
+        if($len <= 0){
+            return str_repeat($hiddenChar, 6);
+        }
+        //if the length is less than startCount and endCount
+        //or the startCount and endCount length is 0
+        //or startCount is negative or endCount is negative
+        //return the full string hidden
 		
-		if((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
-			return str_repeat($hiddenChar, $len);
-		}
-		//the start non hidden string
-		$startNonHiddenStr = substr($str, 0, $startCount);
-		//the end non hidden string
-		$endNonHiddenStr = null;
-		if($endCount > 0){
-			$endNonHiddenStr = substr($str, - $endCount);
-		}
-		//the hidden string
-		$hiddenStr = str_repeat($hiddenChar, $len - ($startCount + $endCount));
+        if((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
+            return str_repeat($hiddenChar, $len);
+        }
+        //the start non hidden string
+        $startNonHiddenStr = substr($str, 0, $startCount);
+        //the end non hidden string
+        $endNonHiddenStr = null;
+        if($endCount > 0){
+            $endNonHiddenStr = substr($str, - $endCount);
+        }
+        //the hidden string
+        $hiddenStr = str_repeat($hiddenChar, $len - ($startCount + $endCount));
 		
-		return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
-	}
+        return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
+    }
 	
-	function set_session_config(){
-		return true;
-	}
+    function set_session_config(){
+        return true;
+    }
 	
-	function & get_instance(){
-		if(! Controller::get_instance()){
-			$c = new Controller();
-			return $c;
-		}
-		return Controller::get_instance();
-	}
+    function & get_instance(){
+        if(! Controller::get_instance()){
+            $c = new Controller();
+            return $c;
+        }
+        return Controller::get_instance();
+    }

tests/include/testsUtil.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	/**
 	* Function to test private & protected method
 	*/
-	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
+	function runPrivateOrProtectedMethod($object, $method, array $args = array()) {
 		$r = new ReflectionClass(get_class($object));
 		$m = $r->getMethod($method);
 		$m->setAccessible(true);

Indentation +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-	/**
-	* Function to test private & protected method
-	*/
-	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
-		$r = new ReflectionClass(get_class($object));
-		$m = $r->getMethod($method);
-		$m->setAccessible(true);
-		return $m->invokeArgs($object, $args);
-	}
\ No newline at end of file
+    /**
+     * Function to test private & protected method
+     */
+    function runPrivateOrProtectedMethod($object, $method, array $args = array()){
+        $r = new ReflectionClass(get_class($object));
+        $m = $r->getMethod($method);
+        $m->setAccessible(true);
+        return $m->invokeArgs($object, $args);
+    }
\ No newline at end of file

core/classes/DBSessionHandler.php

Braces +4 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->setLogger($logger);
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
@@ -197,8 +196,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -237,8 +235,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -264,8 +261,7 @@ 
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
-			}
-			else{
+			} else{
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}

Spacing +45 added lines, -45 removed lines

@@ -27,11 +27,11 @@ 
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
 	 */
-	if( !interface_exists('SessionHandlerInterface')){
+	if (!interface_exists('SessionHandlerInterface')) {
 		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
 	}
 
-	class DBSessionHandler implements SessionHandlerInterface{
+	class DBSessionHandler implements SessionHandlerInterface {
 		
 		/**
 		 * The encryption method to use to encrypt session data in database
@@ -81,25 +81,25 @@ 
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null) {
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->setLogger($logger);
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
 
-	        if(is_object($loader)){
+	        if (is_object($loader)) {
 	          $this->setLoader($loader);
 	        }
 		    $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
+			if (is_object($modelInstance)) {
 				$this->setModelInstance($modelInstance);
 			}
 		}
@@ -108,7 +108,7 @@ 
 		 * Set the session secret used to encrypt the data in database 
 		 * @param string $secret the base64 string secret
 		 */
-		public function setSessionSecret($secret){
+		public function setSessionSecret($secret) {
 			$this->sessionSecret = $secret;
 			return $this;
 		}
@@ -117,7 +117,7 @@ 
 		 * Return the session secret
 		 * @return string 
 		 */
-		public function getSessionSecret(){
+		public function getSessionSecret() {
 			return $this->sessionSecret;
 		}
 
@@ -126,7 +126,7 @@ 
 		 * Set the initializer vector for openssl 
 		 * @param string $key the session secret used
 		 */
-		public function setInitializerVector($key){
+		public function setInitializerVector($key) {
 			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
 			$key = base64_decode($key);
 			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
@@ -137,7 +137,7 @@ 
 		 * Return the initializer vector
 		 * @return string 
 		 */
-		public function getInitializerVector(){
+		public function getInitializerVector() {
 			return $this->iv;
 		}
 
@@ -147,17 +147,17 @@ 
 		 * @param  string $sessionName the session name
 		 * @return boolean 
 		 */
-		public function open($savePath, $sessionName){
+		public function open($savePath, $sessionName) {
 			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
 			//try to check if session secret is set before
 			$secret = $this->getSessionSecret();
-			if(empty($secret)){
+			if (empty($secret)) {
 				$secret = get_config('session_secret', null);
 				$this->setSessionSecret($secret);
 			}
 			$this->logger->info('Session secret: ' . $secret);
 
-			if(! $this->getModelInstance()){
+			if (!$this->getModelInstance()) {
 				$this->setModelInstanceFromConfig();
 			}
 			$this->setInitializerVector($secret);
@@ -165,7 +165,7 @@ 
 			//set session tables columns
 			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
 
-			if(empty($this->sessionTableColumns)){
+			if (empty($this->sessionTableColumns)) {
 				show_error('The session handler is "database" but the table columns not set');
 			}
 			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
@@ -181,7 +181,7 @@ 
 		 * Close the session
 		 * @return boolean
 		 */
-		public function close(){
+		public function close() {
 			$this->logger->debug('Closing database session handler');
 			return true;
 		}
@@ -191,28 +191,28 @@ 
 		 * @param  string $sid the session id to use
 		 * @return string      the session data in serialiaze format
 		 */
-		public function read($sid){
+		public function read($sid) {
 			$this->logger->debug('Reading database session data for SID: ' . $sid);
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			
 			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
+			if ($data && isset($data->{$columns['sdata']})) {
 				//checking inactivity 
 				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
+				if ($data->{$columns['stime']} < $timeInactivity) {
 					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
 					$this->destroy($sid);
 					return null;
@@ -229,16 +229,16 @@ 
 		 * @param  mixed $data the session data to save in serialize format
 		 * @return boolean 
 		 */
-		public function write($sid, $data){
+		public function write($sid, $data) {
 			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
 
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -246,7 +246,7 @@ 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			$data = $this->encode($data);
 			$params = array(
 							$columns['sid'] => $sid,
@@ -259,13 +259,13 @@ 
 						);
 			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
 			$exists = $instance->get($sid);
-			if($exists){
+			if ($exists) {
 				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
 			}
-			else{
+			else {
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}
@@ -278,7 +278,7 @@ 
 		 * @param  string $sid the session id value
 		 * @return boolean
 		 */
-		public function destroy($sid){
+		public function destroy($sid) {
 			$this->logger->debug('Destroy of session data for SID: ' . $sid);
 			$instance = $this->modelInstanceName;
 			$instance->delete($sid);
@@ -290,7 +290,7 @@ 
 		 * @param  integer $maxLifetime the max lifetime
 		 * @return boolean
 		 */
-		public function gc($maxLifetime){
+		public function gc($maxLifetime) {
 			$instance = $this->modelInstanceName;
 			$time = time() - $maxLifetime;
 			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
@@ -303,9 +303,9 @@ 
 		 * @param  mixed $data the session data to encode
 		 * @return mixed the encoded session data
 		 */
-		public function encode($data){
+		public function encode($data) {
 			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+			$dataEncrypted = openssl_encrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
 			$output = base64_encode($dataEncrypted);
 			return $output;
 		}
@@ -316,7 +316,7 @@ 
 		 * @param  mixed $data the data to decode
 		 * @return mixed       the decoded data
 		 */
-		public function decode($data){
+		public function decode($data) {
 			$key = base64_decode($this->sessionSecret);
 			$data = base64_decode($data);
 			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
@@ -328,7 +328,7 @@ 
          * Return the loader instance
          * @return object Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loader;
         }
 
@@ -336,7 +336,7 @@ 
          * set the loader instance for future use
          * @param object Loader $loader the loader object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loader = $loader;
             return $this;
         }
@@ -345,7 +345,7 @@ 
          * Return the model instance
          * @return object DBSessionHandlerModel the model instance
          */
-        public function getModelInstance(){
+        public function getModelInstance() {
             return $this->modelInstanceName;
         }
 
@@ -353,7 +353,7 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+         public function setModelInstance(DBSessionHandlerModel $modelInstance) {
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
@@ -362,7 +362,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -370,7 +370,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -378,18 +378,18 @@ 
 	    /**
 	     * Set the model instance using the configuration for session
 	     */
-	    private function setModelInstanceFromConfig(){
+	    private function setModelInstanceFromConfig() {
 	    	$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
-			else{
+			else {
             	Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            if (isset($this->OBJ->dbsessionhandlerinstance) && !$this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel) {
+				show_error('To use database session handler, your class model "' . get_class($this->OBJ->dbsessionhandlerinstance) . '" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd
 			

Indentation +344 added lines, -344 removed lines

@@ -1,330 +1,330 @@ 
 <?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.
+     */
 	
-	/**
-	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
-	 */
-	if( !interface_exists('SessionHandlerInterface')){
-		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
-	}
-
-	class DBSessionHandler implements SessionHandlerInterface{
+    /**
+     * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
+     */
+    if( !interface_exists('SessionHandlerInterface')){
+        show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
+    }
+
+    class DBSessionHandler implements SessionHandlerInterface{
 		
-		/**
-		 * The encryption method to use to encrypt session data in database
-		 * @const string
-		 */
-		const DB_SESSION_HASH_METHOD = 'AES-256-CBC';
+        /**
+         * The encryption method to use to encrypt session data in database
+         * @const string
+         */
+        const DB_SESSION_HASH_METHOD = 'AES-256-CBC';
 		
-		/**
-		 * Super global instance
-		 * @var object
-		 */
-		protected $OBJ = null;
-
-		/**
-		 * Session secret to use 
-		 * @var string
-		 */
-		private $sessionSecret = null;
-
-		/**
-		 * The initialisation vector to use for openssl
-		 * @var string
-		 */
-		private $iv = null;
-
-		/**
-		 * The model instance name to use after load model
-		 * @var object
-		 */
-		private $modelInstanceName = null;
-
-		/**
-		 * The columns of the table to use to store session data
-		 * @var array
-		 */
-		private $sessionTableColumns = array();
-
-		/**
-		 * The instance of the Log 
-		 * @var Log
-		 */
-		private $logger;
-
-		/**
+        /**
+         * Super global instance
+         * @var object
+         */
+        protected $OBJ = null;
+
+        /**
+         * Session secret to use 
+         * @var string
+         */
+        private $sessionSecret = null;
+
+        /**
+         * The initialisation vector to use for openssl
+         * @var string
+         */
+        private $iv = null;
+
+        /**
+         * The model instance name to use after load model
+         * @var object
+         */
+        private $modelInstanceName = null;
+
+        /**
+         * The columns of the table to use to store session data
+         * @var array
+         */
+        private $sessionTableColumns = array();
+
+        /**
+         * The instance of the Log 
+         * @var Log
+         */
+        private $logger;
+
+        /**
          * Instance of the Loader class
          * @var Loader
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
-			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->setLogger($logger);
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::DBSessionHandler');
-	        }
-
-	        if(is_object($loader)){
-	          $this->setLoader($loader);
-	        }
-		    $this->OBJ = & get_instance();
+        public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+            /**
+             * instance of the Log class
+             */
+            if(is_object($logger)){
+                $this->setLogger($logger);
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('Library::DBSessionHandler');
+            }
+
+            if(is_object($loader)){
+                $this->setLoader($loader);
+            }
+            $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
-				$this->setModelInstance($modelInstance);
-			}
-		}
-
-		/**
-		 * Set the session secret used to encrypt the data in database 
-		 * @param string $secret the base64 string secret
-		 */
-		public function setSessionSecret($secret){
-			$this->sessionSecret = $secret;
-			return $this;
-		}
-
-		/**
-		 * Return the session secret
-		 * @return string 
-		 */
-		public function getSessionSecret(){
-			return $this->sessionSecret;
-		}
-
-
-		/**
-		 * Set the initializer vector for openssl 
-		 * @param string $key the session secret used
-		 */
-		public function setInitializerVector($key){
-			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
-			$key = base64_decode($key);
-			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
-			return $this;
-		}
-
-		/**
-		 * Return the initializer vector
-		 * @return string 
-		 */
-		public function getInitializerVector(){
-			return $this->iv;
-		}
-
-		/**
-		 * Open the database session handler, here nothing to do just return true
-		 * @param  string $savePath    the session save path
-		 * @param  string $sessionName the session name
-		 * @return boolean 
-		 */
-		public function open($savePath, $sessionName){
-			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
-			//try to check if session secret is set before
-			$secret = $this->getSessionSecret();
-			if(empty($secret)){
-				$secret = get_config('session_secret', null);
-				$this->setSessionSecret($secret);
-			}
-			$this->logger->info('Session secret: ' . $secret);
-
-			if(! $this->getModelInstance()){
-				$this->setModelInstanceFromConfig();
-			}
-			$this->setInitializerVector($secret);
-
-			//set session tables columns
-			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
-
-			if(empty($this->sessionTableColumns)){
-				show_error('The session handler is "database" but the table columns not set');
-			}
-			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
+            if(is_object($modelInstance)){
+                $this->setModelInstance($modelInstance);
+            }
+        }
+
+        /**
+         * Set the session secret used to encrypt the data in database 
+         * @param string $secret the base64 string secret
+         */
+        public function setSessionSecret($secret){
+            $this->sessionSecret = $secret;
+            return $this;
+        }
+
+        /**
+         * Return the session secret
+         * @return string 
+         */
+        public function getSessionSecret(){
+            return $this->sessionSecret;
+        }
+
+
+        /**
+         * Set the initializer vector for openssl 
+         * @param string $key the session secret used
+         */
+        public function setInitializerVector($key){
+            $iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
+            $key = base64_decode($key);
+            $this->iv = substr(hash('sha256', $key), 0, $iv_length);
+            return $this;
+        }
+
+        /**
+         * Return the initializer vector
+         * @return string 
+         */
+        public function getInitializerVector(){
+            return $this->iv;
+        }
+
+        /**
+         * Open the database session handler, here nothing to do just return true
+         * @param  string $savePath    the session save path
+         * @param  string $sessionName the session name
+         * @return boolean 
+         */
+        public function open($savePath, $sessionName){
+            $this->logger->debug('Opening database session handler for [' . $sessionName . ']');
+            //try to check if session secret is set before
+            $secret = $this->getSessionSecret();
+            if(empty($secret)){
+                $secret = get_config('session_secret', null);
+                $this->setSessionSecret($secret);
+            }
+            $this->logger->info('Session secret: ' . $secret);
+
+            if(! $this->getModelInstance()){
+                $this->setModelInstanceFromConfig();
+            }
+            $this->setInitializerVector($secret);
+
+            //set session tables columns
+            $this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
+
+            if(empty($this->sessionTableColumns)){
+                show_error('The session handler is "database" but the table columns not set');
+            }
+            $this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
 			
-			//delete the expired session
-			$timeActivity = get_config('session_inactivity_time', 100);
-			$this->gc($timeActivity);
+            //delete the expired session
+            $timeActivity = get_config('session_inactivity_time', 100);
+            $this->gc($timeActivity);
 			
-			return true;
-		}
-
-		/**
-		 * Close the session
-		 * @return boolean
-		 */
-		public function close(){
-			$this->logger->debug('Closing database session handler');
-			return true;
-		}
-
-		/**
-		 * Get the session value for the given session id
-		 * @param  string $sid the session id to use
-		 * @return string      the session data in serialiaze format
-		 */
-		public function read($sid){
-			$this->logger->debug('Reading database session data for SID: ' . $sid);
-			$instance = $this->getModelInstance();
-			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
-				$this->getLoader()->functions('user_agent'); 
-				$this->getLoader()->library('Browser'); 
-			}
-			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
+            return true;
+        }
+
+        /**
+         * Close the session
+         * @return boolean
+         */
+        public function close(){
+            $this->logger->debug('Closing database session handler');
+            return true;
+        }
+
+        /**
+         * Get the session value for the given session id
+         * @param  string $sid the session id to use
+         * @return string      the session data in serialiaze format
+         */
+        public function read($sid){
+            $this->logger->debug('Reading database session data for SID: ' . $sid);
+            $instance = $this->getModelInstance();
+            $columns = $this->sessionTableColumns;
+            if($this->getLoader()){
+                $this->getLoader()->functions('user_agent'); 
+                $this->getLoader()->library('Browser'); 
+            }
+            else{
+                Loader::functions('user_agent');
+                Loader::library('Browser');
             }
 			
-			$ip = get_ip();
-			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+            $ip = get_ip();
+            $host = @gethostbyaddr($ip) or null;
+            $browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
 			
-			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
-				//checking inactivity 
-				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
-					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
-					$this->destroy($sid);
-					return null;
-				}
-				return $this->decode($data->{$columns['sdata']});
-			}
-			$this->logger->info('Database session data for SID: ' . $sid . ' is not valid return false, may be the session ID is wrong');
-			return null;
-		}
-
-		/**
-		 * Save the session data
-		 * @param  string $sid  the session ID
-		 * @param  mixed $data the session data to save in serialize format
-		 * @return boolean 
-		 */
-		public function write($sid, $data){
-			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
-			$instance = $this->getModelInstance();
-			$columns = $this->sessionTableColumns;
-
-			if($this->getLoader()){
-				$this->getLoader()->functions('user_agent'); 
-				$this->getLoader()->library('Browser'); 
-			}
-			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
+            $data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
+            if($data && isset($data->{$columns['sdata']})){
+                //checking inactivity 
+                $timeInactivity = time() - get_config('session_inactivity_time', 100);
+                if($data->{$columns['stime']} < $timeInactivity){
+                    $this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
+                    $this->destroy($sid);
+                    return null;
+                }
+                return $this->decode($data->{$columns['sdata']});
+            }
+            $this->logger->info('Database session data for SID: ' . $sid . ' is not valid return false, may be the session ID is wrong');
+            return null;
+        }
+
+        /**
+         * Save the session data
+         * @param  string $sid  the session ID
+         * @param  mixed $data the session data to save in serialize format
+         * @return boolean 
+         */
+        public function write($sid, $data){
+            $this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
+            $instance = $this->getModelInstance();
+            $columns = $this->sessionTableColumns;
+
+            if($this->getLoader()){
+                $this->getLoader()->functions('user_agent'); 
+                $this->getLoader()->library('Browser'); 
+            }
+            else{
+                Loader::functions('user_agent');
+                Loader::library('Browser');
+            }
+
+            $ip = get_ip();
+            $keyValue = $instance->getKeyValue();
+            $host = @gethostbyaddr($ip) or null;
+            $browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+            $data = $this->encode($data);
+            $params = array(
+                            $columns['sid'] => $sid,
+                            $columns['sdata'] => $data,
+                            $columns['stime'] => time(),
+                            $columns['shost'] => $host,
+                            $columns['sbrowser'] => $browser,
+                            $columns['sip'] => $ip,
+                            $columns['skey'] => $keyValue
+                        );
+            $this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
+            $exists = $instance->get($sid);
+            if($exists){
+                $this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
+                //update
+                unset($params[$columns['sid']]);
+                $instance->update($sid, $params);
             }
+            else{
+                $this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
+                $instance->insert($params);
+            }
+            return true;
+        }
+
+
+        /**
+         * Destroy the session data for the given session id
+         * @param  string $sid the session id value
+         * @return boolean
+         */
+        public function destroy($sid){
+            $this->logger->debug('Destroy of session data for SID: ' . $sid);
+            $instance = $this->modelInstanceName;
+            $instance->delete($sid);
+            return true;
+        }
 
-			$ip = get_ip();
-			$keyValue = $instance->getKeyValue();
-			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
-			$data = $this->encode($data);
-			$params = array(
-							$columns['sid'] => $sid,
-							$columns['sdata'] => $data,
-							$columns['stime'] => time(),
-							$columns['shost'] => $host,
-							$columns['sbrowser'] => $browser,
-							$columns['sip'] => $ip,
-							$columns['skey'] => $keyValue
-						);
-			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
-			$exists = $instance->get($sid);
-			if($exists){
-				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
-				//update
-				unset($params[$columns['sid']]);
-				$instance->update($sid, $params);
-			}
-			else{
-				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
-				$instance->insert($params);
-			}
-			return true;
-		}
-
-
-		/**
-		 * Destroy the session data for the given session id
-		 * @param  string $sid the session id value
-		 * @return boolean
-		 */
-		public function destroy($sid){
-			$this->logger->debug('Destroy of session data for SID: ' . $sid);
-			$instance = $this->modelInstanceName;
-			$instance->delete($sid);
-			return true;
-		}
-
-		/**
-		 * Clean the expire session data to save espace
-		 * @param  integer $maxLifetime the max lifetime
-		 * @return boolean
-		 */
-		public function gc($maxLifetime){
-			$instance = $this->modelInstanceName;
-			$time = time() - $maxLifetime;
-			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
-			$instance->deleteByTime($time);
-			return true;
-		}
-
-		/**
-		 * Encode the session data using the openssl
-		 * @param  mixed $data the session data to encode
-		 * @return mixed the encoded session data
-		 */
-		public function encode($data){
-			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
-			$output = base64_encode($dataEncrypted);
-			return $output;
-		}
-
-
-		/**
-		 * Decode the session data using the openssl
-		 * @param  mixed $data the data to decode
-		 * @return mixed       the decoded data
-		 */
-		public function decode($data){
-			$key = base64_decode($this->sessionSecret);
-			$data = base64_decode($data);
-			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
-			return $data;
-		}
+        /**
+         * Clean the expire session data to save espace
+         * @param  integer $maxLifetime the max lifetime
+         * @return boolean
+         */
+        public function gc($maxLifetime){
+            $instance = $this->modelInstanceName;
+            $time = time() - $maxLifetime;
+            $this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
+            $instance->deleteByTime($time);
+            return true;
+        }
+
+        /**
+         * Encode the session data using the openssl
+         * @param  mixed $data the session data to encode
+         * @return mixed the encoded session data
+         */
+        public function encode($data){
+            $key = base64_decode($this->sessionSecret);
+            $dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+            $output = base64_encode($dataEncrypted);
+            return $output;
+        }
+
+
+        /**
+         * Decode the session data using the openssl
+         * @param  mixed $data the data to decode
+         * @return mixed       the decoded data
+         */
+        public function decode($data){
+            $key = base64_decode($this->sessionSecret);
+            $data = base64_decode($data);
+            $data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+            return $data;
+        }
 
 		
-		/**
+        /**
          * Return the loader instance
          * @return object Loader the loader instance
          */
@@ -336,7 +336,7 @@ 
          * set the loader instance for future use
          * @param object Loader $loader the loader object
          */
-         public function setLoader($loader){
+            public function setLoader($loader){
             $this->loader = $loader;
             return $this;
         }
@@ -353,47 +353,47 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+            public function setModelInstance(DBSessionHandlerModel $modelInstance){
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
 
         /**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
-
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
-
-	    /**
-	     * Set the model instance using the configuration for session
-	     */
-	    private function setModelInstanceFromConfig(){
-	    	$modelName = get_config('session_save_path');
-			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
-				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
-			}
-			//@codeCoverageIgnoreStart
-			else{
-            	Loader::model($modelName, 'dbsessionhandlerinstance'); 
+         * Return the Log instance
+         * @return Log
+         */
+        public function getLogger(){
+            return $this->logger;
+        }
+
+        /**
+         * Set the log instance
+         * @param Log $logger the log object
+         */
+        public function setLogger(Log $logger){
+            $this->logger = $logger;
+            return $this;
+        }
+
+        /**
+         * Set the model instance using the configuration for session
+         */
+        private function setModelInstanceFromConfig(){
+            $modelName = get_config('session_save_path');
+            $this->logger->info('The database session model: ' . $modelName);
+            if($this->getLoader()){
+                $this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
+            }
+            //@codeCoverageIgnoreStart
+            else{
+                Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
             if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
-			}  
-			//@codeCoverageIgnoreEnd
+                show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            }  
+            //@codeCoverageIgnoreEnd
 			
-			//set model instance
-			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
-	}
+            //set model instance
+            $this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
+        }
+    }

core/classes/model/DBSessionHandlerModel.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 		 */
 		protected $sessionTableColumns = array();
 
-		public function __construct(Database $db = null){
+		public function __construct(Database $db = null) {
 			parent::__construct($db);
 		}
 
@@ -53,7 +53,7 @@ 
 		 * Return the session database table columns
 		 * @return array 
 		 */
-		public function getSessionTableColumns(){
+		public function getSessionTableColumns() {
 			return $this->sessionTableColumns;
 		}
 
@@ -61,7 +61,7 @@ 
 		 * Set the session database table columns
 		 * @param array $columns the columns definition
 		 */
-		public function setSessionTableColumns(array $columns){
+		public function setSessionTableColumns(array $columns) {
 			$this->sessionTableColumns = $columns;
 			return $this;
 		}

Indentation +65 added lines, -65 removed lines

@@ -1,39 +1,39 @@ 
 <?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.
+     */
 	
-	/**
-	 * DB session handler class
-	 */
- 	abstract class DBSessionHandlerModel extends Model {
+    /**
+     * DB session handler class
+     */
+        abstract class DBSessionHandlerModel extends Model {
 		
-		/**
-		 * The session table columns to use
-		 * @var array
-		 * @example
-		 * 	array(
+        /**
+         * The session table columns to use
+         * @var array
+         * @example
+         * 	array(
 				'sid' => '', //VARCHAR(255) Note: this a primary key
 				'sdata' => '', //TEXT
 				'stime' => '', //unix timestamp (INT|BIGINT)
@@ -42,41 +42,41 @@ 
 				'sbrowser' => '', //VARCHAR(255) 
 				'skey' => '' //VARCHAR(255) 
 			);
-		 */
-		protected $sessionTableColumns = array();
+         */
+        protected $sessionTableColumns = array();
 
-		public function __construct(Database $db = null){
-			parent::__construct($db);
-		}
+        public function __construct(Database $db = null){
+            parent::__construct($db);
+        }
 
-		/**
-		 * Return the session database table columns
-		 * @return array 
-		 */
-		public function getSessionTableColumns(){
-			return $this->sessionTableColumns;
-		}
+        /**
+         * Return the session database table columns
+         * @return array 
+         */
+        public function getSessionTableColumns(){
+            return $this->sessionTableColumns;
+        }
 
-		/**
-		 * Set the session database table columns
-		 * @param array $columns the columns definition
-		 */
-		public function setSessionTableColumns(array $columns){
-			$this->sessionTableColumns = $columns;
-			return $this;
-		}
+        /**
+         * Set the session database table columns
+         * @param array $columns the columns definition
+         */
+        public function setSessionTableColumns(array $columns){
+            $this->sessionTableColumns = $columns;
+            return $this;
+        }
 
-		/**
-		 * Delete the expire session
-		 * @param  int $time the unix timestamp
-		 * @return int       affected rows
-		 */
-		abstract public function deleteByTime($time);
+        /**
+         * Delete the expire session
+         * @param  int $time the unix timestamp
+         * @return int       affected rows
+         */
+        abstract public function deleteByTime($time);
 
 		
-		/**
-		 * How to get the value of the table column key. Generally is the session key
-		 * @return mixed the key value like used to identify the data
-		 */
-		abstract public function getKeyValue();
-	}
+        /**
+         * How to get the value of the table column key. Generally is the session key
+         * @return mixed the key value like used to identify the data
+         */
+        abstract public function getKeyValue();
+    }

tests/tnhfw/CommonTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,20 +24,20 @@
 		}
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
+		public function testFunctionGetConfigKeyNotExist() {
 			$key = 'foo';
 			$cfg = get_config($key);
 			$this->assertNull($cfg);
 		}
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+		public function testFunctionGetConfigKeyNotExistUsingDefaultValue() {
 			$key = 'foo';
 			$expected = 'bar';
 			$cfg = get_config($key, $expected);
 			$this->assertEquals($cfg, $expected);
 		}
 		
-		public function testFunctionGetConfigAfterSet(){
+		public function testFunctionGetConfigAfterSet() {
 			$key = 'foo';
 			$expected = 'bar';
 			$c = new Config();

Indentation +36 added lines, -36 removed lines

@@ -1,50 +1,50 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class CommonTest extends TestCase
-	{	
+    class CommonTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 			
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 	
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
-			$key = 'foo';
-			$cfg = get_config($key);
-			$this->assertNull($cfg);
-		}
+        public function testFunctionGetConfigKeyNotExist(){
+            $key = 'foo';
+            $cfg = get_config($key);
+            $this->assertNull($cfg);
+        }
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
-			$key = 'foo';
-			$expected = 'bar';
-			$cfg = get_config($key, $expected);
-			$this->assertEquals($cfg, $expected);
-		}
+        public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+            $key = 'foo';
+            $expected = 'bar';
+            $cfg = get_config($key, $expected);
+            $this->assertEquals($cfg, $expected);
+        }
 		
-		public function testFunctionGetConfigAfterSet(){
-			$key = 'foo';
-			$expected = 'bar';
-			$c = new Config();
-			$c->init();
-			$c->set($key, $expected);
-			$cfg = get_config($key);
-			$this->assertEquals($cfg, $expected);
-		}
+        public function testFunctionGetConfigAfterSet(){
+            $key = 'foo';
+            $expected = 'bar';
+            $c = new Config();
+            $c->init();
+            $c->set($key, $expected);
+            $cfg = get_config($key);
+            $this->assertEquals($cfg, $expected);
+        }
 		
-	}
\ No newline at end of file
+    }
\ No newline at end of file

core/classes/cache/ApcCache.php

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,19 +33,19 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
 		}
@@ -55,21 +55,21 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$this->logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -82,16 +82,16 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$this->logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -103,15 +103,15 @@ 
 		 * @return boolean      true if the cache is deleted, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$this->logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key) === true;
 			}
 		}
@@ -124,10 +124,10 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -135,7 +135,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -145,7 +145,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -153,14 +153,14 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$this->logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -172,7 +172,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 
@@ -180,7 +180,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -188,7 +188,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -199,12 +199,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return boolean|array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,7 @@ 
 			if($success === false){
 				$this->logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -89,8 +87,7 @@ 
 			if($result === false){
 		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -109,8 +106,7 @@ 
 			if($cacheInfo === false){
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key) === true;
 			}
@@ -134,8 +130,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -159,8 +154,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$this->logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

Indentation +194 added lines, -194 removed lines

@@ -1,215 +1,215 @@
 <?php
-	defined('ROOT_PATH') or 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') or 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 ApcCache implements CacheInterface{
+    class ApcCache implements CacheInterface{
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
-				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
-			}
+        public function __construct(Log $logger = null){
+            if(! $this->isSupported()){
+                show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
+            }
 
-			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::ApcCache');
-	        }
-		}
+            /**
+             * instance of the Log class
+             */
+            if(is_object($logger)){
+                $this->logger = $logger;
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('Library::ApcCache');
+            }
+        }
 
-		/**
-		 * This is used to get the cache data using the key
-		 * @param  string $key the key to identify the cache data
-		 * @return mixed      the cache data if exists else return false
-		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
-			$success = false;
-			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
-				return false;
-			}
-			else{
-				$cacheInfo = $this->_getCacheInfo($key);
-				$expire = time();
-				if($cacheInfo){
-					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
-				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
-				return $data;
-			}
-		}
+        /**
+         * This is used to get the cache data using the key
+         * @param  string $key the key to identify the cache data
+         * @return mixed      the cache data if exists else return false
+         */
+        public function get($key){
+            $this->logger->debug('Getting cache data for key ['. $key .']');
+            $success = false;
+            $data = apc_fetch($key, $success);
+            if($success === false){
+                $this->logger->info('No cache found for the key ['. $key .'], return false');
+                return false;
+            }
+            else{
+                $cacheInfo = $this->_getCacheInfo($key);
+                $expire = time();
+                if($cacheInfo){
+                    $expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
+                }
+                $this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                return $data;
+            }
+        }
 
 
-		/**
-		 * Save data to the cache
-		 * @param string  $key  the key to identify this cache data
-		 * @param mixed  $data the cache data to be saved
-		 * @param integer $ttl  the cache life time
-		 * @return boolean true if success otherwise will return false
-		 */
-		public function set($key, $data, $ttl = 0){
-			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
-			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
-		    	return true;
-		    }
-		}
+        /**
+         * Save data to the cache
+         * @param string  $key  the key to identify this cache data
+         * @param mixed  $data the cache data to be saved
+         * @param integer $ttl  the cache life time
+         * @return boolean true if success otherwise will return false
+         */
+        public function set($key, $data, $ttl = 0){
+            $expire = time() + $ttl;
+            $this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+            $result = apc_store($key, $data, $ttl);
+            if($result === false){
+                $this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+                return false;
+            }
+            else{
+                $this->logger->info('Cache data saved for the key ['. $key .']');
+                return true;
+            }
+        }
 
 
-		/**
-		 * Delete the cache data for given key
-		 * @param  string $key the key for cache to be deleted
-		 * @return boolean      true if the cache is deleted, false if can't delete 
-		 * the cache or the cache with the given key not exist
-		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
-			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
-				$this->logger->info('This cache data does not exists skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key) === true;
-			}
-		}
+        /**
+         * Delete the cache data for given key
+         * @param  string $key the key for cache to be deleted
+         * @return boolean      true if the cache is deleted, false if can't delete 
+         * the cache or the cache with the given key not exist
+         */
+        public function delete($key){
+            $this->logger->debug('Deleting of cache data for key [' .$key. ']');
+            $cacheInfo = $this->_getCacheInfo($key);
+            if($cacheInfo === false){
+                $this->logger->info('This cache data does not exists skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found cache data for the key [' .$key. '] remove it');
+                    return apc_delete($key) === true;
+            }
+        }
 		
-		/**
-		 * Get the cache information for given key
-		 * @param  string $key the key for cache to get the information for
-		 * @return boolean|array    the cache information. The associative array and must contains the following information:
-		 * 'mtime' => creation time of the cache (Unix timestamp),
-		 * 'expire' => expiration time of the cache (Unix timestamp),
-		 * 'ttl' => the time to live of the cache in second
-		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
-			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
-				$data = array(
-							'mtime' => $cacheInfos['creation_time'],
-							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
-							'ttl' => $cacheInfos['ttl']
-							);
-				return $data;
-			}
-			else{
-				$this->logger->info('This cache does not exists skipping');
-				return false;
-			}
-		}
+        /**
+         * Get the cache information for given key
+         * @param  string $key the key for cache to get the information for
+         * @return boolean|array    the cache information. The associative array and must contains the following information:
+         * 'mtime' => creation time of the cache (Unix timestamp),
+         * 'expire' => expiration time of the cache (Unix timestamp),
+         * 'ttl' => the time to live of the cache in second
+         */
+        public function getInfo($key){
+            $this->logger->debug('Getting of cache info for key [' .$key. ']');
+            $cacheInfos = $this->_getCacheInfo($key);
+            if($cacheInfos){
+                $data = array(
+                            'mtime' => $cacheInfos['creation_time'],
+                            'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
+                            'ttl' => $cacheInfos['ttl']
+                            );
+                return $data;
+            }
+            else{
+                $this->logger->info('This cache does not exists skipping');
+                return false;
+            }
+        }
 
 
-		/**
-		 * Used to delete expired cache data
-		 */
-		public function deleteExpiredCache(){
-			//for APC[u] is done automatically
-			return true;
-		}
+        /**
+         * Used to delete expired cache data
+         */
+        public function deleteExpiredCache(){
+            //for APC[u] is done automatically
+            return true;
+        }
 
-		/**
-		 * Remove all cache data
-		 */
-		public function clean(){
-			$this->logger->debug('Deleting of all cache data');
-			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
-				$this->logger->info('No cache data were found skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
-				return apc_clear_cache('user');
-			}
-		}
+        /**
+         * Remove all cache data
+         */
+        public function clean(){
+            $this->logger->debug('Deleting of all cache data');
+            $cacheInfos = apc_cache_info('user');
+            if(empty($cacheInfos['cache_list'])){
+                $this->logger->info('No cache data were found skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
+                return apc_clear_cache('user');
+            }
+        }
 		
 		
-		/**
-		 * Check whether the cache feature for the handle is supported
-		 *
-		 * @return bool
-		 */
-		public function isSupported(){
-			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
-		}
+        /**
+         * Check whether the cache feature for the handle is supported
+         *
+         * @return bool
+         */
+        public function isSupported(){
+            return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
+        }
 
-		/**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+        /**
+         * Return the Log instance
+         * @return Log
+         */
+        public function getLogger(){
+            return $this->logger;
+        }
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+        /**
+         * Set the log instance
+         * @param Log $logger the log object
+         */
+        public function setLogger(Log $logger){
+            $this->logger = $logger;
+            return $this;
+        }
 		
-		/**
-		* Return the array of cache information
-		*
-		* @param string $key the cache key to get the cache information 
-		* @return boolean|array
-		*/
-		private function _getCacheInfo($key){
-			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
-				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
-						return $c;
-					}
-				}
+        /**
+         * Return the array of cache information
+         *
+         * @param string $key the cache key to get the cache information 
+         * @return boolean|array
+         */
+        private function _getCacheInfo($key){
+            $caches = apc_cache_info('user');
+            if(! empty($caches['cache_list'])){
+                $cacheLists = $caches['cache_list'];
+                foreach ($cacheLists as $c){
+                    if(isset($c['info']) && $c['info'] === $key){
+                        return $c;
+                    }
+                }
 				
-			}
-			return false;
-		}
-	}
+            }
+            return false;
+        }
+    }

core/classes/cache/FileCache.php

Braces +12 added lines, -24 removed lines

@@ -48,8 +48,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
@@ -95,8 +94,7 @@ 
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
-		     }
-		     else{
+		     } else{
 		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
@@ -133,8 +131,7 @@ 
 		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
 		    	fclose($handle);
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
@@ -156,8 +153,7 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
 	      		unlink($filePath);
 				return true;
@@ -179,16 +175,14 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
-				}
-				else{
+				} else{
 					$this->logger->info('This cache data is OK check for expire');
 					if(isset($data['expire']) && $data['expire'] > time()){
 						$this->logger->info('This cache not yet expired return cache informations');
@@ -198,8 +192,7 @@ 
 							'ttl' => $data['ttl']
 							);
 						return $info;
-					}
-					else{
+					} else{
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -216,8 +209,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -225,12 +217,10 @@ 
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 		      		if(! $data){
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
+		      		} else if(time() > $data['expire']){
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			unlink($file);
-		      		}
-		      		else{
+		      		} else{
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -245,8 +235,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -273,8 +262,7 @@ 
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
-			}
-			else{
+			} else{
 				$this->compressCacheData = $status;
 			}
 			return $this;

Indentation +295 added lines, -295 removed lines

@@ -1,318 +1,318 @@
 <?php
-	defined('ROOT_PATH') or 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') or 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 FileCache implements CacheInterface{
+    class FileCache implements CacheInterface{
 		
-		/**
-		 * Whether to enable compression of the cache data file.
-		 * @var boolean
-		 */
-		private $compressCacheData = true;
+        /**
+         * Whether to enable compression of the cache data file.
+         * @var boolean
+         */
+        private $compressCacheData = true;
 		
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
-				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
-			}
-			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::FileCache');
-	        }
+        public function __construct(Log $logger = null){
+            if(! $this->isSupported()){
+                show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
+            }
+            /**
+             * instance of the Log class
+             */
+            if(is_object($logger)){
+                $this->logger = $logger;
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('Library::FileCache');
+            }
 			
-			//if Zlib extension is not loaded set compressCacheData to false
-			if(! extension_loaded('zlib')){
-				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
-				$this->compressCacheData = false;
-			}
-		}
+            //if Zlib extension is not loaded set compressCacheData to false
+            if(! extension_loaded('zlib')){
+                $this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
+                $this->compressCacheData = false;
+            }
+        }
 
-		/**
-		 * This is used to get the cache data using the key
-		 * @param  string $key the key to identify the cache data
-		 * @return mixed      the cache data if exists else return false
-		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
-			$filePath = $this->getFilePath($key);
-			if(! file_exists($filePath)){
-				$this->logger->info('No cache file found for the key ['. $key .'], return false');
-				return false;
-			}
-			$this->logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
-			$handle = fopen($filePath,'r');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
-				return false;
-			}
-			// Getting a shared lock 
-		    flock($handle, LOCK_SH);
-		    $data = file_get_contents($filePath);
-      		fclose($handle);
-      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
-		         // If unserializing somehow didn't work out, we'll delete the file
-		         unlink($filePath);
-		         return false;
-	      	}
-	      	if (time() > $data['expire']) {
-	      		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
-		        // Unlinking when the file was expired
-		        unlink($filePath);
-		        return false;
-		     }
-		     else{
-		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
-		     	return $data['data'];
-		     }
-		}
+        /**
+         * This is used to get the cache data using the key
+         * @param  string $key the key to identify the cache data
+         * @return mixed      the cache data if exists else return false
+         */
+        public function get($key){
+            $this->logger->debug('Getting cache data for key ['. $key .']');
+            $filePath = $this->getFilePath($key);
+            if(! file_exists($filePath)){
+                $this->logger->info('No cache file found for the key ['. $key .'], return false');
+                return false;
+            }
+            $this->logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
+            $handle = fopen($filePath,'r');
+            if(! is_resource($handle)){
+                $this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+                return false;
+            }
+            // Getting a shared lock 
+            flock($handle, LOCK_SH);
+            $data = file_get_contents($filePath);
+                fclose($handle);
+                $data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+                if (! $data) {
+                    $this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+                    // If unserializing somehow didn't work out, we'll delete the file
+                    unlink($filePath);
+                    return false;
+                }
+                if (time() > $data['expire']) {
+                    $this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+                // Unlinking when the file was expired
+                unlink($filePath);
+                return false;
+                }
+                else{
+                    $this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+                    return $data['data'];
+                }
+        }
 
 
-		/**
-		 * Save data to the cache
-		 * @param string  $key  the key to identify this cache data
-		 * @param mixed  $data the cache data
-		 * @param integer $ttl  the cache life time
-		 * @return boolean true if success otherwise will return false
-		 */
-		public function set($key, $data, $ttl = 0){
-			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
-			$filePath = $this->getFilePath($key);
-			$handle = fopen($filePath,'w');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
-				return false;
-			}
-			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
-			//Serializing along with the TTL
-		    $cacheData = serialize(array(
-									'mtime' => time(),
-									'expire' => $expire,
-									'data' => $data,
-									'ttl' => $ttl
-									)
-								);		   
-		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
-		    	fclose($handle);
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
-		    	fclose($handle);
-				chmod($filePath, 0640);
-				return true;
-		    }
-		}	
+        /**
+         * Save data to the cache
+         * @param string  $key  the key to identify this cache data
+         * @param mixed  $data the cache data
+         * @param integer $ttl  the cache life time
+         * @return boolean true if success otherwise will return false
+         */
+        public function set($key, $data, $ttl = 0){
+            $expire = time() + $ttl;
+            $this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+            $filePath = $this->getFilePath($key);
+            $handle = fopen($filePath,'w');
+            if(! is_resource($handle)){
+                $this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+                return false;
+            }
+            flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
+            //Serializing along with the TTL
+            $cacheData = serialize(array(
+                                    'mtime' => time(),
+                                    'expire' => $expire,
+                                    'data' => $data,
+                                    'ttl' => $ttl
+                                    )
+                                );		   
+            $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
+            if(! $result){
+                $this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+                fclose($handle);
+                return false;
+            }
+            else{
+                $this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+                fclose($handle);
+                chmod($filePath, 0640);
+                return true;
+            }
+        }	
 
 
-		/**
-		 * Delete the cache data for given key
-		 * @param  string $key the key for cache to be deleted
-		 * @return boolean      true if the cache is delete, false if can't delete 
-		 * the cache or the cache with the given key not exist
-		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
-			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
-				$this->logger->info('This cache file does not exists skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] remove it');
-	      		unlink($filePath);
-				return true;
-			}
-		}
+        /**
+         * Delete the cache data for given key
+         * @param  string $key the key for cache to be deleted
+         * @return boolean      true if the cache is delete, false if can't delete 
+         * the cache or the cache with the given key not exist
+         */
+        public function delete($key){
+            $this->logger->debug('Deleting of cache data for key [' .$key. ']');
+            $filePath = $this->getFilePath($key);
+            $this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
+            if(! file_exists($filePath)){
+                $this->logger->info('This cache file does not exists skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found cache file [' .$filePath. '] remove it');
+                    unlink($filePath);
+                return true;
+            }
+        }
 		
-		/**
-		 * Get the cache information for given key
-		 * @param  string $key the key for cache to get the information for
-		 * @return boolean|array    the cache information. The associative array and must contains the following information:
-		 * 'mtime' => creation time of the cache (Unix timestamp),
-		 * 'expire' => expiration time of the cache (Unix timestamp),
-		 * 'ttl' => the time to live of the cache in second
-		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
-			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
-				$this->logger->info('This cache file does not exists skipping');
-				return false;
-			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
-	      		$data = file_get_contents($filePath);
-				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-				if(! $data){
-					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
-					return false;
-				}
-				else{
-					$this->logger->info('This cache data is OK check for expire');
-					if(isset($data['expire']) && $data['expire'] > time()){
-						$this->logger->info('This cache not yet expired return cache informations');
-						$info = array(
-							'mtime' => $data['mtime'],
-							'expire' => $data['expire'],
-							'ttl' => $data['ttl']
-							);
-						return $info;
-					}
-					else{
-						$this->logger->info('This cache already expired return false');
-						return false;
-					}
-				}
-			}
-		}
+        /**
+         * Get the cache information for given key
+         * @param  string $key the key for cache to get the information for
+         * @return boolean|array    the cache information. The associative array and must contains the following information:
+         * 'mtime' => creation time of the cache (Unix timestamp),
+         * 'expire' => expiration time of the cache (Unix timestamp),
+         * 'ttl' => the time to live of the cache in second
+         */
+        public function getInfo($key){
+            $this->logger->debug('Getting of cache info for key [' .$key. ']');
+            $filePath = $this->getFilePath($key);
+            $this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
+            if(! file_exists($filePath)){
+                $this->logger->info('This cache file does not exists skipping');
+                return false;
+            }
+            else{
+                $this->logger->info('Found cache file [' .$filePath. '] check the validity');
+                    $data = file_get_contents($filePath);
+                $data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+                if(! $data){
+                    $this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
+                    return false;
+                }
+                else{
+                    $this->logger->info('This cache data is OK check for expire');
+                    if(isset($data['expire']) && $data['expire'] > time()){
+                        $this->logger->info('This cache not yet expired return cache informations');
+                        $info = array(
+                            'mtime' => $data['mtime'],
+                            'expire' => $data['expire'],
+                            'ttl' => $data['ttl']
+                            );
+                        return $info;
+                    }
+                    else{
+                        $this->logger->info('This cache already expired return false');
+                        return false;
+                    }
+                }
+            }
+        }
 
 
-		/**
-		 * Used to delete expired cache data
-		 */
-		public function deleteExpiredCache(){
-			$this->logger->debug('Deleting of expired cache files');
-			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
-				$this->logger->info('No cache files were found skipping');
-			}
-			else{
-				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
-				foreach ($list as $file) {
-					$this->logger->debug('Processing the cache file [' . $file . ']');
-					$data = file_get_contents($file);
-		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
-		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
-		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
-		      			unlink($file);
-		      		}
-		      		else{
-		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
-		      		}
-				}
-			}
-		}	
+        /**
+         * Used to delete expired cache data
+         */
+        public function deleteExpiredCache(){
+            $this->logger->debug('Deleting of expired cache files');
+            $list = glob(CACHE_PATH . '*.cache');
+            if(! $list){
+                $this->logger->info('No cache files were found skipping');
+            }
+            else{
+                $this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
+                foreach ($list as $file) {
+                    $this->logger->debug('Processing the cache file [' . $file . ']');
+                    $data = file_get_contents($file);
+                        $data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+                        if(! $data){
+                            $this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
+                        }
+                        else if(time() > $data['expire']){
+                            $this->logger->info('The cache data for file [' . $file . '] already expired remove it');
+                            unlink($file);
+                        }
+                        else{
+                            $this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
+                        }
+                }
+            }
+        }	
 
-		/**
-		 * Remove all file from cache folder
-		 */
-		public function clean(){
-			$this->logger->debug('Deleting of all cache files');
-			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
-				$this->logger->info('No cache files were found skipping');
-			}
-			else{
-				$this->logger->info('Found [' . count($list) . '] cache files to remove');
-				foreach ($list as $file) {
-					$this->logger->debug('Processing the cache file [' . $file . ']');
-					unlink($file);
-				}
-			}
-		}
+        /**
+         * Remove all file from cache folder
+         */
+        public function clean(){
+            $this->logger->debug('Deleting of all cache files');
+            $list = glob(CACHE_PATH . '*.cache');
+            if(! $list){
+                $this->logger->info('No cache files were found skipping');
+            }
+            else{
+                $this->logger->info('Found [' . count($list) . '] cache files to remove');
+                foreach ($list as $file) {
+                    $this->logger->debug('Processing the cache file [' . $file . ']');
+                    unlink($file);
+                }
+            }
+        }
 	
-	    /**
-	     * @return boolean
-	     */
-	    public function isCompressCacheData(){
-	        return $this->compressCacheData;
-	    }
+        /**
+         * @return boolean
+         */
+        public function isCompressCacheData(){
+            return $this->compressCacheData;
+        }
 
-	    /**
-	     * @param boolean $compressCacheData
-	     *
-	     * @return object
-	     */
-	    public function setCompressCacheData($status = true){
-			//if Zlib extension is not loaded set compressCacheData to false
-			if($status === true && ! extension_loaded('zlib')){
+        /**
+         * @param boolean $compressCacheData
+         *
+         * @return object
+         */
+        public function setCompressCacheData($status = true){
+            //if Zlib extension is not loaded set compressCacheData to false
+            if($status === true && ! extension_loaded('zlib')){
 				
-				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
-				$this->compressCacheData = false;
-			}
-			else{
-				$this->compressCacheData = $status;
-			}
-			return $this;
-	    }
+                $this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
+                $this->compressCacheData = false;
+            }
+            else{
+                $this->compressCacheData = $status;
+            }
+            return $this;
+        }
 		
-		/**
-		 * Check whether the cache feature for the handle is supported
-		 *
-		 * @return bool
-		 */
-		public function isSupported(){
-			return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
-		}
+        /**
+         * Check whether the cache feature for the handle is supported
+         *
+         * @return bool
+         */
+        public function isSupported(){
+            return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
+        }
 
-		/**
-	     * Return the Log instance
-	     * @return object
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+        /**
+         * Return the Log instance
+         * @return object
+         */
+        public function getLogger(){
+            return $this->logger;
+        }
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+        /**
+         * Set the log instance
+         * @param Log $logger the log object
+         */
+        public function setLogger(Log $logger){
+            $this->logger = $logger;
+            return $this;
+        }
 		
-		/**
-		* Get the cache file full path for the given key
-		*
-		* @param string $key the cache item key
-		* @return string the full cache file path for this key
-		*/
-		private function getFilePath($key){
-			return CACHE_PATH . md5($key) . '.cache';
-		}
-	}
+        /**
+         * Get the cache file full path for the given key
+         *
+         * @param string $key the cache item key
+         * @return string the full cache file path for this key
+         */
+        private function getFilePath($key){
+            return CACHE_PATH . md5($key) . '.cache';
+        }
+    }

Spacing +62 added lines, -62 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class FileCache implements CacheInterface{
+	class FileCache implements CacheInterface {
 		
 		/**
 		 * Whether to enable compression of the cache data file.
@@ -39,23 +39,23 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
 			}
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
 			
 			//if Zlib extension is not loaded set compressCacheData to false
-			if(! extension_loaded('zlib')){
+			if (!extension_loaded('zlib')) {
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
@@ -66,17 +66,17 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			if(! file_exists($filePath)){
-				$this->logger->info('No cache file found for the key ['. $key .'], return false');
+			if (!file_exists($filePath)) {
+				$this->logger->info('No cache file found for the key [' . $key . '], return false');
 				return false;
 			}
-			$this->logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
-			$handle = fopen($filePath,'r');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$this->logger->info('The cache file [' . $filePath . '] for the key [' . $key . '] exists, check if the cache data is valid');
+			$handle = fopen($filePath, 'r');
+			if (!is_resource($handle)) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			// Getting a shared lock 
@@ -84,20 +84,20 @@ 
 		    $data = file_get_contents($filePath);
       		fclose($handle);
       		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+      		if (!$data) {
+      			$this->logger->error('Can not unserialize the cache data for the key [' . $key . '], return false');
 		         // If unserializing somehow didn't work out, we'll delete the file
 		         unlink($filePath);
 		         return false;
 	      	}
 	      	if (time() > $data['expire']) {
-	      		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+	      		$this->logger->info('The cache data for the key [' . $key . '] already expired delete the cache file [' . $filePath . ']');
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
 		     }
-		     else{
-		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+		     else {
+		     	$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
 		}
@@ -110,13 +110,13 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$filePath = $this->getFilePath($key);
-			$handle = fopen($filePath,'w');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$handle = fopen($filePath, 'w');
+			if (!is_resource($handle)) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -129,13 +129,13 @@ 
 									)
 								);		   
 		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+		    if (!$result) {
+		    	$this->logger->error('Can not write cache data into file [' . $filePath . '] for the key [' . $key . '], return false');
 		    	fclose($handle);
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved into file [' . $filePath . '] for the key [' . $key . ']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
 				return true;
@@ -149,16 +149,16 @@ 
 		 * @return boolean      true if the cache is delete, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] remove it');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] remove it');
 	      		unlink($filePath);
 				return true;
 			}
@@ -172,25 +172,25 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-				if(! $data){
+				if (!$data) {
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
 				}
-				else{
+				else {
 					$this->logger->info('This cache data is OK check for expire');
-					if(isset($data['expire']) && $data['expire'] > time()){
+					if (isset($data['expire']) && $data['expire'] > time()) {
 						$this->logger->info('This cache not yet expired return cache informations');
 						$info = array(
 							'mtime' => $data['mtime'],
@@ -199,7 +199,7 @@ 
 							);
 						return $info;
 					}
-					else{
+					else {
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -211,26 +211,26 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			$this->logger->debug('Deleting of expired cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
+		      		if (!$data) {
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
 		      		}
-		      		else if(time() > $data['expire']){
+		      		else if (time() > $data['expire']) {
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			unlink($file);
 		      		}
-		      		else{
+		      		else {
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -240,13 +240,13 @@ 
 		/**
 		 * Remove all file from cache folder
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -258,7 +258,7 @@ 
 	    /**
 	     * @return boolean
 	     */
-	    public function isCompressCacheData(){
+	    public function isCompressCacheData() {
 	        return $this->compressCacheData;
 	    }
 
@@ -267,14 +267,14 @@ 
 	     *
 	     * @return object
 	     */
-	    public function setCompressCacheData($status = true){
+	    public function setCompressCacheData($status = true) {
 			//if Zlib extension is not loaded set compressCacheData to false
-			if($status === true && ! extension_loaded('zlib')){
+			if ($status === true && !extension_loaded('zlib')) {
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
-			else{
+			else {
 				$this->compressCacheData = $status;
 			}
 			return $this;
@@ -285,7 +285,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
 		}
 
@@ -293,7 +293,7 @@ 
 	     * Return the Log instance
 	     * @return object
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -301,7 +301,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -312,7 +312,7 @@ 
 		* @param string $key the cache item key
 		* @return string the full cache file path for this key
 		*/
-		private function getFilePath($key){
+		private function getFilePath($key) {
 			return CACHE_PATH . md5($key) . '.cache';
 		}
 	}

core/libraries/Benchmark.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Class for Benchmark
 	 */
-	class Benchmark{
+	class Benchmark {
 		/**
 		 * The markers for excution time
 		 * @var array
@@ -44,7 +44,7 @@ 
 		 * This method is used to mark one point for benchmark (execution time and memory usage)
 		 * @param  string $name the marker name
 		 */
-		public function mark($name){
+		public function mark($name) {
 			//Marker for execution time
 			$this->markersTime[$name] = microtime(true);
 			//Marker for memory usage
@@ -58,12 +58,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total execution time
 		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersTime[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersTime[$endMarkerName])){
+			if (!isset($this->markersTime[$endMarkerName])) {
 				$this->markersTime[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
@@ -76,12 +76,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total memory usage
 		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersMemory[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
+			if (!isset($this->markersMemory[$endMarkerName])) {
 				$this->markersMemory[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);

Indentation +81 added lines, -81 removed lines

@@ -1,89 +1,89 @@
 <?php
-	defined('ROOT_PATH') or 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') or 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 for Benchmark
-	 */
-	class Benchmark{
-		/**
-		 * The markers for excution time
-		 * @var array
-		 */
-		private $markersTime = array();
+    /**
+     * Class for Benchmark
+     */
+    class Benchmark{
+        /**
+         * The markers for excution time
+         * @var array
+         */
+        private $markersTime = array();
 		
-		/**
-		 * The markers for memory usage
-		 * @var array
-		 */
-		private $markersMemory = array();
+        /**
+         * The markers for memory usage
+         * @var array
+         */
+        private $markersMemory = array();
 		
-		/**
-		 * This method is used to mark one point for benchmark (execution time and memory usage)
-		 * @param  string $name the marker name
-		 */
-		public function mark($name){
-			//Marker for execution time
-			$this->markersTime[$name] = microtime(true);
-			//Marker for memory usage
-			$this->markersMemory[$name] = memory_get_usage(true);
-		}
+        /**
+         * This method is used to mark one point for benchmark (execution time and memory usage)
+         * @param  string $name the marker name
+         */
+        public function mark($name){
+            //Marker for execution time
+            $this->markersTime[$name] = microtime(true);
+            //Marker for memory usage
+            $this->markersMemory[$name] = memory_get_usage(true);
+        }
 		
-		/**
-		 * This method is used to get the total excution time in second between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total execution time
-		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total excution time in second between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total execution time
+         */
+        public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersTime[$endMarkerName])){
-				$this->markersTime[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
-		}
+            if(! isset($this->markersTime[$endMarkerName])){
+                $this->markersTime[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
+        }
 		
-		/**
-		 * This method is used to get the total memory usage in byte between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total memory usage
-		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total memory usage in byte between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total memory usage
+         */
+        public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
-				$this->markersMemory[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
-		}
-	}
+            if(! isset($this->markersMemory[$endMarkerName])){
+                $this->markersMemory[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
+        }
+    }

core/classes/Loader.php

Braces +17 added lines, -34 removed lines

@@ -148,8 +148,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -169,8 +168,7 @@ 
 					$searchModuleName = $path[0];
 					$class = ucfirst($path[1]);
 				}
-			}
-			else{
+			} else{
 				$class = ucfirst($class);
 			}
 
@@ -181,8 +179,7 @@ 
 			if($moduleModelFilePath){
 				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleModelFilePath. '] we will used it');
 				$classFilePath = $moduleModelFilePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
 			}
 			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
@@ -194,12 +191,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -227,8 +222,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -252,8 +246,7 @@ 
 				$libraryFilePath = CORE_LIBRARY_PATH . $file;
 				$class = ucfirst($class);
 				$logger->info('This library is a system library');
-			}
-			else{
+			} else{
 				$logger->info('This library is not a system library');	
 				//first check if this library is in the module
 				$logger->debug('Checking library [' . $class . '] from module list ...');
@@ -265,8 +258,7 @@ 
 						$searchModuleName = $path[0];
 						$class = ucfirst($path[1]);
 					}
-				}
-				else{
+				} else{
 					$class = ucfirst($class);
 				}
 				if(! $searchModuleName && !empty($obj->moduleName)){
@@ -276,8 +268,7 @@ 
 				if($moduleLibraryPath){
 					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
 					$libraryFilePath = $moduleLibraryPath;
-				}
-				else{
+				} else{
 					$logger->info('Cannot find library [' . $class . '] from modules using the default location');
 				}
 			}
@@ -301,12 +292,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -350,8 +339,7 @@ 
 			if($moduleFunctionPath){
 				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], the file path is [' .$moduleFunctionPath. '] we will used it');
 				$functionFilePath = $moduleFunctionPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
 			}
 			if(! $functionFilePath){
@@ -370,8 +358,7 @@ 
 				require_once $functionFilePath;
 				static::$loaded['function_' . $function] = $functionFilePath;
 				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find helper file [' . $file . ']');
 			}
 		}
@@ -414,8 +401,7 @@ 
 			if($moduleConfigPath){
 				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], the file path is [' .$moduleConfigPath. '] we will used it');
 				$configFilePath = $moduleConfigPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
 			}
 			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
@@ -424,8 +410,7 @@ 
 				if(! empty($config) && is_array($config)){
 					Config::setAll($config);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find config file ['. $configFilePath . ']');
 			}
 			static::$loaded['config_' . $filename] = $configFilePath;
@@ -483,8 +468,7 @@ 
 			if($moduleLanguagePath){
 				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLanguagePath. '] we will used it');
 				$languageFilePath = $moduleLanguagePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
 			}
 			if(! $languageFilePath){
@@ -511,8 +495,7 @@ 
 				}
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find language file [' . $file . ']');
 			}
 		}

Indentation +496 added lines, -496 removed lines

@@ -1,521 +1,521 @@
 <?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 Log
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        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();
+        }
 
-		/**
-		 * Get the logger singleton instance
-		 * @return Log the logger instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Loader');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * Get the logger singleton instance
+         * @return Log the logger instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Loader');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * 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){
-				//for module
-				if(strpos($class, '/') !== false){
-					$path = explode('/', $class);
-					if(isset($path[1])){
-						$instance = strtolower($path[1]);
-					}
-				}
-				else{
-					$instance = strtolower($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 ...');
-			$searchModuleName = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if(strpos($class, '/') !== false){
-				$path = explode('/', $class);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$searchModuleName = $path[0];
-					$class = ucfirst($path[1]);
-				}
-			}
-			else{
-				$class = ucfirst($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){
+                //for module
+                if(strpos($class, '/') !== false){
+                    $path = explode('/', $class);
+                    if(isset($path[1])){
+                        $instance = strtolower($path[1]);
+                    }
+                }
+                else{
+                    $instance = strtolower($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 ...');
+            $searchModuleName = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if(strpos($class, '/') !== false){
+                $path = explode('/', $class);
+                if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $searchModuleName = $path[0];
+                    $class = ucfirst($path[1]);
+                }
+            }
+            else{
+                $class = ucfirst($class);
+            }
 
-			if(! $searchModuleName && !empty($obj->moduleName)){
-				$searchModuleName = $obj->moduleName;
-			}
-			$moduleModelFilePath = Module::findModelFullPath($class, $searchModuleName);
-			if($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], 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 . ']');
-			}
-		}
+            if(! $searchModuleName && !empty($obj->moduleName)){
+                $searchModuleName = $obj->moduleName;
+            }
+            $moduleModelFilePath = Module::findModelFullPath($class, $searchModuleName);
+            if($moduleModelFilePath){
+                $logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], 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){
-				//for module
-				if(strpos($class, '/') !== false){
-					$path = explode('/', $class);
-					if(isset($path[1])){
-						$instance = strtolower($path[1]);
-					}
-				}
-				else{
-					$instance = strtolower($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();
-			//TODO for Database library
-			if(strtolower($class) == 'database'){
-				$logger->info('This is the Database library ...');
-				$dbInstance = & class_loader('Database', 'classes/database', $params);
-				$obj->{$instance} = $dbInstance;
-				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
-				$logger->debug('Checking library [' . $class . '] from module list ...');
-				$searchModuleName = null;
-				//check if the request class contains module name
-				if(strpos($class, '/') !== false){
-					$path = explode('/', $class);
-					if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
-						$searchModuleName = $path[0];
-						$class = ucfirst($path[1]);
-					}
-				}
-				else{
-					$class = ucfirst($class);
-				}
-				if(! $searchModuleName && !empty($obj->moduleName)){
-					$searchModuleName = $obj->moduleName;
-				}
-				$moduleLibraryPath = Module::findLibraryFullPath($class, $searchModuleName);
-				if($moduleLibraryPath){
-					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
-					$libraryFilePath = $moduleLibraryPath;
-				}
-				else{
-					$logger->info('Cannot find library [' . $class . '] from modules using the default location');
-				}
-			}
-			if(! $libraryFilePath){
-				$searchDir = array(LIBRARY_PATH);
-				foreach($searchDir as $dir){
-					$filePath = $dir . $file;
-					if(file_exists($filePath)){
-						$libraryFilePath = $filePath;
-						//is already found not to continue
-						break;
-					}
-				}
-			}
-			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
-			if($libraryFilePath){
-				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 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){
+                //for module
+                if(strpos($class, '/') !== false){
+                    $path = explode('/', $class);
+                    if(isset($path[1])){
+                        $instance = strtolower($path[1]);
+                    }
+                }
+                else{
+                    $instance = strtolower($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();
+            //TODO for Database library
+            if(strtolower($class) == 'database'){
+                $logger->info('This is the Database library ...');
+                $dbInstance = & class_loader('Database', 'classes/database', $params);
+                $obj->{$instance} = $dbInstance;
+                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
+                $logger->debug('Checking library [' . $class . '] from module list ...');
+                $searchModuleName = null;
+                //check if the request class contains module name
+                if(strpos($class, '/') !== false){
+                    $path = explode('/', $class);
+                    if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                        $searchModuleName = $path[0];
+                        $class = ucfirst($path[1]);
+                    }
+                }
+                else{
+                    $class = ucfirst($class);
+                }
+                if(! $searchModuleName && !empty($obj->moduleName)){
+                    $searchModuleName = $obj->moduleName;
+                }
+                $moduleLibraryPath = Module::findLibraryFullPath($class, $searchModuleName);
+                if($moduleLibraryPath){
+                    $logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+                    $libraryFilePath = $moduleLibraryPath;
+                }
+                else{
+                    $logger->info('Cannot find library [' . $class . '] from modules using the default location');
+                }
+            }
+            if(! $libraryFilePath){
+                $searchDir = array(LIBRARY_PATH);
+                foreach($searchDir as $dir){
+                    $filePath = $dir . $file;
+                    if(file_exists($filePath)){
+                        $libraryFilePath = $filePath;
+                        //is already found not to continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
+            if($libraryFilePath){
+                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 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 ...');
-			$searchModuleName = 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())){
-					$searchModuleName = $path[0];
-					$function = 'function_' . $path[1] . '.php';
-					$file = $path[0] . DS . 'function_'.$function.'.php';
-				}
-			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
-				$searchModuleName = $obj->moduleName;
-			}
-			$moduleFunctionPath = Module::findFunctionFullPath($function, $searchModuleName);
-			if($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], 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 ...');
+            $searchModuleName = 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())){
+                    $searchModuleName = $path[0];
+                    $function = 'function_' . $path[1] . '.php';
+                    $file = $path[0] . DS . 'function_'.$function.'.php';
+                }
+            }
+            if(! $searchModuleName && !empty($obj->moduleName)){
+                $searchModuleName = $obj->moduleName;
+            }
+            $moduleFunctionPath = Module::findFunctionFullPath($function, $searchModuleName);
+            if($moduleFunctionPath){
+                $logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], 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 ...');
-			$searchModuleName = 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())){
-					$searchModuleName = $path[0];
-					$filename = $path[1] . '.php';
-				}
-			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
-				$searchModuleName = $obj->moduleName;
-			}
-			$moduleConfigPath = Module::findConfigFullPath($filename, $searchModuleName);
-			if($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], 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);
-				}
-			}
-			else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
-			}
-			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);
-		}
+        /**
+         * 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 ...');
+            $searchModuleName = 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())){
+                    $searchModuleName = $path[0];
+                    $filename = $path[1] . '.php';
+                }
+            }
+            if(! $searchModuleName && !empty($obj->moduleName)){
+                $searchModuleName = $obj->moduleName;
+            }
+            $moduleConfigPath = Module::findConfigFullPath($filename, $searchModuleName);
+            if($moduleConfigPath){
+                $logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], 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);
+                }
+            }
+            else{
+                show_error('Unable to find config file ['. $configFilePath . ']');
+            }
+            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);
+        }
 
 
-		/**
-		 * 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;
-			}
-			//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;
-			}
-			$languageFilePath = null;
-			//first check if this language is in the module
-			$logger->debug('Checking language [' . $language . '] from module list ...');
-			$searchModuleName = 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())){
-					$searchModuleName = $path[0];
-					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS .$language;
-				}
-			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
-				$searchModuleName = $obj->moduleName;
-			}
-			$moduleLanguagePath = Module::findLanguageFullPath($language, $searchModuleName, $appLang);
-			if($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], 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;
-						//is already found not to continue
-						break;
-					}
-				}
-			}
-			$logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
-			if($languageFilePath){
-				$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 file [' . $file . ']');
-			}
-		}
+        /**
+         * 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;
+            }
+            //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;
+            }
+            $languageFilePath = null;
+            //first check if this language is in the module
+            $logger->debug('Checking language [' . $language . '] from module list ...');
+            $searchModuleName = 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())){
+                    $searchModuleName = $path[0];
+                    $language = 'lang_' . $path[1] . '.php';
+                    $file = $path[0] . DS .$language;
+                }
+            }
+            if(! $searchModuleName && !empty($obj->moduleName)){
+                $searchModuleName = $obj->moduleName;
+            }
+            $moduleLanguagePath = Module::findLanguageFullPath($language, $searchModuleName, $appLang);
+            if($moduleLanguagePath){
+                $logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], 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;
+                        //is already found not to continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
+            if($languageFilePath){
+                $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 file [' . $file . ']');
+            }
+        }
 
 
-		private function getResourcesFromAutoloadConfig(){
-			$autoloads = array();
-			$autoloads['config']    = array();
-			$autoloads['languages'] = array();
-			$autoloads['libraries'] = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			//loading of the resources in autoload.php 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;
-		}
+        private function getResourcesFromAutoloadConfig(){
+            $autoloads = array();
+            $autoloads['config']    = array();
+            $autoloads['languages'] = array();
+            $autoloads['libraries'] = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            //loading of the resources in autoload.php 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);
+            }
+        }
+    }

Spacing +102 added lines, -102 removed lines

@@ -23,7 +23,7 @@ 
 	 * 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{
+	class Loader {
 		
 		/**
 		 * List of loaded resources
@@ -38,7 +38,7 @@ 
 		private static $logger;
 
 
-		public function __construct(){
+		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();
@@ -51,9 +51,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Loader');
 			}
 			return self::$logger[0];
@@ -67,25 +67,25 @@ 
 		 *
 		 * @return void
 		 */
-		public static function model($class, $instance = null){
+		public static function model($class, $instance = null) {
 			$logger = static::getLogger();
 			$class = str_ireplace('.php', '', $class);
 			$class = trim($class, '/\\');
-			$file = ucfirst($class).'.php';
+			$file = ucfirst($class) . '.php';
 			$logger->debug('Loading model [' . $class . '] ...');
-			if(! $instance){
+			if (!$instance) {
 				//for module
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[1])){
+					if (isset($path[1])) {
 						$instance = strtolower($path[1]);
 					}
 				}
-				else{
+				else {
 					$instance = strtolower($class);
 				}
 			}
-			if(isset(static::$loaded[$instance])){
+			if (isset(static::$loaded[$instance])) {
 				$logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -95,43 +95,43 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($class, '/') !== false){
+			if (strpos($class, '/') !== false) {
 				$path = explode('/', $class);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$class = ucfirst($path[1]);
 				}
 			}
-			else{
+			else {
 				$class = ucfirst($class);
 			}
 
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleModelFilePath = Module::findModelFullPath($class, $searchModuleName);
-			if($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+			if ($moduleModelFilePath) {
+				$logger->info('Found model [' . $class . '] from module [' . $searchModuleName . '], the file path is [' . $moduleModelFilePath . '] we will used it');
 				$classFilePath = $moduleModelFilePath;
 			}
-			else{
+			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)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(class_exists($class)){
+				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('The file ' . $classFilePath . ' exists but does not contain the class [' . $class . ']');
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -146,31 +146,31 @@ 
 		 *
 		 * @return void
 		 */
-		public static function library($class, $instance = null, array $params = array()){
+		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';
+			$file = ucfirst($class) . '.php';
 			$logger->debug('Loading library [' . $class . '] ...');
-			if(! $instance){
+			if (!$instance) {
 				//for module
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[1])){
+					if (isset($path[1])) {
 						$instance = strtolower($path[1]);
 					}
 				}
-				else{
+				else {
 					$instance = strtolower($class);
 				}
 			}
-			if(isset(static::$loaded[$instance])){
+			if (isset(static::$loaded[$instance])) {
 				$logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
 			$obj = & get_instance();
 			//TODO for Database library
-			if(strtolower($class) == 'database'){
+			if (strtolower($class) == 'database') {
 				$logger->info('This is the Database library ...');
 				$dbInstance = & class_loader('Database', 'classes/database', $params);
 				$obj->{$instance} = $dbInstance;
@@ -180,44 +180,44 @@ 
 			}
 			$libraryFilePath = null;
 			$logger->debug('Check if this is a system library ...');
-			if(file_exists(CORE_LIBRARY_PATH . $file)){
+			if (file_exists(CORE_LIBRARY_PATH . $file)) {
 				$libraryFilePath = CORE_LIBRARY_PATH . $file;
 				$class = ucfirst($class);
 				$logger->info('This library is a system library');
 			}
-			else{
+			else {
 				$logger->info('This library is not a system library');	
 				//first check if this library is in the module
 				$logger->debug('Checking library [' . $class . '] from module list ...');
 				$searchModuleName = null;
 				//check if the request class contains module name
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+					if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 						$searchModuleName = $path[0];
 						$class = ucfirst($path[1]);
 					}
 				}
-				else{
+				else {
 					$class = ucfirst($class);
 				}
-				if(! $searchModuleName && !empty($obj->moduleName)){
+				if (!$searchModuleName && !empty($obj->moduleName)) {
 					$searchModuleName = $obj->moduleName;
 				}
 				$moduleLibraryPath = Module::findLibraryFullPath($class, $searchModuleName);
-				if($moduleLibraryPath){
-					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+				if ($moduleLibraryPath) {
+					$logger->info('Found library [' . $class . '] from module [' . $searchModuleName . '], the file path is [' . $moduleLibraryPath . '] we will used it');
 					$libraryFilePath = $moduleLibraryPath;
 				}
-				else{
+				else {
 					$logger->info('Cannot find library [' . $class . '] from modules using the default location');
 				}
 			}
-			if(! $libraryFilePath){
+			if (!$libraryFilePath) {
 				$searchDir = array(LIBRARY_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$libraryFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -225,20 +225,20 @@ 
 				}
 			}
 			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
-			if($libraryFilePath){
+			if ($libraryFilePath) {
 				require_once $libraryFilePath;
-				if(class_exists($class)){
+				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('The file ' . $libraryFilePath . ' exists but does not contain the class ' . $class);
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -250,14 +250,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function functions($function){
+		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';
+			$file = 'function_' . $function . '.php';
 			$logger->debug('Loading helper [' . $function . '] ...');
-			if(isset(static::$loaded['function_' . $function])){
+			if (isset(static::$loaded['function_' . $function])) {
 				$logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -267,30 +267,30 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($function, '/') !== false){
+			if (strpos($function, '/') !== false) {
 				$path = explode('/', $function);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$function = 'function_' . $path[1] . '.php';
-					$file = $path[0] . DS . 'function_'.$function.'.php';
+					$file = $path[0] . DS . 'function_' . $function . '.php';
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleFunctionPath = Module::findFunctionFullPath($function, $searchModuleName);
-			if($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+			if ($moduleFunctionPath) {
+				$logger->info('Found helper [' . $function . '] from module [' . $searchModuleName . '], the file path is [' . $moduleFunctionPath . '] we will used it');
 				$functionFilePath = $moduleFunctionPath;
 			}
-			else{
+			else {
 				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
 			}
-			if(! $functionFilePath){
+			if (!$functionFilePath) {
 				$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$functionFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -298,12 +298,12 @@ 
 				}
 			}
 			$logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
-			if($functionFilePath){
+			if ($functionFilePath) {
 				require_once $functionFilePath;
 				static::$loaded['function_' . $function] = $functionFilePath;
 				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
 			}
-			else{
+			else {
 				show_error('Unable to find helper file [' . $file . ']');
 			}
 		}
@@ -315,14 +315,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function config($filename){
+		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';
+			$file = 'config_' . $filename . '.php';
 			$logger->debug('Loading configuration [' . $filename . '] ...');
-			if(isset(static::$loaded['config_' . $filename])){
+			if (isset(static::$loaded['config_' . $filename])) {
 				$logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -332,34 +332,34 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($filename, '/') !== false){
+			if (strpos($filename, '/') !== false) {
 				$path = explode('/', $filename);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$filename = $path[1] . '.php';
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleConfigPath = Module::findConfigFullPath($filename, $searchModuleName);
-			if($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], the file path is [' .$moduleConfigPath. '] we will used it');
+			if ($moduleConfigPath) {
+				$logger->info('Found config [' . $filename . '] from module [' . $searchModuleName . '], the file path is [' . $moduleConfigPath . '] we will used it');
 				$configFilePath = $moduleConfigPath;
 			}
-			else{
+			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)){
+			if (file_exists($configFilePath)) {
 				require_once $configFilePath;
-				if(! empty($config) && is_array($config)){
+				if (!empty($config) && is_array($config)) {
 					Config::setAll($config);
 				}
 			}
-			else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
+			else {
+				show_error('Unable to find config file [' . $configFilePath . ']');
 			}
 			static::$loaded['config_' . $filename] = $configFilePath;
 			$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
@@ -375,14 +375,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function lang($language){
+		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';
+			$file = 'lang_' . $language . '.php';
 			$logger->debug('Loading language [' . $language . '] ...');
-			if(isset(static::$loaded['lang_' . $language])){
+			if (isset(static::$loaded['lang_' . $language])) {
 				$logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -392,7 +392,7 @@ 
 			$cfgKey = get_config('language_cookie_name');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang){
+			if ($cookieLang) {
 				$appLang = $cookieLang;
 			}
 			$languageFilePath = null;
@@ -401,30 +401,30 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($language, '/') !== false){
+			if (strpos($language, '/') !== false) {
 				$path = explode('/', $language);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS .$language;
+					$file = $path[0] . DS . $language;
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleLanguagePath = Module::findLanguageFullPath($language, $searchModuleName, $appLang);
-			if($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+			if ($moduleLanguagePath) {
+				$logger->info('Found language [' . $language . '] from module [' . $searchModuleName . '], the file path is [' . $moduleLanguagePath . '] we will used it');
 				$languageFilePath = $moduleLanguagePath;
 			}
-			else{
+			else {
 				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
 			}
-			if(! $languageFilePath){
+			if (!$languageFilePath) {
 				$searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $appLang . DS . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$languageFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -432,13 +432,13 @@ 
 				}
 			}
 			$logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
-			if($languageFilePath){
+			if ($languageFilePath) {
 				$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');
+				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 = & class_loader('Lang', 'classes');
 					$langObj->addLangMessages($lang);
 					//free the memory
 					unset($lang);
@@ -446,13 +446,13 @@ 
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
 			}
-			else{
+			else {
 				show_error('Unable to find language file [' . $file . ']');
 			}
 		}
 
 
-		private function getResourcesFromAutoloadConfig(){
+		private function getResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -460,17 +460,17 @@ 
 			$autoloads['models']    = array();
 			$autoloads['functions'] = array();
 			//loading of the resources in autoload.php configuration file
-			if(file_exists(CONFIG_PATH . 'autoload.php')){
+			if (file_exists(CONFIG_PATH . 'autoload.php')) {
 				$autoload = array();
 				require_once CONFIG_PATH . 'autoload.php';
-				if(! empty($autoload) && is_array($autoload)){
+				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)){
+			if (!empty($modulesAutoloads) && is_array($modulesAutoloads)) {
 				$autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
 			}
 			return $autoloads;
@@ -480,7 +480,7 @@ 
 		 * Load the autoload configuration
 		 * @return void
 		 */
-		private function loadResourcesFromAutoloadConfig(){
+		private function loadResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -513,7 +513,7 @@ 
 		 * @param  array  $resources the resource to load
 		 * @return void            
 		 */
-		private function loadAutoloadResourcesArray($method, array $resources){
+		private function loadAutoloadResourcesArray($method, array $resources) {
 			foreach ($resources as $name) {
 				$this->{$method}($name);
 			}