tnhfw / tnh-fw

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;
@@ -452,15 +447,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;
@@ -533,8 +526,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';
@@ -545,8 +537,7 @@ 
 				$DBS =& class_loader('DBSessionHandler', 'classes');
 				session_set_save_handler($DBS, true);
 				$logger->info('session save path: ' . get_config('session_save_path'));
-			}
-			else{
+			} else{
 				show_error('Invalid session handler configuration');
 			}
 			$lifetime = get_config('session_cookie_lifetime', 0);

core/classes/EventDispatcher.php

Braces +8 added lines, -16 removed lines

@@ -59,8 +59,7 @@ 
 			if(! isset($this->listeners[$eventName])){
 				$this->logger->info('This event does not have the registered event listener before, adding new one');
 				$this->listeners[$eventName] = array();
-			}
-			else{
+			} else{
 				$this->logger->info('This event already have the registered listener, add this listener to the list');
 			}
 			$this->listeners[$eventName][] = $listener;
@@ -78,12 +77,10 @@ 
 				if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
 					$this->logger->info('Found the listener at index [' .$index. '] remove it');
 					unset($this->listeners[$eventName][$index]);
-				}
-				else{
+				} else{
 					$this->logger->info('Cannot found this listener in the event listener list');
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('This event does not have this listener ignore remove');
 			}
 		}
@@ -98,8 +95,7 @@ 
 			if($eventName !== null && isset($this->listeners[$eventName])){
 				$this->logger->info('The Event name is set of exist in the listener just remove all Event Listener for this event');
 				unset($this->listeners[$eventName]);
-			}
-			else{
+			} else{
 				$this->logger->info('The Event name is not set or does not exist in the listener, so remove all Event Listener');
 				$this->listeners = array();
 			}
@@ -132,8 +128,7 @@ 
 			if($event->returnBack){
 				$this->logger->info('This event need return back, return the result for future use');
 				return $this->dispatchToListerners($event);
-			}
-			else{
+			} else{
 				$this->logger->info('This event no need return back the result, just dispatch it');
 				$this->dispatchToListerners($event);
 			}
@@ -153,8 +148,7 @@ 
 					return $event;
 				}
 				return;
-			}
-			else{
+			} else{
 				$this->logger->info('Found the registered Event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
 			}
 			foreach($list as $listener){
@@ -162,12 +156,10 @@ 
 					$returnedEvent = call_user_func_array($listener, array($event));
 					if($returnedEvent instanceof Event){
 						$event = $returnedEvent;
-					}
-					else{
+					} else{
 						show_error('This event [' .$event->name. '] need you return the event object after processing');
 					}
-				}
-				else{
+				} else{
 					call_user_func_array($listener, array($event));
 				}
 				if($event->stop){

core/classes/model/Model.php

Braces +32 added lines, -64 removed lines

@@ -143,8 +143,7 @@ 
         public function __construct(Database $db = null){
             if(is_object($db)){
                 $this->setDatabaseInstance($db);
-            }
-            else{
+            } else{
                 $obj = & get_instance();
         		if(isset($obj->database) && is_object($obj->database)){
                     /**
@@ -256,8 +255,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
                 return $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -294,8 +292,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -318,8 +315,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -336,8 +332,7 @@ 
                 if(is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if(count($args) == 3){
+            } else if(count($args) == 3){
                 if(is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -349,8 +344,7 @@ 
                 $result = $this->_database->from($this->_table)->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -377,8 +371,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -398,8 +391,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -417,8 +409,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -463,8 +454,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -474,15 +464,13 @@ 
                 {
                     if(is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -495,8 +483,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -506,15 +493,13 @@ 
                 {
                     if(is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -536,8 +521,7 @@ 
             if(count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -685,8 +669,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -699,8 +682,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -727,8 +709,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -748,8 +729,7 @@ 
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if(isset($row[$attr])){
 						unset($row[$attr]);
@@ -828,8 +808,7 @@ 
                 {
                     $this->_database->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->_database->orderBy($criteria, $order);
             }
@@ -887,8 +866,7 @@ 
                 $fv = null;
                 if(is_object($this->formValidationInstance)){
                     $fv = $this->formValidationInstance;
-                }
-                else{
+                } else{
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -900,13 +878,11 @@ 
                 if ($fv->run())
                 {
                     return $data;
-                }
-                else
+                } else
                 {
                     return FALSE;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -925,46 +901,38 @@ 
                     if (is_array($filter))
                     {
                         $this->_database->in($field, $filter);
-                    }
-                    else
+                    } else
                     {
                         if (is_int($field))
                         {
                             $this->_database->where($filter);
-                        }
-                        else
+                        } else
                         {
                             $this->_database->where($field, $filter);
                         }
                     }
                 }
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
+            } else if(count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }
-    		}
-    		else if(count($params) == 3)
+    		} else if(count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }

core/classes/Response.php

Braces +11 added lines, -22 removed lines

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

core/classes/Loader.php

Braces +17 added lines, -34 removed lines

@@ -148,8 +148,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -169,8 +168,7 @@ 
 					$searchModuleName = $path[0];
 					$class = ucfirst($path[1]);
 				}
-			}
-			else{
+			} else{
 				$class = ucfirst($class);
 			}
 
@@ -181,8 +179,7 @@ 
 			if($moduleModelFilePath){
 				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleModelFilePath. '] we will used it');
 				$classFilePath = $moduleModelFilePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
 			}
 			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
@@ -194,12 +191,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -227,8 +222,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -252,8 +246,7 @@ 
 				$libraryFilePath = CORE_LIBRARY_PATH . $file;
 				$class = ucfirst($class);
 				$logger->info('This library is a system library');
-			}
-			else{
+			} else{
 				$logger->info('This library is not a system library');	
 				//first check if this library is in the module
 				$logger->debug('Checking library [' . $class . '] from module list ...');
@@ -265,8 +258,7 @@ 
 						$searchModuleName = $path[0];
 						$class = ucfirst($path[1]);
 					}
-				}
-				else{
+				} else{
 					$class = ucfirst($class);
 				}
 				if(! $searchModuleName && !empty($obj->moduleName)){
@@ -276,8 +268,7 @@ 
 				if($moduleLibraryPath){
 					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
 					$libraryFilePath = $moduleLibraryPath;
-				}
-				else{
+				} else{
 					$logger->info('Cannot find library [' . $class . '] from modules using the default location');
 				}
 			}
@@ -301,12 +292,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -350,8 +339,7 @@ 
 			if($moduleFunctionPath){
 				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], the file path is [' .$moduleFunctionPath. '] we will used it');
 				$functionFilePath = $moduleFunctionPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
 			}
 			if(! $functionFilePath){
@@ -370,8 +358,7 @@ 
 				require_once $functionFilePath;
 				static::$loaded['function_' . $function] = $functionFilePath;
 				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find helper file [' . $file . ']');
 			}
 		}
@@ -414,8 +401,7 @@ 
 			if($moduleConfigPath){
 				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], the file path is [' .$moduleConfigPath. '] we will used it');
 				$configFilePath = $moduleConfigPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
 			}
 			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
@@ -424,8 +410,7 @@ 
 				if(! empty($config) && is_array($config)){
 					Config::setAll($config);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find config file ['. $configFilePath . ']');
 			}
 			static::$loaded['config_' . $filename] = $configFilePath;
@@ -483,8 +468,7 @@ 
 			if($moduleLanguagePath){
 				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLanguagePath. '] we will used it');
 				$languageFilePath = $moduleLanguagePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
 			}
 			if(! $languageFilePath){
@@ -511,8 +495,7 @@ 
 				}
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find language file [' . $file . ']');
 			}
 		}

core/classes/Router.php

Braces +12 added lines, -24 removed lines

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

core/classes/Database.php

Braces +42 added lines, -84 removed lines

@@ -188,8 +188,7 @@ 
          */
         if(is_object($logger)){
           $this->logger = $logger;
-        }
-        else{
+        } else{
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
@@ -251,14 +250,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+          } catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
-      }
-      else{
+      } else{
         show_error('Database configuration is not set.');
         return false;
       }
@@ -276,8 +273,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -383,8 +379,7 @@ 
       }
       if (empty($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -455,12 +450,10 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
           }
       }
@@ -478,12 +471,10 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NOT NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
           }
       }
@@ -510,8 +501,7 @@ 
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
         $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
+      } else{
         if(is_array($op)){
           $x = explode('?', $where);
           $w = '';
@@ -524,14 +514,12 @@ 
             }
           }
           $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
+        } else if (! in_array((string)$op, $this->operatorList)){
           if(is_null($op)){
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -540,12 +528,10 @@ 
       }
       if (empty($this->where)){
         $this->where = $where;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $where;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $where;
         }
       }
@@ -589,12 +575,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (empty($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if(substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -657,12 +641,10 @@ 
       $keys = implode(', ', $_keys);
       if (empty($this->where)){
         $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-        }
-        else{
+        } else{
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
         }
       }
@@ -715,12 +697,10 @@ 
       }
       if (empty($this->where)){
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
+        } else{
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -770,12 +750,10 @@ 
       $like = $escape ? $this->escape($data) : $data;
       if (empty($this->where)){
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
@@ -822,8 +800,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -838,12 +815,10 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (! empty($orderDir)){
         $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
+      } else{
         if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
           $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
+        } else{
           $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
@@ -858,8 +833,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -886,14 +860,12 @@ 
   	      }
       	}
         $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if(is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
+      } else{
         if(is_null($val)){
           $val = '';
         }
@@ -938,8 +910,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -978,8 +949,7 @@ 
 	  
 	   if($returnSQLQueryOrResultType === true){
       	return $query;
-      }
-      else{
+      } else{
     	   return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -997,8 +967,7 @@ 
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
-      }
-      else{
+      } else{
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1013,8 +982,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -1032,8 +1000,7 @@ 
         foreach ($this->getData() as $column => $val){
           $values[] = $column . ' = ' . $val;
         }
-      }
-      else{
+      } else{
         foreach ($data as $column => $val){
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
@@ -1127,14 +1094,12 @@ 
         $cacheKey = md5($query . $all . $array);
         if(is_object($this->cacheInstance)){
           $cacheInstance = $this->cacheInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+      } else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
@@ -1148,8 +1113,7 @@ 
         $bench = null;
         if(is_object($this->benchmarkInstance)){
           $bench = $this->benchmarkInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1167,15 +1131,13 @@ 
             //if need return all result like list of record
             if ($all){
     				    $this->result = ($array === false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
+    		    } else{
 				        $this->result = ($array === false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
             if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
               $this->numRows = count($this->result);  
-            }
-            else{
+            } else{
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
@@ -1183,23 +1145,20 @@ 
               $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
-        }
-        else{
+        } else{
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      } else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
     		$queryStr = $this->pdo->query($this->query);
     		if($queryStr){
           //Sqlite and pgsql always return 0 when using rowCount()
           if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
-          }
-          else{
+          } else{
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
@@ -1210,8 +1169,7 @@ 
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else{
+      } else{
         $this->logger->info('The result for query [' .$this->query. '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);

core/classes/Module.php

Braces +10 added lines, -20 removed lines

@@ -60,8 +60,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');
 				}
 			}
@@ -70,8 +69,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');
 			}
 		}
@@ -143,8 +141,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 . ']');
 					}
 				}
@@ -173,8 +170,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;
 			}
@@ -200,8 +196,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;
 			}
@@ -226,8 +221,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;
 			}
@@ -253,8 +247,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;
 			}
@@ -280,8 +273,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;
 			}
@@ -309,8 +301,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;
 			}
@@ -337,8 +328,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;
 			}