tnhfw / tnh-fw

core/classes/Module.php

Braces +10 added lines, -20 removed lines

@@ -61,8 +61,7 @@ 
 				while(($module = readdir($moduleDir)) !== false){
 					if($module != '.' && $module != '..'  && preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
 						self::$list[] = $module;
-					}
-					else{
+					} else{
 						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
@@ -72,8 +71,7 @@ 
 			
 			if(self::hasModule()){
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
-			}
-			else{
+			} else{
 				$logger->info('The application contains no module skipping');
 			}
 		}
@@ -145,8 +143,7 @@ 
 					if(! empty($route) && is_array($route)){
 						$routes = array_merge($routes, $route);
 						unset($route);
-					}
-					else{
+					} else{
 						show_error('No routing configuration found in [' .$file. '] for module [' . $module . ']');
 					}
 				}
@@ -175,8 +172,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -202,8 +198,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -228,8 +223,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -255,8 +249,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -282,8 +275,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -311,8 +303,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -339,8 +330,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
 				return false;
 			}

core/common.php

Braces +9 added lines, -18 removed lines

@@ -230,16 +230,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);
 		}
@@ -281,11 +279,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;
@@ -328,8 +324,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;
@@ -451,15 +446,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;
@@ -532,8 +525,7 @@ 
 					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';
@@ -544,8 +536,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);