tnhfw / tnh-fw

classes/views/home.php

Spacing +28 added lines, -28 removed lines

@@ -8,13 +8,13 @@ 
     <meta name="description" content="A simple PHP framework using HMVC architecture">
     <meta name="author" content="Tony NGUEREZA">
     <title>TNH Framework</title>
-    <link href="<?php echo Assets::css('bootstrap.min');?>" rel="stylesheet" type = "text/css" >
-	<link href="<?php echo Assets::css('font-awesome.min');?>" rel="stylesheet" type = "text/css" >
-    <link href="<?php echo Assets::css('responsive');?>" rel="stylesheet" type = "text/css" >
-	<link rel="icon" href="<?php echo Assets::img('favicon.ico');?>">
+    <link href="<?php echo Assets::css('bootstrap.min'); ?>" rel="stylesheet" type = "text/css" >
+	<link href="<?php echo Assets::css('font-awesome.min'); ?>" rel="stylesheet" type = "text/css" >
+    <link href="<?php echo Assets::css('responsive'); ?>" rel="stylesheet" type = "text/css" >
+	<link rel="icon" href="<?php echo Assets::img('favicon.ico'); ?>">
 	<!--[if lt IE 9]>
-	<script src="<?php echo Assets::js('html5shiv');?>"></script>
-	<script src="<?php echo Assets::js('respond.min');?>"></script>
+	<script src="<?php echo Assets::js('html5shiv'); ?>"></script>
+	<script src="<?php echo Assets::js('respond.min'); ?>"></script>
     <![endif]-->
 	<style type = "text/css">
 		
@@ -28,15 +28,15 @@ 
 			<div class = "col-md-offset-2 col-md-8 col-md-offset-2">
 				<div class = "panel panel-primary">
 					<div class = "panel-heading">
-						<h2>Welcome on <?php echo TNH_NAME;?> v<?php echo TNH_VERSION;?></h2>
+						<h2>Welcome on <?php echo TNH_NAME; ?> v<?php echo TNH_VERSION; ?></h2>
 					</div>
 					<div class = "panel-body">
-						<img src = "<?php echo Assets::img('logo.png');?>" class = "img-responsive" style = "float:left;" />
+						<img src = "<?php echo Assets::img('logo.png'); ?>" class = "img-responsive" style = "float:left;" />
 						<h3>
 							A simple PHP framework using HMVC architecture
 						</h3>
 						<br />
-						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank'));?></p>
+						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank')); ?></p>
 					</div>
 				</div>
 				<div class = "panel panel-primary">
@@ -44,10 +44,10 @@ 
 						<h2>Server information</h2>
 					</div>
 					<div class = "panel-body">
-						<h4>Running on : <b><?php echo php_uname();?></b></h4>
-						<h4>PHP server SAPI : <b><?php echo php_sapi_name();?></b></h4>
-						<h4>PHP Version : <b><?php echo phpversion();?></b></h4>
-						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions());?> extensions)</h4>
+						<h4>Running on : <b><?php echo php_uname(); ?></b></h4>
+						<h4>PHP server SAPI : <b><?php echo php_sapi_name(); ?></b></h4>
+						<h4>PHP Version : <b><?php echo phpversion(); ?></b></h4>
+						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions()); ?> extensions)</h4>
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
 								<tr>
 									<th>Name</th>
@@ -55,10 +55,10 @@ 
 								</tr>
 								<?php foreach (get_loaded_extensions() as $e):?>
 									<tr>
-										<td><?php echo $e;?></td>
-										<td><?php echo phpversion($e);?></td>
+										<td><?php echo $e; ?></td>
+										<td><?php echo phpversion($e); ?></td>
 									</tr>
-								<?php endforeach;?>
+								<?php endforeach; ?>
 							</table>
 					</div>
 				</div>
@@ -67,30 +67,30 @@ 
 						<h2>Framework information</h2>
 					</div>
 					<div class = "panel-body">
-						<h4>Version : <b><?php echo TNH_VERSION;?></b></h4>
-						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION;?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION;?></b></h4>
-						<h4>Build date : <b><?php echo TNH_RELEASE_DATE;?></b></h4>
-						<h4>Author : <b><?php echo TNH_AUTHOR;?></b></h4>
-						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL;?></b></h4>
-						<h4>Loaded files : (<?php echo count(get_included_files());?> files)</h4>
+						<h4>Version : <b><?php echo TNH_VERSION; ?></b></h4>
+						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION; ?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION; ?></b></h4>
+						<h4>Build date : <b><?php echo TNH_RELEASE_DATE; ?></b></h4>
+						<h4>Author : <b><?php echo TNH_AUTHOR; ?></b></h4>
+						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL; ?></b></h4>
+						<h4>Loaded files : (<?php echo count(get_included_files()); ?> files)</h4>
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
 								<tr>
 									<th>Path</th>
 									<th>File</th>
 								</tr>
-								<?php foreach(get_included_files() as $file):?>
+								<?php foreach (get_included_files() as $file):?>
 									<tr>
-										<td><?php echo $file;?></td>
-										<td><?php echo basename($file);?></td>
+										<td><?php echo $file; ?></td>
+										<td><?php echo basename($file); ?></td>
 									</tr>
-								<?php endforeach;?>
+								<?php endforeach; ?>
 							</table>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<script src="<?php echo Assets::js('jquery');?>"></script>
-	<script src="<?php echo Assets::js('bootstrap.min');?>"></script>
+	<script src="<?php echo Assets::js('jquery'); ?>"></script>
+	<script src="<?php echo Assets::js('bootstrap.min'); ?>"></script>
 	</body>
 </html>

index.php

Spacing +1 added lines, -1 removed lines

@@ -243,7 +243,7 @@
 			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;

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

Spacing +18 added lines, -18 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
+	if (IS_CLI) {
 		$_SESSION = array();
 	}
 		
@@ -60,14 +60,14 @@ 
 	/**
 	 * The Benchmark class
 	 */
-	$BENCHMARK =& class_loader('Benchmark');
+	$BENCHMARK = & class_loader('Benchmark');
 	
 	$BENCHMARK->mark('APP_EXECUTION_START');
 	
 	/**
     * instance of the Log class
     */
-    $LOGGER =& class_loader('Log', 'classes');
+    $LOGGER = & class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
@@ -76,10 +76,10 @@ 
 	/**
 	* Verification of the PHP environment: minimum and maximum version
 	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+	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');
@@ -101,11 +101,11 @@ 
 	
 	//if user have some composer packages
 	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	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');
 	}
 	
@@ -121,7 +121,7 @@ 
 	* Load configurations and using the 
 	* static method "init()" to initialize the Config class .
 	*/
-	$CONFIG =& class_loader('Config', 'classes');	
+	$CONFIG = & class_loader('Config', 'classes');	
 	$CONFIG->init();
 	$BENCHMARK->mark('CONFIG_INIT_END');
 
@@ -130,7 +130,7 @@ 
 	* Load modules and using the 
 	* static method "init()" to initialize the Module class.
 	*/
-	$MODULE =& class_loader('Module', 'classes');
+	$MODULE = & class_loader('Module', 'classes');
 	$MODULE->init();
 	$BENCHMARK->mark('MODULE_INIT_END');
 
@@ -149,34 +149,34 @@ 
 	/**
 	* Loading Security class
 	*/
-	$SECURITY =& class_loader('Security', 'classes');
+	$SECURITY = & class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
 	* Loading Url class
 	*/
-	$URL =& class_loader('Url', 'classes');
+	$URL = & class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
+	if (get_config('cache_enable', false)) {
 		/**
 		 * Load Cache interface file
 		 */
 		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
 		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
+		if (!$cacheHandler) {
 			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
 		}
 		$CACHE = null;
 		//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');
+		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);
+			$CACHE = & class_loader($cacheHandler);
 		}
 		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+		if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
 			$RESPONSE = & class_loader('Response', 'classes');
 			$RESPONSE->renderFinalPageFromCache($CACHE);
 		}

core/classes/Config.php

Braces +3 added lines, -6 removed lines

@@ -66,15 +66,13 @@ 
 					//check if the server is running under IPv6
 					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
 						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
-					}
-					else{
+					} else{
 						$baseUrl = $_SERVER['SERVER_ADDR'];
 					}
 					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && ! is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https()) ) ? ':' . $_SERVER['SERVER_PORT'] : '');
 					$baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port
 						. substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
-				}
-				else{
+				} else{
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
@@ -139,8 +137,7 @@ 
 				$logger->info('Delete config item ['.$item.']');
 				unset(static::$config[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
 				return false;
 			}

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Config{
+	class Config {
 		
 		/**
 		 * The list of loaded configuration
@@ -42,9 +42,9 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(static::$logger == null){
-				$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (static::$logger == null) {
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Config');
 				static::$logger = $logger[0];
 			}
@@ -56,7 +56,7 @@ 
 		 * @param Log $logger the log object
 		 * @return Log the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			static::$logger = $logger;
 			return static::$logger;
 		}
@@ -64,35 +64,35 @@ 
 		/**
 		 * Initialize the configuration by loading all the configuration from config file
 		 */
-		public static function init(){
+		public static function init() {
 			$logger = static::getLogger();
 			$logger->debug('Initialization of the configuration');
 			static::$config = & load_configurations();
-			if(! static::$config['base_url'] || ! is_url(static::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
+			if (!static::$config['base_url'] || !is_url(static::$config['base_url'])) {
+				if (ENVIRONMENT == 'production') {
 					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
 				}
 				$baseUrl = null;
-				if (isset($_SERVER['SERVER_ADDR'])){
+				if (isset($_SERVER['SERVER_ADDR'])) {
 					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
+						$baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
 					}
-					else{
+					else {
 						$baseUrl = $_SERVER['SERVER_ADDR'];
 					}
-					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && ! is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https()) ) ? ':' . $_SERVER['SERVER_PORT'] : '');
-					$baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port
+					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && !is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https())) ? ':' . $_SERVER['SERVER_PORT'] : '');
+					$baseUrl = (is_https() ? 'https' : 'http') . '://' . $baseUrl . $port
 						. substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
 				}
-				else{
+				else {
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
 				self::set('base_url', $baseUrl);
 			}
-			static::$config['base_url'] = rtrim(static::$config['base_url'], '/') .'/';
-			if(ENVIRONMENT == 'production' && in_array(strtolower(static::$config['log_level']), array('debug', 'info','all'))){
+			static::$config['base_url'] = rtrim(static::$config['base_url'], '/') . '/';
+			if (ENVIRONMENT == 'production' && in_array(strtolower(static::$config['log_level']), array('debug', 'info', 'all'))) {
 				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
 			}
 			$logger->info('Configuration initialized successfully');
@@ -105,12 +105,12 @@ 
 		 * @param  mixed $default the default value to use if can not find the config item in the list
 		 * @return mixed          the config value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, static::$config)){
+			if (array_key_exists($item, static::$config)) {
 				return static::$config[$item];
 			}
-			$logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
+			$logger->warning('Cannot find config item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -119,7 +119,7 @@ 
 		 * @param string $item  the config item name to set
 		 * @param mixed $value the config item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			static::$config[$item] = $value;
 		}
 
@@ -127,7 +127,7 @@ 
 		 * Get all the configuration values
 		 * @return array the config values
 		 */
-		public static function getAll(){
+		public static function getAll() {
 			return static::$config;
 		}
 
@@ -135,7 +135,7 @@ 
 		 * Set the configuration values bu merged with the existing configuration
 		 * @param array $config the config values to add in the configuration list
 		 */
-		public static function setAll(array $config = array()){
+		public static function setAll(array $config = array()) {
 			static::$config = array_merge(static::$config, $config);
 		}
 
@@ -144,15 +144,15 @@ 
 		 * @param  string $item the config item name to be deleted
 		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
 		 */
-		public static function delete($item){
+		public static function delete($item) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, static::$config)){
-				$logger->info('Delete config item ['.$item.']');
+			if (array_key_exists($item, static::$config)) {
+				$logger->info('Delete config item [' . $item . ']');
 				unset(static::$config[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Config item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -161,7 +161,7 @@ 
 		 * Load the configuration file. This an alias to Loader::config()
 		 * @param  string $config the config name to be loaded
 		 */
-		public static function load($config){
+		public static function load($config) {
 			Loader::config($config);
 		}
 	}

core/classes/cache/CacheInterface.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	interface CacheInterface{
+	interface CacheInterface {
 
 		/**
 		 * This is used to get the cache data using the key

core/classes/Url.php

Spacing +25 added lines, -25 removed lines

@@ -25,15 +25,15 @@ 
 	*/
 
 
-	class Url{
+	class Url {
 
 		/**
 		 * Return the link using base_url config without front controller "index.php"
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function base_url($path = ''){
-			if(is_url($path)){
+		public static function base_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			return get_config('base_url') . $path;
@@ -44,26 +44,26 @@ 
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function site_url($path = ''){
-			if(is_url($path)){
+		public static function site_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			$path = rtrim($path, '/');
 			$baseUrl = get_config('base_url');
 			$frontController = get_config('front_controller');
 			$url = $baseUrl;
-			if($frontController){
+			if ($frontController) {
 				$url .= $frontController . '/';
 			}
-			if(($suffix = get_config('url_suffix')) && $path){
-				if(strpos($path, '?') !== false){
+			if (($suffix = get_config('url_suffix')) && $path) {
+				if (strpos($path, '?') !== false) {
 					$query = explode('?', $path);
 					$query[0] = str_ireplace($suffix, '', $query[0]);
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
 				}
-				else{
+				else {
 					$path .= $suffix;
 				}
 			}
@@ -74,10 +74,10 @@ 
 		 * Return the current site URL
 		 * @return string
 		 */
-		public static function current(){
+		public static function current() {
 			$current = '/';
 			$requestUri = get_instance()->request->requestUri();
-			if($requestUri){
+			if ($requestUri) {
 				$current = $requestUri;
 			}
 			return static::domain() . $current;
@@ -90,18 +90,18 @@ 
 		 * @param  boolean $lowercase whether to set the final text to lowe case or not
 		 * @return string the friendly generated text
 		 */
-		public static function title($str = null, $separator = '-', $lowercase = true){
+		public static function title($str = null, $separator = '-', $lowercase = true) {
 			$str = trim($str);
-			$from = array('ç','À','Á','Â','Ã','Ä','Å','à','á','â','ã','ä','å','Ò','Ó','Ô','Õ','Ö','Ø','ò','ó','ô','õ','ö','ø','È','É','Ê','Ë','è','é','ê','ë','Ç','ç','Ì','Í','Î','Ï','ì','í','î','ï','Ù','Ú','Û','Ü','ù','ú','û','ü','ÿ','Ñ','ñ');
-			$to = array('c','a','a','a','a','a','a','a','a','a','a','a','a','o','o','o','o','o','o','o','o','o','o','o','o','e','e','e','e','e','e','e','e','e','e','i','i','i','i','i','i','i','i','u','u','u','u','u','u','u','u','y','n','n');
+			$from = array('ç', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'à', 'á', 'â', 'ã', 'ä', 'å', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'È', 'É', 'Ê', 'Ë', 'è', 'é', 'ê', 'ë', 'Ç', 'ç', 'Ì', 'Í', 'Î', 'Ï', 'ì', 'í', 'î', 'ï', 'Ù', 'Ú', 'Û', 'Ü', 'ù', 'ú', 'û', 'ü', 'ÿ', 'Ñ', 'ñ');
+			$to = array('c', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'y', 'n', 'n');
 			$str = str_replace($from, $to, $str);
 			$str = preg_replace('#([^a-z0-9]+)#i', $separator, $str);
 			$str = str_replace('--', $separator, $str);
 			//if after process we get something like one-two-three-, need truncate the last separator "-"
-			if(substr($str, -1) == $separator){
+			if (substr($str, -1) == $separator) {
 				$str = substr($str, 0, -1);
 			}
-			if($lowercase){
+			if ($lowercase) {
 				$str = strtolower($str);
 			}
 			return $str;
@@ -111,36 +111,36 @@ 
 		 * Get the current application domain with protocol
 		 * @return string the domain name
 		 */
-		public static function domain(){
+		public static function domain() {
 			$obj = & get_instance();
 			$domain = 'localhost';
 			$port = $obj->request->server('SERVER_PORT');
 			$protocol = is_https() ? 'https' : 'http';
 			
-			if($obj->request->server('HTTP_HOST')){
+			if ($obj->request->server('HTTP_HOST')) {
 				$domain = $obj->request->server('HTTP_HOST');
 			}
-			else if($obj->request->server('SERVER_NAME')){
+			else if ($obj->request->server('SERVER_NAME')) {
 				$domain = $obj->request->server('SERVER_NAME');
 			}
-			else if($obj->request->server('SERVER_ADDR')){
+			else if ($obj->request->server('SERVER_ADDR')) {
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
-			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){
+			if ($port && (is_https() && $port != 443 || !is_https() && $port != 80)) {
 				//some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
 				//of the domain like https://my.domain.com:787
-				if(is_https() && $port != 80){
-					$domain .= ':'.$port;
+				if (is_https() && $port != 80) {
+					$domain .= ':' . $port;
 				}
 			}
-			return $protocol.'://'.$domain;
+			return $protocol . '://' . $domain;
 		}
 
 		/**
 		 * Get the current request query string
 		 * @return string
 		 */
-		public static function queryString(){
+		public static function queryString() {
 			return get_instance()->request->server('QUERY_STRING');
 		}
 	}
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -62,8 +62,7 @@ 
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
-				}
-				else{
+				} else{
 					$path .= $suffix;
 				}
 			}
@@ -119,11 +118,9 @@ 
 			
 			if($obj->request->server('HTTP_HOST')){
 				$domain = $obj->request->server('HTTP_HOST');
-			}
-			else if($obj->request->server('SERVER_NAME')){
+			} else if($obj->request->server('SERVER_NAME')){
 				$domain = $obj->request->server('SERVER_NAME');
-			}
-			else if($obj->request->server('SERVER_ADDR')){
+			} else if($obj->request->server('SERVER_ADDR')){
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
 			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){

core/classes/Session.php

Spacing +31 added lines, -31 removed lines

@@ -23,7 +23,7 @@ 
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
-	class Session{
+	class Session {
 		
 		/**
 		 * The session flash key to use
@@ -41,9 +41,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(static::$logger == null){
-				static::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (static::$logger == null) {
+				static::$logger[0] = & class_loader('Log', 'classes');
 				static::$logger[0]->setLogger('Library::Session');
 			}
 			return static::$logger[0];
@@ -55,14 +55,14 @@ 
 		 * @param  mixed $default the default value to use if can not find the session item in the list
 		 * @return mixed          the session value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = static::getLogger();
-			$logger->debug('Getting session data for item [' .$item. '] ...');
-			if(array_key_exists($item, $_SESSION)){
+			$logger->debug('Getting session data for item [' . $item . '] ...');
+			if (array_key_exists($item, $_SESSION)) {
 				$logger->info('Found session data for item [' . $item . '] the vaue is : [' . stringfy_vars($_SESSION[$item]) . ']');
 				return $_SESSION[$item];
 			}
-			$logger->warning('Cannot find session item [' . $item . '] using the default value ['. $default . ']');
+			$logger->warning('Cannot find session item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -71,7 +71,7 @@ 
 		 * @param string $item  the session item name to set
 		 * @param mixed $value the session item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			$logger = static::getLogger();
 			$logger->debug('Setting session data for item [' . $item . '], value [' . stringfy_vars($value) . ']');
 			$_SESSION[$item] = $value;
@@ -83,16 +83,16 @@ 
 		 * @param  mixed $default the default value to use if can not find the session flash item in the list
 		 * @return mixed          the session flash value if exist or the default value
 		 */
-		public static function getFlash($item, $default = null){
+		public static function getFlash($item, $default = null) {
 			$logger = static::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$return = array_key_exists($key, $_SESSION) ?
 			($_SESSION[$key]) : $default;
-			if(array_key_exists($key, $_SESSION)){
+			if (array_key_exists($key, $_SESSION)) {
 				unset($_SESSION[$key]);
 			}
-			else{
-				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
+			else {
+				$logger->warning('Cannot find session flash item [' . $key . '] using the default value [' . $default . ']');
 			}
 			return $return;
 		}
@@ -102,8 +102,8 @@ 
 		 * @param  string  $item the session flash item name
 		 * @return boolean 
 		 */
-		public static function hasFlash($item){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function hasFlash($item) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			return array_key_exists($key, $_SESSION);
 		}
 
@@ -112,8 +112,8 @@ 
 		 * @param string $item  the session flash item name to set
 		 * @param mixed $value the session flash item value
 		 */
-		public static function setFlash($item, $value){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function setFlash($item, $value) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$_SESSION[$key] = $value;
 		}
 
@@ -121,14 +121,14 @@ 
 		 * Clear the session item in the list
 		 * @param  string $item the session item name to be deleted
 		 */
-		public static function clear($item){
+		public static function clear($item) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Deleting of session for item ['.$item.' ]');
+			if (array_key_exists($item, $_SESSION)) {
+				$logger->info('Deleting of session for item [' . $item . ' ]');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Session item [' . $item . '] to be deleted does not exists');
 			}
 		}
 		
@@ -136,15 +136,15 @@ 
 		 * Clear the session flash item in the list
 		 * @param  string $item the session flash item name to be deleted
 		 */
-		public static function clearFlash($item){
+		public static function clearFlash($item) {
 			$logger = static::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			if(array_key_exists($key, $_SESSION)){
-				$logger->info('Delete session flash for item ['.$item.']');
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
+			if (array_key_exists($key, $_SESSION)) {
+				$logger->info('Delete session flash for item [' . $item . ']');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Dession flash item [' . $item . '] to be deleted does not exists');
 			}
 		}
 
@@ -153,14 +153,14 @@ 
 		 * @param  string  $item the session item name
 		 * @return boolean 
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_SESSION);
 		}
 
 		/**
 		 * Destroy all session data values
 		 */
-		public static function clearAll(){
+		public static function clearAll() {
 			session_unset();
 			session_destroy();
 		}

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/Router.php

Spacing +60 added lines, -60 removed lines

@@ -92,39 +92,39 @@ 
 		/**
 		 * 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');
 				require_once $routesPath;
-				if(! empty($route) && is_array($route)){
+				if (!empty($route) && is_array($route)) {
 					$this->routes = $route;
 					unset($route);
 				}
-				else{
+				else {
 					show_error('No routing configuration found in [' . $routesPath . ']');
 				}
 			}
-			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);
 			}
 			
@@ -132,14 +132,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);
@@ -154,7 +154,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;
@@ -165,7 +165,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -173,7 +173,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -181,7 +181,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -189,7 +189,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -197,7 +197,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -205,7 +205,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -214,27 +214,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]+', '.*');
@@ -248,20 +248,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;
@@ -271,73 +271,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);
 							}
@@ -347,18 +347,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';
 				}
 			}
@@ -368,20 +368,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();
@@ -391,12 +391,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();
 			}
 		}

Braces +13 added lines, -26 removed lines

@@ -103,12 +103,10 @@ 
 				if(! empty($route) && is_array($route)){
 					$this->routes = $route;
 					unset($route);
-				}
-				else{
+				} else{
 					show_error('No routing configuration found in [' . $routesPath . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
@@ -118,8 +116,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));
@@ -135,8 +132,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){
@@ -229,8 +225,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);
@@ -252,8 +247,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]);
 					}
@@ -300,8 +294,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] . ']');
@@ -315,8 +308,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);
 								}
@@ -328,8 +320,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])){
@@ -357,8 +348,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';
 				}
 			}
@@ -373,15 +363,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();
@@ -390,8 +378,7 @@ 
 						$obj->response->renderFinalPage();
 					}
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}

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

Spacing +26 added lines, -26 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * For application languages management
 	 */
-	class Lang{
+	class Lang {
 		
 		/**
 		 * The supported available language for this application.
@@ -67,8 +67,8 @@ 
 		/**
 		 * Construct new Lang instance
 		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+	        $this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
@@ -76,8 +76,8 @@ 
 			
 			//add the supported languages ('key', 'display name')
 			$languages = get_config('languages', null);
-			if(! empty($languages)){
-				foreach($languages as $key => $displayName){
+			if (!empty($languages)) {
+				foreach ($languages as $key => $displayName) {
 					$this->addLang($key, $displayName);
 				}
 			}
@@ -87,15 +87,15 @@ 
 			$language = null;
 			//if the language exists in cookie use it
 			$cfgKey = get_config('language_cookie_name');
-			$this->logger->debug('Getting current language from cookie [' .$cfgKey. ']');
+			$this->logger->debug('Getting current language from cookie [' . $cfgKey . ']');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang && $this->isValid($cookieLang)){
+			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. ']');
+				$this->logger->info('Language from cookie [' . $cfgKey . '] is valid so we will set the language using the cookie value [' . $cookieLang . ']');
 			}
-			else{
-				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
+			else {
+				$this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']');
 				$this->current = $this->getDefault();
 			}
 		}
@@ -105,7 +105,7 @@ 
 		 *
 		 * @return array the language message list
 		 */
-		public function getAll(){
+		public function getAll() {
 			return $this->languages;
 		}
 
@@ -115,7 +115,7 @@ 
 		 * @param string $key the language key to identify
 		 * @param string $value the language message value
 		 */
-		public function set($key, $value){
+		public function set($key, $value) {
 			$this->languages[$key] = $value;
 		}
 
@@ -127,11 +127,11 @@ 
 		 *
 		 * @return string the language message value
 		 */
-		public function get($key, $default = 'LANGUAGE_ERROR'){
-			if(isset($this->languages[$key])){
+		public function get($key, $default = 'LANGUAGE_ERROR') {
+			if (isset($this->languages[$key])) {
 				return $this->languages[$key];
 			}
-			$this->logger->warning('Language key  [' .$key. '] does not exist use the default value [' .$default. ']');
+			$this->logger->warning('Language key  [' . $key . '] does not exist use the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -142,10 +142,10 @@ 
 		 *
 		 * @return boolean true if the language directory exists, false or not
 		 */
-		public function isValid($language){
+		public function isValid($language) {
 			$searchDir = array(CORE_LANG_PATH, APP_LANG_PATH);
-			foreach($searchDir as $dir){
-				if(file_exists($dir . $language) && is_dir($dir . $language)){
+			foreach ($searchDir as $dir) {
+				if (file_exists($dir . $language) && is_dir($dir . $language)) {
 					return true;
 				}
 			}
@@ -157,7 +157,7 @@ 
 		 *
 		 * @return string the default language
 		 */
-		public function getDefault(){
+		public function getDefault() {
 			return $this->default;
 		}
 
@@ -166,7 +166,7 @@ 
 		 *
 		 * @return string the current language
 		 */
-		public function getCurrent(){
+		public function getCurrent() {
 			return $this->current;
 		}
 
@@ -176,14 +176,14 @@ 
 		 * @param string $name the short language name like "en", "fr".
 		 * @param string $description the human readable description of this language
 		 */
-		public function addLang($name, $description){
-			if(isset($this->availables[$name])){
+		public function addLang($name, $description) {
+			if (isset($this->availables[$name])) {
 				return; //already added cost in performance
 			}
-			if($this->isValid($name)){
+			if ($this->isValid($name)) {
 				$this->availables[$name] = $description;
 			}
-			else{
+			else {
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}
@@ -193,7 +193,7 @@ 
 		 *
 		 * @return array the list of the application language
 		 */
-		public function getSupported(){
+		public function getSupported() {
 			return $this->availables;
 		}
 
@@ -202,7 +202,7 @@ 
 		 *
 		 * @param array $langs the languages array of the messages to be added
 		 */
-		public function addLangMessages(array $langs){
+		public function addLangMessages(array $langs) {
 			foreach ($langs as $key => $value) {
 				$this->set($key, $value);
 			}