tnhfw / tnh-fw

index.php

Braces +1 added lines, -2 removed lines

@@ -242,8 +242,7 @@
 			ini_set('display_errors', 0);
 			if (version_compare(PHP_VERSION, '5.3', '>=')) {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-			}
-			else{
+			} else{
 				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 			}
 		break;

core/bootstrap.php

Braces +3 added lines, -6 removed lines

@@ -78,8 +78,7 @@ 
 	*/
 	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	} else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -104,8 +103,7 @@ 
 	if(file_exists(VENDOR_PATH . 'autoload.php')){
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
-	}
-	else{
+	} else{
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -176,8 +174,7 @@ 
 		//first check if the cache handler is the system driver
 		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
 			$CACHE =& class_loader($cacheHandler, 'classes/cache');
-		}
-		else{
+		} else{
 			//it's not a system driver use user library
 			$CACHE =& class_loader($cacheHandler);
 		}

core/classes/Session.php

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 			($_SESSION[$key]) : $default;
 			if(array_key_exists($key, $_SESSION)){
 				unset($_SESSION[$key]);
-			}
-			else{
+			} else{
 				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
 			}
 			return $return;
@@ -126,8 +125,7 @@ 
 			if(array_key_exists($item, $_SESSION)){
 				$logger->info('Deleting of session for item ['.$item.' ]');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
 			}
 		}
@@ -142,8 +140,7 @@ 
 			if(array_key_exists($key, $_SESSION)){
 				$logger->info('Delete session flash for item ['.$item.']');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
 			}
 		}

core/classes/Lang.php

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 			if($cookieLang && $this->isValid($cookieLang)){
 				$this->current = $cookieLang;
 				$this->logger->info('Language from cookie [' .$cfgKey. '] is valid so we will set the language using the cookie value [' .$cookieLang. ']');
-			}
-			else{
+			} else{
 				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
 				$this->current = $this->getDefault();
 			}
@@ -171,8 +170,7 @@ 
 			}
 			if($this->isValid($name)){
 				$this->availables[$name] = $description;
-			}
-			else{
+			} else{
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}

core/classes/Security.php

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
 			if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
 				$logger->info('The CSRF token not yet expire just return it');
 				return Session::get($key);
-			}
-			else{
+			} else{
 				$newTime = $currentTime + $expire;
 				$token = sha1(uniqid()) . sha1(uniqid());
 				$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
@@ -87,8 +86,7 @@ 
 			if(! Session::exists($key) || Session::get($keyExpire) <= $currentTime){
 				$logger->warning('The CSRF session data is not valide');
 				return false;
-			}
-			else{
+			} else{
 				//perform form data
 				//need use request->query() for best retrieve
 				//super instance
@@ -97,8 +95,7 @@ 
 				if(! $token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime){
 					$logger->warning('The CSRF data [' .$token. '] is not valide may be attacker do his job');
 					return false;
-				}
-				else{
+				} else{
 					$logger->info('The CSRF data [' .$token. '] is valide the form data is safe continue');
 					//remove the token from session
 					Session::clear($key);
@@ -127,8 +124,7 @@ 
 						$logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
 						//wildcard to access all ip address
 						return;
-					}
-					else{
+					} else{
 						// go through all whitelisted ips
 						foreach ($list as $ipaddr) {
 							// find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -153,8 +149,7 @@ 
 						show_error('Access to this application is not allowed');
 					}
 				}
-			}
-			else{
+			} else{
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }

core/classes/Request.php

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 			$this->header = array();
 			if(function_exists('apache_request_headers')){
 				$this->header = apache_request_headers();
-			}
-			else if(function_exists('getallheaders')){
+			} else if(function_exists('getallheaders')){
 				$this->header = getallheaders();
 			}
 		}

core/libraries/PDF.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			$this->dompdf->render();
 			if($stream){
 				$this->dompdf->stream($filename);
-			}
-			else{
+			} else{
 				return $this->dompdf->output();
 			}
 		}

core/libraries/Email.php

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 			foreach ($emails as $name => $email) {
 				if(is_numeric($name)){
 					$this->setTo($email);
-				}
-				else{
+				} else{
 					$this->setTo($email, $name);
 				}
 			}

core/libraries/Cookie.php

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
 				$logger->info('Delete cookie item ['.$item.']');
 				unset($_COOKIE[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
 				return false;
 			}