tnhfw / tnh-fw

core/classes/DBSessionHandler.php

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
 			

core/common.php

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,31 +505,31 @@ 
 	 * 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
 				//Model
 				require_once CORE_CLASSES_MODEL_PATH . 'Model.php';
@@ -537,11 +537,11 @@ 
 				//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);
@@ -564,9 +564,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();
 			}

tests/tnhfw/classes/DBSessionHandlerTest.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 		
 		private static $config = null;
 		
-		public function __construct(){
+		public function __construct() {
 			$this->db = new Database(array(
 								'driver'    =>  'sqlite',
 								'database'  =>  TESTS_PATH . 'assets/db_tests.db',
@@ -49,7 +49,7 @@ 
 
 		
 		
-		public function testUsingSessionConfiguration(){
+		public function testUsingSessionConfiguration() {
 			//using value in the configuration
 			self::$config->set('session_save_path', 'DBSessionModel');
 			self::$config->set('session_secret', $this->secret);
@@ -75,7 +75,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenDataIsExpired(){
+		public function testWhenDataIsExpired() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -88,7 +88,7 @@ 
 			$this->assertNull($dbsh->read('foo'));
 		}
 		
-		public function testWhenDataAlreadyExistDoUpdate(){
+		public function testWhenDataAlreadyExistDoUpdate() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -101,7 +101,7 @@ 
 			$this->assertEquals($dbsh->read('foo'), '445');	
 		}
 		
-		public function testUsingCustomModelInstance(){
+		public function testUsingCustomModelInstance() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -129,7 +129,7 @@ 
 		}
 			
 			
-		public function testUsingCustomLogInstance(){
+		public function testUsingCustomLogInstance() {
 			$dbsh = new DBSessionHandler($this->model, new Log());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -156,7 +156,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testUsingCustomLoaderInstance(){
+		public function testUsingCustomLoaderInstance() {
 			$dbsh = new DBSessionHandler($this->model, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -184,7 +184,7 @@ 
 		}
 		
 		
-		public function testWhenModelInsanceIsNotSet(){
+		public function testWhenModelInsanceIsNotSet() {
 			$dbsh = new DBSessionHandler(null, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -212,7 +212,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenModelTableColumnsIsNotSet(){
+		public function testWhenModelTableColumnsIsNotSet() {
 			//session table is empty
 			$this->model->setSessionTableColumns(array());
 			$dbsh = new DBSessionHandler($this->model);

tests/include/common.php

Spacing +36 added lines, -36 removed lines

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