tnhfw / tnh-fw

core/common.php

Indentation +17 added lines, -17 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 *  @file common.php
@@ -438,13 +438,13 @@ 
 
 
 	/**
-	* Function to stringfy PHP variable, useful in debug situation
-	*
-	* @param mixed $var the variable to stringfy
-	* @codeCoverageIgnore
-	*
-	* @return string the stringfy value
-	*/
+	 * Function to stringfy PHP variable, useful in debug situation
+	 *
+	 * @param mixed $var the variable to stringfy
+	 * @codeCoverageIgnore
+	 *
+	 * @return string the stringfy value
+	 */
 	function stringfy_vars($var){
 		return print_r($var, true);
 	}
@@ -586,15 +586,15 @@ 
 	}
 	
 	/**
-	* This function is very useful, it allows to recover the instance of the global controller.
-	* Note this function always returns the address of the super instance.
-	* For example :
-	* $obj = & get_instance();
-	* 
-	* @codeCoverageIgnore
-	*  
-	* @return object the instance of the "Controller" class
-	*/
+	 * This function is very useful, it allows to recover the instance of the global controller.
+	 * Note this function always returns the address of the super instance.
+	 * For example :
+	 * $obj = & get_instance();
+	 * 
+	 * @codeCoverageIgnore
+	 *  
+	 * @return object the instance of the "Controller" class
+	 */
 	function & get_instance(){
 		return Controller::get_instance();
 	}

Spacing +68 added lines, -68 removed lines

@@ -53,14 +53,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
@@ -68,7 +68,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 . ']';
@@ -78,7 +78,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();
@@ -102,7 +102,7 @@ 
 	 */
 	function & class_loaded($class = null){
 		static $list = array();
-		if ($class !== null){
+		if ($class !== null) {
 			$list[strtolower($class)] = $class;
 		}
 		return $list;
@@ -117,14 +117,14 @@ 
 	 */
 	function & load_configurations(array $overwrite_values = array()){
 		static $config;
-		if (empty($config)){
+		if (empty($config)) {
 			$file = CONFIG_PATH . 'config.php';
 			$found = false;
-			if (file_exists($file)){
+			if (file_exists($file)) {
 				require_once $file;
 				$found = true;
 			}
-			if (! $found){
+			if (!$found) {
 				set_http_status_header(503);
 				echo 'Unable to find the configuration file [' . $file . ']';
 				die();
@@ -144,9 +144,9 @@ 
 	 * 
 	 * @return mixed          the config value
 	 */
-	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;
@@ -160,9 +160,9 @@ 
 	 * 
 	 * @codeCoverageIgnore
 	 */
-	function save_to_log($level, $message, $logger = null){
-		$log =& class_loader('Log', 'classes');
-		if ($logger){
+	function save_to_log($level, $message, $logger = null) {
+		$log = & class_loader('Log', 'classes');
+		if ($logger) {
 			$log->setLogger($logger);
 		}
 		$log->writeLog($message, $level);
@@ -175,8 +175,8 @@ 
 	 * 
 	 * @codeCoverageIgnore
 	 */
-	function set_http_status_header($code = 200, $text = null){
-		if (empty($text)){
+	function set_http_status_header($code = 200, $text = null) {
+		if (empty($text)) {
 			$http_status = array(
 								100 => 'Continue',
 								101 => 'Switching Protocols',
@@ -224,18 +224,18 @@ 
 								504 => 'Gateway Timeout',
 								505 => 'HTTP Version Not Supported',
 							);
-			if (isset($http_status[$code])){
+			if (isset($http_status[$code])) {
 				$text = $http_status[$code];
 			}
-			else{
+			else {
 				show_error('No HTTP status text found for your code please check it.');
 			}
 		}
 		
-		if (strpos(php_sapi_name(), 'cgi') === 0){
+		if (strpos(php_sapi_name(), 'cgi') === 0) {
 			header('Status: ' . $code . ' ' . $text, TRUE);
 		}
-		else{
+		else {
 			$proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 			header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
 		}
@@ -250,13 +250,13 @@ 
 	 *  
 	 *  @codeCoverageIgnore
 	 */
-	function show_error($msg, $title = 'error', $logging = true){
+	function show_error($msg, $title = 'error', $logging = true) {
 		$title = strtoupper($title);
 		$data = array();
 		$data['error'] = $msg;
 		$data['title'] = $title;
-		if ($logging){
-			save_to_log('error', '['.$title.'] '.strip_tags($msg), 'GLOBAL::ERROR');
+		if ($logging) {
+			save_to_log('error', '[' . $title . '] ' . strip_tags($msg), 'GLOBAL::ERROR');
 		}
 		$response = & class_loader('Response', 'classes');
 		$response->sendError($data);
@@ -270,18 +270,18 @@ 
 	 *  
 	 *  @return boolean true if the web server uses the https protocol, false if not.
 	 */
-	function is_https(){
+	function is_https() {
 		/*
 		* some servers pass the "HTTPS" parameter in the server variable,
 		* if is the case, check if the value is "on", "true", "1".
 		*/
-		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off'){
+		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
 			return true;
 		}
-		else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
+		else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			return true;
 		}
-		else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
+		else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
 			return true;
 		}
 		return false;
@@ -296,7 +296,7 @@ 
 	 *  
 	 *  @return boolean true if is a valid URL address or false.
 	 */
-	function is_url($url){
+	function is_url($url) {
 		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url) == 1;
 	}
 	
@@ -306,8 +306,8 @@ 
 	 *  @param string $controllerClass the controller class name to be loaded
 	 *  @codeCoverageIgnore
 	 */
-	function autoload_controller($controllerClass){
-		if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')){
+	function autoload_controller($controllerClass) {
+		if (file_exists($path = APPS_CONTROLLER_PATH . $controllerClass . '.php')) {
 			require_once $path;
 		}
 	}
@@ -321,11 +321,11 @@ 
 	 *  
 	 *  @return boolean
 	 */
-	function php_exception_handler($ex){
-		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
-			show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
+	function php_exception_handler($ex) {
+		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) {
+			show_error('An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
 		}
-		else{
+		else {
 			save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
 		}
 		return true;
@@ -342,16 +342,16 @@ 
 	 *  
 	 *  @return boolean	
 	 */
-	function php_error_handler($errno , $errstr, $errfile , $errline){
+	function php_error_handler($errno, $errstr, $errfile, $errline) {
 		$isError = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $errno) === $errno);
-		if ($isError){
+		if ($isError) {
 			set_http_status_header(500);
 		}
-		if (! (error_reporting() & $errno)) {
+		if (!(error_reporting() & $errno)) {
 			save_to_log('error', 'An error is occurred in the file ' . $errfile . ' at line ' . $errline . ' raison : ' . $errstr, 'PHP ERROR');
 			return;
 		}
-		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
+		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) {
 			$errorType = 'error';
 			switch ($errno) {
 				case E_USER_ERROR:
@@ -367,9 +367,9 @@ 
 					$errorType = 'error';
 					break;
 			}
-			show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline .'</b> raison : ' . $errstr, 'PHP ' . $errorType);
+			show_error('An error is occurred in the file <b>' . $errfile . '</b> at line <b>' . $errline . '</b> raison : ' . $errstr, 'PHP ' . $errorType);
 		}
-		if ($isError){
+		if ($isError) {
 			die();
 		}
 		return true;
@@ -379,10 +379,10 @@ 
 	 * This function is used to run in shutdown situation of the script
 	 * @codeCoverageIgnore
 	 */
-	function php_shudown_handler(){
+	function php_shudown_handler() {
 		$lastError = error_get_last();
 		if (isset($lastError) &&
-			($lastError['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING))){
+			($lastError['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING))) {
 			php_error_handler($lastError['type'], $lastError['message'], $lastError['file'], $lastError['line']);
 		}
 	}
@@ -400,11 +400,11 @@ 
 	 *   
 	 *  @return string string of the HTML attribute.
 	 */
-	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));
 				/*
@@ -414,10 +414,10 @@ 
 				* 	$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()
@@ -433,7 +433,7 @@ 
 	*
 	* @return string the stringfy value
 	*/
-	function stringfy_vars($var){
+	function stringfy_vars($var) {
 		return print_r($var, true);
 	}
 
@@ -444,18 +444,18 @@ 
 	 * 
 	 * @return mixed   the sanitize value
 	 */
-	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;
@@ -473,11 +473,11 @@ 
 	 * 
 	 * @return string the string with the hidden part.
 	 */
-	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
@@ -485,14 +485,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
@@ -505,40 +505,40 @@ 
 	 * This function is used to set the initial session config regarding the configuration
 	 * @codeCoverageIgnore
 	 */
-	function set_session_config(){
+	function set_session_config() {
 		//$_SESSION is not available on cli mode 
-		if (! IS_CLI){
-			$logger =& class_loader('Log', 'classes');
+		if (!IS_CLI) {
+			$logger = & class_loader('Log', 'classes');
 			$logger->setLogger('PHPSession');
 			//set session params
 			$sessionHandler = get_config('session_handler', 'files'); //the default is to store in the files
 			$sessionName = get_config('session_name');
-			if ($sessionName){
+			if ($sessionName) {
 				session_name($sessionName);
 			}
 			$logger->info('Session handler: ' . $sessionHandler);
 			$logger->info('Session name: ' . $sessionName);
 
-			if ($sessionHandler == 'files'){
+			if ($sessionHandler == 'files') {
 				$sessionSavePath = get_config('session_save_path');
-				if ($sessionSavePath){
-					if (! is_dir($sessionSavePath)){
+				if ($sessionSavePath) {
+					if (!is_dir($sessionSavePath)) {
 						mkdir($sessionSavePath, 1773);
 					}
 					session_save_path($sessionSavePath);
 					$logger->info('Session save path: ' . $sessionSavePath);
 				}
 			}
-			else if ($sessionHandler == 'database'){
+			else if ($sessionHandler == 'database') {
 				//load database session handle library
 				//Database Session handler Model
 				require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
 
-				$DBS =& class_loader('DBSessionHandler', 'classes');
+				$DBS = & class_loader('DBSessionHandler', 'classes');
 				session_set_save_handler($DBS, true);
 				$logger->info('session save path: ' . get_config('session_save_path'));
 			}
-			else{
+			else {
 				show_error('Invalid session handler configuration');
 			}
 			$lifetime = get_config('session_cookie_lifetime', 0);
@@ -561,9 +561,9 @@ 
 			$logger->info('Session lifetime: ' . $lifetime);
 			$logger->info('Session cookie path: ' . $path);
 			$logger->info('Session domain: ' . $domain);
-			$logger->info('Session is secure: ' . ($secure ? 'TRUE':'FALSE'));
+			$logger->info('Session is secure: ' . ($secure ? 'TRUE' : 'FALSE'));
 			
-			if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()){
+			if ((function_exists('session_status') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) {
 				$logger->info('Session not yet start, start it now');
 				session_start();
 			}

Braces +9 added lines, -18 removed lines

@@ -226,16 +226,14 @@ 
 							);
 			if (isset($http_status[$code])){
 				$text = $http_status[$code];
-			}
-			else{
+			} else{
 				show_error('No HTTP status text found for your code please check it.');
 			}
 		}
 		
 		if (strpos(php_sapi_name(), 'cgi') === 0){
 			header('Status: ' . $code . ' ' . $text, TRUE);
-		}
-		else{
+		} else{
 			$proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 			header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
 		}
@@ -277,11 +275,9 @@ 
 		*/
 		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off'){
 			return true;
-		}
-		else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
+		} else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
 			return true;
-		}
-		else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
+		} else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
 			return true;
 		}
 		return false;
@@ -324,8 +320,7 @@ 
 	function php_exception_handler($ex){
 		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
 			show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
-		}
-		else{
+		} else{
 			save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
 		}
 		return true;
@@ -447,15 +442,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;
@@ -528,8 +521,7 @@ 
 					session_save_path($sessionSavePath);
 					$logger->info('Session save path: ' . $sessionSavePath);
 				}
-			}
-			else if ($sessionHandler == 'database'){
+			} else if ($sessionHandler == 'database'){
 				//load database session handle library
 				//Database Session handler Model
 				require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
@@ -537,8 +529,7 @@ 
 				$DBS =& class_loader('DBSessionHandler', 'classes');
 				session_set_save_handler($DBS, true);
 				$logger->info('session save path: ' . get_config('session_save_path'));
-			}
-			else{
+			} else{
 				show_error('Invalid session handler configuration');
 			}
 			$lifetime = get_config('session_cookie_lifetime', 0);

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);
 			}

Indentation +84 added lines, -84 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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)
@@ -76,27 +76,27 @@ 
 		private $logger;
 
 		/**
-         * Instance of the Loader class
-         * @var Loader
-         */
-        protected $loader = null;
+		 * 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();
+			 * 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)){
@@ -199,9 +199,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
@@ -238,9 +238,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
@@ -324,75 +324,75 @@ 
 
 		
 		/**
-         * Return the loader instance
-         * @return object Loader the loader instance
-         */
-        public function getLoader(){
-            return $this->loader;
-        }
-
-        /**
-         * set the loader instance for future use
-         * @param object Loader $loader the loader object
-         */
-         public function setLoader($loader){
-            $this->loader = $loader;
-            return $this;
-        }
-
-        /**
-         * Return the model instance
-         * @return object DBSessionHandlerModel the model instance
-         */
-        public function getModelInstance(){
-            return $this->modelInstanceName;
-        }
-
-        /**
-         * set the model instance for future use
-         * @param DBSessionHandlerModel $modelInstance the model object
-         */
-         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');
+		 * Return the loader instance
+		 * @return object Loader the loader instance
+		 */
+		public function getLoader(){
+			return $this->loader;
+		}
+
+		/**
+		 * set the loader instance for future use
+		 * @param object Loader $loader the loader object
+		 */
+		 public function setLoader($loader){
+			$this->loader = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the model instance
+		 * @return object DBSessionHandlerModel the model instance
+		 */
+		public function getModelInstance(){
+			return $this->modelInstanceName;
+		}
+
+		/**
+		 * set the model instance for future use
+		 * @param DBSessionHandlerModel $modelInstance the model object
+		 */
+		 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'); 
-            }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
+				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
 			
 			//set model instance
 			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
+		}
 	}

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
 			

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();

core/classes/cache/ApcCache.php

Indentation +37 added lines, -37 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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{
 
@@ -39,15 +39,15 @@ 
 			}
 
 			/**
-	         * 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');
+			}
 		}
 
 		/**
@@ -87,13 +87,13 @@ 
 			$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;
-		    }
+				$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;
+			}
 		}
 
 
@@ -112,7 +112,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key) === true;
+		  		return apc_delete($key) === true;
 			}
 		}
 		
@@ -177,28 +177,28 @@ 
 		}
 
 		/**
-	     * 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
-		*/
+		 * 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'])){

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');
 			}

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 +86 added lines, -86 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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{
 		
@@ -44,15 +44,15 @@ 
 				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');
-	        }
+			 * 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')){
@@ -80,26 +80,26 @@ 
 				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'];
-		     }
+			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'];
+			 }
 		}
 
 
@@ -121,25 +121,25 @@ 
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
 			//Serializing along with the TTL
-		    $cacheData = serialize(array(
+			$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);
+			$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;
-		    }
+			}
 		}	
 
 
@@ -159,7 +159,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
-	      		unlink($filePath);
+		  		unlink($filePath);
 				return true;
 			}
 		}
@@ -182,7 +182,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
-	      		$data = file_get_contents($filePath);
+		  		$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 . ']');
@@ -222,17 +222,17 @@ 
 				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');
-		      		}
+			  		$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');
+			  		}
 				}
 			}
 		}	
@@ -255,19 +255,19 @@ 
 			}
 		}
 	
-	    /**
-	     * @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){
+		/**
+		 * @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')){
 				
@@ -278,7 +278,7 @@ 
 				$this->compressCacheData = $status;
 			}
 			return $this;
-	    }
+		}
 		
 		/**
 		 * Check whether the cache feature for the handle is supported
@@ -290,28 +290,28 @@ 
 		}
 
 		/**
-	     * 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 $key the cache item key
-		* @return string
-		*/
+		 * Get the cache file full path for the given key
+		 *
+		 * @param $key the cache item key
+		 * @return string
+		 */
 		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 $key the cache item key
 		* @return string
 		*/
-		private function getFilePath($key){
+		private function getFilePath($key) {
 			return CACHE_PATH . md5($key) . '.cache';
 		}
 	}

core/classes/Response.php

Indentation +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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 Response{
 
@@ -57,9 +57,9 @@ 
 		private $_currentUrlCacheKey = null;
 		
 		/**
-		* Whether we can compress the output using Gzip
-		* @var boolean
-		*/
+		 * Whether we can compress the output using Gzip
+		 * @var boolean
+		 */
 		private static $_canCompressOutput = false;
 		
 		/**
@@ -236,8 +236,8 @@ 
 		}
 		
 		/**
-		* Send the final page output to user
-		*/
+		 * Send the final page output to user
+		 */
 		public function renderFinalPage(){
 			$logger = self::getLogger();
 			$obj = & get_instance();
@@ -301,8 +301,8 @@ 
 		}
 		
 		/**
-		* Send the final page output to user if is cached
-		*/
+		 * Send the final page output to user if is cached
+		 */
 		public function renderFinalPageFromCache(&$cache){
 			$logger = self::getLogger();
 			$url = $this->_currentUrl;					
@@ -362,9 +362,9 @@ 
 		}
 		
 		/**
-		* Get the final page to be rendered
-		* @return string
-		*/
+		 * Get the final page to be rendered
+		 * @return string
+		 */
 		public function getFinalPageRendered(){
 			return $this->_pageRender;
 		}

Spacing +74 added lines, -74 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Response{
+	class Response {
 
 		/**
 		 * The list of request header to send with response
@@ -65,9 +65,9 @@ 
 		/**
 		 * Construct new response instance
 		 */
-		public function __construct(){
-			$this->_currentUrl =  (! empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '' )
-					. (! empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '' );
+		public function __construct() {
+			$this->_currentUrl = (!empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '')
+					. (!empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '');
 					
 			$this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
@@ -82,9 +82,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::Response');
 			}
 			return self::$logger[0];
@@ -95,12 +95,12 @@ 
 		 * @param  integer $httpCode the HTTP status code
 		 * @param  array   $headers   the additional headers to add to the existing headers list
 		 */
-		public static function sendHeaders($httpCode = 200, array $headers = array()){
+		public static function sendHeaders($httpCode = 200, array $headers = array()) {
 			set_http_status_header($httpCode);
 			self::setHeaders($headers);
-			if(! headers_sent()){
-				foreach(self::getHeaders() as $key => $value){
-					header($key .': '.$value);
+			if (!headers_sent()) {
+				foreach (self::getHeaders() as $key => $value) {
+					header($key . ': ' . $value);
 				}
 			}
 		}
@@ -109,7 +109,7 @@ 
 		 * Get the list of the headers
 		 * @return array the headers list
 		 */
-		public static function getHeaders(){
+		public static function getHeaders() {
 			return self::$headers;
 		}
 
@@ -118,7 +118,7 @@ 
 		 * @param  string $name the header name
 		 * @return string       the header value
 		 */
-		public static function getHeader($name){
+		public static function getHeader($name) {
 			return array_key_exists($name, self::$headers) ? self::$headers[$name] : null;
 		}
 
@@ -128,7 +128,7 @@ 
 		 * @param string $name  the header name
 		 * @param string $value the header value to be set
 		 */
-		public static function setHeader($name, $value){
+		public static function setHeader($name, $value) {
 			self::$headers[$name] = $value;
 		}
 
@@ -137,7 +137,7 @@ 
 		 * @param array $headers the list of the headers to set. 
 		 * Note: this will merge with the existing headers
 		 */
-		public static function setHeaders(array $headers){
+		public static function setHeaders(array $headers) {
 			self::$headers = array_merge(self::getHeaders(), $headers);
 		}
 		
@@ -145,17 +145,17 @@ 
 		 * Redirect user in the specified page
 		 * @param  string $path the URL or URI to be redirect to
 		 */
-		public static function redirect($path = ''){
+		public static function redirect($path = '') {
 			$logger = self::getLogger();
 			$url = Url::site_url($path);
-			$logger->info('Redirect to URL [' .$url. ']');
-			if(! headers_sent()){
-				header('Location: '.$url);
+			$logger->info('Redirect to URL [' . $url . ']');
+			if (!headers_sent()) {
+				header('Location: ' . $url);
 				exit;
 			}
-			else{
+			else {
 				echo '<script>
-						location.href = "'.$url.'";
+						location.href = "'.$url . '";
 					</script>';
 			}
 		}
@@ -168,10 +168,10 @@ 
 		 * @return void|string          if $return is true will return the view content otherwise
 		 * will display the view content.
 		 */
-		public function render($view, $data = null, $return = false){
+		public function render($view, $data = null, $return = false) {
 			$logger = self::getLogger();
 			//convert data to an array
-			$data = ! is_array($data) ? (array) $data : $data;
+			$data = !is_array($data) ? (array) $data : $data;
 			$view = str_ireplace('.php', '', $view);
 			$view = trim($view, '/\\');
 			$viewFile = $view . '.php';
@@ -180,42 +180,42 @@ 
 			//super instance
 			$obj = & get_instance();
 			
-			if(Module::hasModule()){
+			if (Module::hasModule()) {
 				//check in module first
 				$logger->debug('Checking the view [' . $view . '] from module list ...');
 				$mod = null;
 				//check if the request class contains module name
-				if(strpos($view, '/') !== false){
+				if (strpos($view, '/') !== false) {
 					$viewPath = explode('/', $view);
-					if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
+					if (isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())) {
 						$mod = $viewPath[0];
 						array_shift($viewPath);
 						$view = implode('/', $viewPath);
 						$viewFile = $view . '.php';
 					}
 				}
-				if(! $mod && !empty($obj->moduleName)){
+				if (!$mod && !empty($obj->moduleName)) {
 					$mod = $obj->moduleName;
 				}
-				if($mod){
+				if ($mod) {
 					$moduleViewPath = Module::findViewFullPath($view, $mod);
-					if($moduleViewPath){
+					if ($moduleViewPath) {
 						$path = $moduleViewPath;
-						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
+						$logger->info('Found view [' . $view . '] in module [' . $mod . '], the file path is [' . $moduleViewPath . '] we will used it');
 					}
-					else{
-						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
+					else {
+						$logger->info('Cannot find view [' . $view . '] in module [' . $mod . '] using the default location');
 					}
 				}
-				else{
+				else {
 					$logger->info('The current request does not use module using the default location.');
 				}
 			}
 			$logger->info('The view file path to be loaded is [' . $path . ']');
 			$found = false;
-			if(file_exists($path)){
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
+			if (file_exists($path)) {
+				foreach (get_object_vars($obj) as $key => $value) {
+					if (!isset($this->{$key})) {
 						$this->{$key} = & $obj->{$key};
 					}
 				}
@@ -224,44 +224,44 @@ 
 				//need use require() instead of require_once because can load this view many time
 				require $path;
 				$content = ob_get_clean();
-				if($return){
+				if ($return) {
 					return $content;
 				}
 				$this->_pageRender .= $content;
 				$found = true;
 			}
-			if(! $found){
-				show_error('Unable to find view [' .$view . ']');
+			if (!$found) {
+				show_error('Unable to find view [' . $view . ']');
 			}
 		}
 		
 		/**
 		* Send the final page output to user
 		*/
-		public function renderFinalPage(){
+		public function renderFinalPage() {
 			$logger = self::getLogger();
 			$obj = & get_instance();
 			$cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
 			$dispatcher = $obj->eventdispatcher;
 			$content = $this->_pageRender;
-			if(! $content){
+			if (!$content) {
 				$logger->warning('The final view content is empty.');
 				return;
 			}
 			//dispatch
 			$event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
-			$content = ! empty($event->payload) ? $event->payload : null;
-			if(empty($content)){
+			$content = !empty($event->payload) ? $event->payload : null;
+			if (empty($content)) {
 				$logger->warning('The view content is empty after dispatch to event listeners.');
 			}
 			
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				//current page URL
 				$url = $this->_currentUrl;
 				//Cache view Time to live in second
 				$viewCacheTtl = get_config('cache_ttl');
-				if (!empty($obj->view_cache_ttl)){
+				if (!empty($obj->view_cache_ttl)) {
 					$viewCacheTtl = $obj->view_cache_ttl;
 				}
 				//the cache handler instance
@@ -274,14 +274,14 @@ 
 				
 				//get the cache information to prepare header to send to browser
 				$cacheInfo = $cacheInstance->getInfo($cacheKey);
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$lastModified = $cacheInfo['mtime'];
 					$expire = $cacheInfo['expire'];
 					$maxAge = $expire - time();
 					self::setHeader('Pragma', 'public');
 					self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-					self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-					self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');	
+					self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+					self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');	
 				}
 			}
 			
@@ -293,7 +293,7 @@ 
 			
 			//compress the output if is available
 			$type = null;
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				$type = 'ob_gzhandler';
 			}
 			ob_start($type);
@@ -305,7 +305,7 @@ 
 		/**
 		* Send the final page output to user if is cached
 		*/
-		public function renderFinalPageFromCache(&$cache){
+		public function renderFinalPageFromCache(&$cache) {
 			$logger = self::getLogger();
 			$url = $this->_currentUrl;					
 			//the current page cache key for identification
@@ -314,25 +314,25 @@ 
 			$logger->debug('Checking if the page content for the URL [' . $url . '] is cached ...');
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$lastModified = $cacheInfo['mtime'];
 				$expire = $cacheInfo['expire'];
 				$maxAge = $expire - $_SERVER['REQUEST_TIME'];
 				self::setHeader('Pragma', 'public');
 				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
-				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
+				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 					$logger->info('The cache page content is not yet expire for the URL [' . $url . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return;
 				}
-				else{
+				else {
 					$logger->info('The cache page content is expired or the browser don\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $url . '] send cache headers to tell the browser');
 					self::sendHeaders(200);
 					//get the cache content
 					$content = $cache->get($pageCacheKey);
-					if($content){
+					if ($content) {
 						$logger->info('The page content for the URL [' . $url . '] already cached just display it');
 						//load benchmark class
 						$benchmark = & class_loader('Benchmark');
@@ -345,17 +345,17 @@ 
 						
 						///display the final output
 						//compress the output if is available
-						if (self::$_canCompressOutput){
+						if (self::$_canCompressOutput) {
 							ob_start('ob_gzhandler');
 						}
-						else{
+						else {
 							ob_start();
 						}
 						echo $content;
 						ob_end_flush();
 						return;
 					}
-					else{
+					else {
 						$logger->info('The page cache content for the URL [' . $url . '] is not valid may be already expired');
 						$cache->delete($pageCacheKey);
 					}
@@ -367,7 +367,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -375,14 +375,14 @@ 
 		 * Send the HTTP 404 error if can not found the 
 		 * routing information for the current request
 		 */
-		public static function send404(){
+		public static function send404() {
 			/********* for logs **************/
 			//can't use $obj = & get_instance()  here because the global super object will be available until
 			//the main controller is loaded even for Loader::library('xxxx');
 			$logger = self::getLogger();
-			$request =& class_loader('Request', 'classes');
-			$userAgent =& class_loader('Browser');
-			$browser = $userAgent->getPlatform().', '.$userAgent->getBrowser().' '.$userAgent->getVersion();
+			$request = & class_loader('Request', 'classes');
+			$userAgent = & class_loader('Browser');
+			$browser = $userAgent->getPlatform() . ', ' . $userAgent->getBrowser() . ' ' . $userAgent->getVersion();
 			
 			//here can't use Loader::functions just include the helper manually
 			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
@@ -392,12 +392,12 @@ 
 			$logger->error($str);
 			/***********************************/
 			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				require_once $path;
@@ -405,8 +405,8 @@ 
 				self::sendHeaders(404);
 				echo $output;
 			}
-			else{
-				show_error('The 404 view [' .$path. '] does not exist');
+			else {
+				show_error('The 404 view [' . $path . '] does not exist');
 			}
 		}
 
@@ -414,14 +414,14 @@ 
 		 * Display the error to user
 		 * @param  array  $data the error information
 		 */
-		public static function sendError(array $data = array()){
+		public static function sendError(array $data = array()) {
 			$path = CORE_VIEWS_PATH . 'errors.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if exists
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				extract($data);
@@ -430,7 +430,7 @@ 
 				self::sendHeaders(503);
 				echo $output;
 			}
-			else{
+			else {
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';

Braces +10 added lines, -20 removed lines

@@ -152,8 +152,7 @@ 
 			if(! headers_sent()){
 				header('Location: '.$url);
 				exit;
-			}
-			else{
+			} else{
 				echo '<script>
 						location.href = "'.$url.'";
 					</script>';
@@ -202,12 +201,10 @@ 
 					if($moduleViewPath){
 						$path = $moduleViewPath;
 						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
-					}
-					else{
+					} else{
 						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
 					}
-				}
-				else{
+				} else{
 					$logger->info('The current request does not use module using the default location.');
 				}
 			}
@@ -326,8 +323,7 @@ 
 					$logger->info('The cache page content is not yet expire for the URL [' . $url . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return;
-				}
-				else{
+				} else{
 					$logger->info('The cache page content is expired or the browser don\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $url . '] send cache headers to tell the browser');
 					self::sendHeaders(200);
 					//get the cache content
@@ -347,15 +343,13 @@ 
 						//compress the output if is available
 						if (self::$_canCompressOutput){
 							ob_start('ob_gzhandler');
-						}
-						else{
+						} else{
 							ob_start();
 						}
 						echo $content;
 						ob_end_flush();
 						return;
-					}
-					else{
+					} else{
 						$logger->info('The page cache content for the URL [' . $url . '] is not valid may be already expired');
 						$cache->delete($pageCacheKey);
 					}
@@ -396,16 +390,14 @@ 
 				//compress the output if is available
 				if (self::$_canCompressOutput){
 					ob_start('ob_gzhandler');
-				}
-				else{
+				} else{
 					ob_start();
 				}
 				require_once $path;
 				$output = ob_get_clean();
 				self::sendHeaders(404);
 				echo $output;
-			}
-			else{
+			} else{
 				show_error('The 404 view [' .$path. '] does not exist');
 			}
 		}
@@ -420,8 +412,7 @@ 
 				//compress the output if exists
 				if (self::$_canCompressOutput){
 					ob_start('ob_gzhandler');
-				}
-				else{
+				} else{
 					ob_start();
 				}
 				extract($data);
@@ -429,8 +420,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(503);
 				echo $output;
-			}
-			else{
+			} else{
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';

core/classes/Router.php

Braces +12 added lines, -24 removed lines

@@ -104,8 +104,7 @@ 
 					$this->routes = $route;
 					unset($route);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
@@ -115,8 +114,7 @@ 
 			if($modulesRoutes && is_array($modulesRoutes)){
 				$this->routes = array_merge($this->routes, $modulesRoutes);
 				$this->logger->info('Routes for all modules loaded successfully');
-			}
-			else{
+			} else{
 				$this->logger->info('No routes found for all modules skipping.');
 			}
 			$this->logger->info('The routes configuration are listed below: ' . stringfy_vars($this->routes));
@@ -132,8 +130,7 @@ 
 			if($suffix = get_config('url_suffix')){
 				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
 				$uri = str_ireplace($suffix, '', $uri);
-			}
-			else{
+			} else{
 				$this->logger->info('URL suffix is not enabled in the configuration');
 			}
 			if(strpos($uri, '?') !== false){
@@ -226,8 +223,7 @@ 
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
-			}
-			else{
+			} else{
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
@@ -249,8 +245,7 @@ 
 						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
-					}
-					else{
+					} else{
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
@@ -297,8 +292,7 @@ 
 						}
 						//args
 						$this->args = $segment;
-					}
-					else{
+					} else{
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
 						if(in_array($segment[0], $modules)){
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
@@ -312,8 +306,7 @@ 
 								if(! $path){
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
-								}
-								else{
+								} else{
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
@@ -325,8 +318,7 @@ 
 							}
 							//the remaining is for args
 							$this->args = $segment;
-						}
-						else{
+						} else{
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
 							if(isset($segment[0])){
@@ -354,8 +346,7 @@ 
 				//if it is the module controller
 				if($this->getModule()){
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-				}
-				else{
+				} else{
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -370,15 +361,13 @@ 
 				if(! class_exists($controller, false)){
 					$e404 = true;
 					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
-				}
-				else{
+				} else{
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
 					if(! method_exists($controllerInstance, $controllerMethod)){
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
-					}
-					else{
+					} else{
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -387,8 +376,7 @@ 
 						$obj->response->renderFinalPage();
 					}
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}

Indentation +15 added lines, -15 removed lines

@@ -22,23 +22,23 @@ 
 	 * 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 Router {
 		
 		/**
-		* @var array $pattern: The list of URIs to validate against
-		*/
+		 * @var array $pattern: The list of URIs to validate against
+		 */
 		private $pattern = array();
 
 		/**
-		* @var array $callback: The list of callback to call
-		*/
+		 * @var array $callback: The list of callback to call
+		 */
 		private $callback = array();
 
 		/**
-		* @var string $uriTrim: The char to remove from the URIs
-		*/
+		 * @var string $uriTrim: The char to remove from the URIs
+		 */
 		protected $uriTrim = '/\^$';
 
 		/**
@@ -94,9 +94,9 @@ 
 		 */
 		public function __construct(){
 			$this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Router');
-	        $routesPath = CONFIG_PATH . 'routes.php';
-	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
+			$this->logger->setLogger('Library::Router');
+			$routesPath = CONFIG_PATH . 'routes.php';
+			$this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
 			if(file_exists($routesPath)){
 				$this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
 				$route = array();
@@ -145,11 +145,11 @@ 
 		}
 
 		/**
-		* Add the URI and callback to the list of URIs to validate
-		*
-		* @param string $uri the request URI
-		* @param object $callback the callback function
-		*/
+		 * Add the URI and callback to the list of URIs to validate
+		 *
+		 * @param string $uri the request URI
+		 * @param object $callback the callback function
+		 */
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
 			if(in_array($uri, $this->pattern)){

Spacing +59 added lines, -59 removed lines

@@ -92,37 +92,37 @@ 
 		/**
 		 * Construct the new Router instance
 		 */
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+			$this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Router');
 	        $routesPath = CONFIG_PATH . 'routes.php';
 	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
-			if(file_exists($routesPath)){
-				$this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
+			if (file_exists($routesPath)) {
+				$this->logger->info('Found routes configuration file --> ' . $routesPath . ' now load it');
 				$route = array();
 				require_once $routesPath;
-				if(! empty($route) && is_array($route)){
+				if (!empty($route) && is_array($route)) {
 					$this->routes = $route;
 					unset($route);
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
 			//loading routes for module
 			$this->logger->debug('Loading of modules routes ... ');
 			$modulesRoutes = Module::getModulesRoutes();
-			if($modulesRoutes && is_array($modulesRoutes)){
+			if ($modulesRoutes && is_array($modulesRoutes)) {
 				$this->routes = array_merge($this->routes, $modulesRoutes);
 				$this->logger->info('Routes for all modules loaded successfully');
 			}
-			else{
+			else {
 				$this->logger->info('No routes found for all modules skipping.');
 			}
 			$this->logger->info('The routes configuration are listed below: ' . stringfy_vars($this->routes));
 
-			foreach($this->routes as $pattern => $callback){
+			foreach ($this->routes as $pattern => $callback) {
 				$this->add($pattern, $callback);
 			}
 			
@@ -130,14 +130,14 @@ 
 			$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 			$this->logger->debug('Check if URL suffix is enabled in the configuration');
 			//remove url suffix from the request URI
-			if($suffix = get_config('url_suffix')){
-				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
+			if ($suffix = get_config('url_suffix')) {
+				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']');
 				$uri = str_ireplace($suffix, '', $uri);
 			}
-			else{
+			else {
 				$this->logger->info('URL suffix is not enabled in the configuration');
 			}
-			if(strpos($uri, '?') !== false){
+			if (strpos($uri, '?') !== false) {
 				$uri = substr($uri, 0, strpos($uri, '?'));
 			}
 			$uri = trim($uri, $this->uriTrim);
@@ -152,7 +152,7 @@ 
 		*/
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
-			if(in_array($uri, $this->pattern)){
+			if (in_array($uri, $this->pattern)) {
 				$this->logger->warning('The route [' . $uri . '] already added, may be adding again can have route conflict');
 			}
 			$this->pattern[] = $uri;
@@ -163,7 +163,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -171,7 +171,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -179,7 +179,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -187,7 +187,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -195,7 +195,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -203,7 +203,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -212,27 +212,27 @@ 
 		 * otherwise send 404 error.
 		 */
 		public function run() {
-			$benchmark =& class_loader('Benchmark');
+			$benchmark = & class_loader('Benchmark');
 			$benchmark->mark('ROUTING_PROCESS_START');
 			$this->logger->debug('Routing process start ...');
 			$segment = $this->segments;
 			$baseUrl = get_config('base_url');
 			//check if the app is not in DOCUMENT_ROOT
-			if(isset($segment[0]) && stripos($baseUrl, $segment[0]) != false){
+			if (isset($segment[0]) && stripos($baseUrl, $segment[0]) != false) {
 				array_shift($segment);
 				$this->segments = $segment;
 			}
 			$this->logger->debug('Check if the request URI contains the front controller');
-			if(isset($segment[0]) && $segment[0] == SELF){
+			if (isset($segment[0]) && $segment[0] == SELF) {
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
 			}
-			else{
+			else {
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
-			$this->logger->info('The final Request URI is [' . $uri . ']' );
+			$this->logger->info('The final Request URI is [' . $uri . ']');
 			//generic routes
 			$pattern = array(':num', ':alpha', ':alnum', ':any');
 			$replace = array('[0-9]+', '[a-zA-Z]+', '[a-zA-Z0-9]+', '.*');
@@ -246,20 +246,20 @@ 
 					array_shift($args);
 					//check if this contains an module
 					$moduleControllerMethod = explode('#', $this->callback[$index]);
-					if(is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2){
-						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
+					if (is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2) {
+						$this->logger->info('The current request use the module [' . $moduleControllerMethod[0] . ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
 					}
-					else{
+					else {
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
-					if(is_array($moduleControllerMethod)){
-						if(isset($moduleControllerMethod[0])){
+					if (is_array($moduleControllerMethod)) {
+						if (isset($moduleControllerMethod[0])) {
 							$this->controller = $moduleControllerMethod[0];	
 						}
-						if(isset($moduleControllerMethod[1])){
+						if (isset($moduleControllerMethod[1])) {
 							$this->method = $moduleControllerMethod[1];
 						}
 						$this->args = $args;
@@ -269,73 +269,73 @@ 
 				}
 			}
 			//first if the controller is not set and the module is set use the module name as the controller
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After loop in predefined routes configuration, the module name is set but the controller is not set, so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//if can not determine the module/controller/method via the defined routes configuration we will use
 			//the URL like http://domain.com/module/controller/method/arg1/arg2
-			if(! $this->getController()){
+			if (!$this->getController()) {
 				$this->logger->info('Cannot determine the routing information using the predefined routes configuration, will use the request URI parameters');
 				$nbSegment = count($segment);
 				//if segment is null so means no need to perform
-				if($nbSegment > 0){
+				if ($nbSegment > 0) {
 					//get the module list
 					$modules = Module::getModuleList();
 					//first check if no module
-					if(! $modules){
+					if (!$modules) {
 						$this->logger->info('No module was loaded will skip the module checking');
 						//the application don't use module
 						//controller
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->controller = $segment[0];
 							array_shift($segment);
 						}
 						//method
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->method = $segment[0];
 							array_shift($segment);
 						}
 						//args
 						$this->args = $segment;
 					}
-					else{
+					else {
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
-						if(in_array($segment[0], $modules)){
+						if (in_array($segment[0], $modules)) {
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
 							$this->module = $segment[0];
 							array_shift($segment);
 							//check if the second arg is the controller from module
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								//check if the request use the same module name and controller
 								$path = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-								if(! $path){
+								if (!$path) {
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
 								}
-								else{
+								else {
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
 							}
 							//check for method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
 							//the remaining is for args
 							$this->args = $segment;
 						}
-						else{
+						else {
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								array_shift($segment);
 							}
 							//method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
@@ -345,18 +345,18 @@ 
 					}
 				}
 			}
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After using the request URI the module name is set but the controller is not set so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//did we set the controller, so set the controller path
-			if($this->getController() && ! $this->getControllerPath()){
+			if ($this->getController() && !$this->getControllerPath()) {
 				$this->logger->debug('Setting the file path for the controller [' . $this->getController() . ']');
 				//if it is the module controller
-				if($this->getModule()){
+				if ($this->getModule()) {
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
 				}
-				else{
+				else {
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -366,20 +366,20 @@ 
 			$this->logger->debug('Loading controller [' . $controller . '], the file path is [' . $classFilePath . ']...');
 			$benchmark->mark('ROUTING_PROCESS_END');
 			$e404 = false;
-			if(file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(! class_exists($controller, false)){
+				if (!class_exists($controller, false)) {
 					$e404 = true;
-					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
+					$this->logger->info('The controller file [' . $classFilePath . '] exists but does not contain the class [' . $controller . ']');
 				}
-				else{
+				else {
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
-					if(! method_exists($controllerInstance, $controllerMethod)){
+					if (!method_exists($controllerInstance, $controllerMethod)) {
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
 					}
-					else{
+					else {
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -389,12 +389,12 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}
-			if($e404){
-				$response =& class_loader('Response', 'classes');
+			if ($e404) {
+				$response = & class_loader('Response', 'classes');
 				$response->send404();
 			}
 		}

core/classes/EventInfo.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * 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.
-	*/
+	 */
 
 	/**
 	 * This class represent the event detail to dispatch to correspond listener

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * This class represent the event detail to dispatch to correspond listener
 	 */
-	class EventInfo{
+	class EventInfo {
 		
 		/**
 		 * The event name
@@ -54,7 +54,7 @@ 
 		 */
 		public $stop;
 		
-		public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
+		public function __construct($name, $payload = array(), $returnBack = false, $stop = false) {
 			$this->name = $name;
 			$this->payload = $payload;
 			$this->returnBack = $returnBack;

core/classes/Controller.php

Indentation +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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 Controller{
 		
@@ -114,12 +114,12 @@ 
 		 */
 		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
 			if($logger !== null){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+			  $this->logger = $logger;
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
-	        }
+			}
 		}
 
 		/**

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
 		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
 			if($logger !== null){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }

Spacing +20 added lines, -20 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Controller{
+	class Controller {
 		
 		/**
 		 * The name of the module if this controller belong to an module
@@ -48,7 +48,7 @@ 
 		 * Class constructor
 		 * @param object $logger the Log instance to use if is null will create one
 		 */
-		public function __construct(Log $logger = null){
+		public function __construct(Log $logger = null) {
 			//setting the Log instance
 			$this->setLoggerFromParamOrCreateNewInstance($logger);
 			
@@ -84,9 +84,9 @@ 
 		/**
 		 * This method is used to set the module name
 		 */
-		protected function setModuleNameFromRouter(){
+		protected function setModuleNameFromRouter() {
 			//determine the current module
-			if(isset($this->router) && $this->router->getModule()){
+			if (isset($this->router) && $this->router->getModule()) {
 				$this->moduleName = $this->router->getModule();
 			}
 		}
@@ -95,13 +95,13 @@ 
 		 * Set the cache using the argument otherwise will use the configuration
 		 * @param CacheInterface $cache the implementation of CacheInterface if null will use the configured
 		 */
-		protected function setCacheFromParamOrConfig(CacheInterface $cache = null){
+		protected function setCacheFromParamOrConfig(CacheInterface $cache = null) {
 			$this->logger->debug('Setting the cache handler instance');
 			//set cache handler instance
-			if(get_config('cache_enable', false)){
-				if ($cache !== null){
+			if (get_config('cache_enable', false)) {
+				if ($cache !== null) {
 					$this->cache = $cache;
-				} else if (isset($this->{strtolower(get_config('cache_handler'))})){
+				} else if (isset($this->{strtolower(get_config('cache_handler'))})) {
 					$this->cache = $this->{strtolower(get_config('cache_handler'))};
 					unset($this->{strtolower(get_config('cache_handler'))});
 				} 
@@ -112,12 +112,12 @@ 
 		 * Set the Log instance using argument or create new instance
 		 * @param object $logger the Log instance if not null
 		 */
-		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-			if($logger !== null){
+		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+			if ($logger !== null) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }
 		}
@@ -126,20 +126,20 @@ 
 		 * This method is used to load the required resources for framework to work
 		 * @return void 
 		 */
-		private function loadRequiredResources(){
+		private function loadRequiredResources() {
 			$this->logger->debug('Adding the loaded classes to the super instance');
-			foreach (class_loaded() as $var => $class){
-				$this->$var =& class_loader($class);
+			foreach (class_loaded() as $var => $class) {
+				$this->$var = & class_loader($class);
 			}
 
 			$this->logger->debug('Loading the required classes into super instance');
-			$this->eventdispatcher =& class_loader('EventDispatcher', 'classes');
-			$this->loader =& class_loader('Loader', 'classes');
-			$this->lang =& class_loader('Lang', 'classes');
-			$this->request =& class_loader('Request', 'classes');
+			$this->eventdispatcher = & class_loader('EventDispatcher', 'classes');
+			$this->loader = & class_loader('Loader', 'classes');
+			$this->lang = & class_loader('Lang', 'classes');
+			$this->request = & class_loader('Request', 'classes');
 			//dispatch the request instance created event
 			$this->eventdispatcher->dispatch('REQUEST_CREATED');
-			$this->response =& class_loader('Response', 'classes', 'classes');
+			$this->response = & class_loader('Response', 'classes', 'classes');
 		}
 
 	}