tnhfw / tnh-fw

core/classes/Loader.php

Spacing +107 added lines, -107 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 Loader{
+	class Loader {
 		
 		/**
 		 * List of loaded resources
@@ -38,7 +38,7 @@ 
 		private static $logger;
 
 
-		public function __construct(){
+		public function __construct() {
 			//add the resources already loaded during application bootstrap
 			//in the list to prevent duplicate or loading the resources again.
 			static::$loaded = class_loaded();
@@ -51,9 +51,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Loader');
 			}
 			return self::$logger[0];
@@ -67,25 +67,25 @@ 
 		 *
 		 * @return void
 		 */
-		public static function model($class, $instance = null){
+		public static function model($class, $instance = null) {
 			$logger = static::getLogger();
 			$class = str_ireplace('.php', '', $class);
 			$class = trim($class, '/\\');
-			$file = ucfirst($class).'.php';
+			$file = ucfirst($class) . '.php';
 			$logger->debug('Loading model [' . $class . '] ...');
-			if(! $instance){
+			if (!$instance) {
 				//for module
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[1])){
+					if (isset($path[1])) {
 						$instance = strtolower($path[1]);
 					}
 				}
-				else{
+				else {
 					$instance = strtolower($class);
 				}
 			}
-			if(isset(static::$loaded[$instance])){
+			if (isset(static::$loaded[$instance])) {
 				$logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -95,43 +95,43 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($class, '/') !== false){
+			if (strpos($class, '/') !== false) {
 				$path = explode('/', $class);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$class = ucfirst($path[1]);
 				}
 			}
-			else{
+			else {
 				$class = ucfirst($class);
 			}
 
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleModelFilePath = Module::findModelFullPath($class, $searchModuleName);
-			if($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+			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 . ']');
-			if(file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(class_exists($class)){
+				if (class_exists($class)) {
 					$c = new $class();
 					$obj = & get_instance();
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
 				}
-				else{
-					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
+				else {
+					show_error('The file ' . $classFilePath . ' exists but does not contain the class [' . $class . ']');
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -146,31 +146,31 @@ 
 		 *
 		 * @return void
 		 */
-		public static function library($class, $instance = null, array $params = array()){
+		public static function library($class, $instance = null, array $params = array()) {
 			$logger = static::getLogger();
 			$class = str_ireplace('.php', '', $class);
 			$class = trim($class, '/\\');
-			$file = ucfirst($class) .'.php';
+			$file = ucfirst($class) . '.php';
 			$logger->debug('Loading library [' . $class . '] ...');
-			if(! $instance){
+			if (!$instance) {
 				//for module
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[1])){
+					if (isset($path[1])) {
 						$instance = strtolower($path[1]);
 					}
 				}
-				else{
+				else {
 					$instance = strtolower($class);
 				}
 			}
-			if(isset(static::$loaded[$instance])){
+			if (isset(static::$loaded[$instance])) {
 				$logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
 			$obj = & get_instance();
 			//TODO for Database library
-			if(strtolower($class) == 'database'){
+			if (strtolower($class) == 'database') {
 				$logger->info('This is the Database library ...');
 				$dbInstance = & class_loader('Database', 'classes', $params);
 				$obj->{$instance} = $dbInstance;
@@ -180,44 +180,44 @@ 
 			}
 			$libraryFilePath = null;
 			$logger->debug('Check if this is a system library ...');
-			if(file_exists(CORE_LIBRARY_PATH . $file)){
+			if (file_exists(CORE_LIBRARY_PATH . $file)) {
 				$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 ...');
 				$searchModuleName = null;
 				//check if the request class contains module name
-				if(strpos($class, '/') !== false){
+				if (strpos($class, '/') !== false) {
 					$path = explode('/', $class);
-					if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+					if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 						$searchModuleName = $path[0];
 						$class = ucfirst($path[1]);
 					}
 				}
-				else{
+				else {
 					$class = ucfirst($class);
 				}
-				if(! $searchModuleName && !empty($obj->moduleName)){
+				if (!$searchModuleName && !empty($obj->moduleName)) {
 					$searchModuleName = $obj->moduleName;
 				}
 				$moduleLibraryPath = Module::findLibraryFullPath($class, $searchModuleName);
-				if($moduleLibraryPath){
-					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+				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');
 				}
 			}
-			if(! $libraryFilePath){
+			if (!$libraryFilePath) {
 				$searchDir = array(LIBRARY_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$libraryFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -225,20 +225,20 @@ 
 				}
 			}
 			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
-			if($libraryFilePath){
+			if ($libraryFilePath) {
 				require_once $libraryFilePath;
-				if(class_exists($class)){
+				if (class_exists($class)) {
 					$c = $params ? new $class($params) : new $class();
 					$obj = & get_instance();
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
 				}
-				else{
-					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
+				else {
+					show_error('The file ' . $libraryFilePath . ' exists but does not contain the class ' . $class);
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -250,14 +250,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function functions($function){
+		public static function functions($function) {
 			$logger = static::getLogger();
 			$function = str_ireplace('.php', '', $function);
 			$function = trim($function, '/\\');
 			$function = str_ireplace('function_', '', $function);
-			$file = 'function_'.$function.'.php';
+			$file = 'function_' . $function . '.php';
 			$logger->debug('Loading helper [' . $function . '] ...');
-			if(isset(static::$loaded['function_' . $function])){
+			if (isset(static::$loaded['function_' . $function])) {
 				$logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -267,30 +267,30 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($function, '/') !== false){
+			if (strpos($function, '/') !== false) {
 				$path = explode('/', $function);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$function = 'function_' . $path[1] . '.php';
-					$file = $path[0] . DS . 'function_'.$function.'.php';
+					$file = $path[0] . DS . 'function_' . $function . '.php';
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleFunctionPath = Module::findFunctionFullPath($function, $searchModuleName);
-			if($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+			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){
+			if (!$functionFilePath) {
 				$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$functionFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -298,12 +298,12 @@ 
 				}
 			}
 			$logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
-			if($functionFilePath){
+			if ($functionFilePath) {
 				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 . ']');
 			}
 		}
@@ -315,14 +315,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function config($filename){
+		public static function config($filename) {
 			$logger = static::getLogger();
 			$filename = str_ireplace('.php', '', $filename);
 			$filename = trim($filename, '/\\');
 			$filename = str_ireplace('config_', '', $filename);
-			$file = 'config_'.$filename.'.php';
+			$file = 'config_' . $filename . '.php';
 			$logger->debug('Loading configuration [' . $filename . '] ...');
-			if(isset(static::$loaded['config_' . $filename])){
+			if (isset(static::$loaded['config_' . $filename])) {
 				$logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -332,34 +332,34 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($filename, '/') !== false){
+			if (strpos($filename, '/') !== false) {
 				$path = explode('/', $filename);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$filename = $path[1] . '.php';
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleConfigPath = Module::findConfigFullPath($filename, $searchModuleName);
-			if($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], the file path is [' .$moduleConfigPath. '] we will used it');
+			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 . ']');
-			if(file_exists($configFilePath)){
+			if (file_exists($configFilePath)) {
 				$config = array();
 				require_once $configFilePath;
-				if(! empty($config) && is_array($config)){
+				if (!empty($config) && is_array($config)) {
 					Config::setAll($config);
 				}
 			}
-			else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
+			else {
+				show_error('Unable to find config file [' . $configFilePath . ']');
 			}
 			static::$loaded['config_' . $filename] = $configFilePath;
 			$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
@@ -375,14 +375,14 @@ 
 		 *
 		 * @return void
 		 */
-		public static function lang($language){
+		public static function lang($language) {
 			$logger = static::getLogger();
 			$language = str_ireplace('.php', '', $language);
 			$language = trim($language, '/\\');
 			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
+			$file = 'lang_' . $language . '.php';
 			$logger->debug('Loading language [' . $language . '] ...');
-			if(isset(static::$loaded['lang_' . $language])){
+			if (isset(static::$loaded['lang_' . $language])) {
 				$logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
 				return;
 			}
@@ -392,7 +392,7 @@ 
 			$cfgKey = get_config('language_cookie_name');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang){
+			if ($cookieLang) {
 				$appLang = $cookieLang;
 			}
 			$languageFilePath = null;
@@ -401,30 +401,30 @@ 
 			$searchModuleName = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($language, '/') !== false){
+			if (strpos($language, '/') !== false) {
 				$path = explode('/', $language);
-				if(isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$searchModuleName = $path[0];
 					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS .$language;
+					$file = $path[0] . DS . $language;
 				}
 			}
-			if(! $searchModuleName && !empty($obj->moduleName)){
+			if (!$searchModuleName && !empty($obj->moduleName)) {
 				$searchModuleName = $obj->moduleName;
 			}
 			$moduleLanguagePath = Module::findLanguageFullPath($language, $searchModuleName, $appLang);
-			if($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+			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){
+			if (!$languageFilePath) {
 				$searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $appLang . DS . $file;
-					if(file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$languageFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -432,13 +432,13 @@ 
 				}
 			}
 			$logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
-			if($languageFilePath){
+			if ($languageFilePath) {
 				$lang = array();
 				require_once $languageFilePath;
-				if(! empty($lang) && is_array($lang)){
-					$logger->info('Language file  [' .$languageFilePath. '] contains the valid languages keys add them to language list');
+				if (!empty($lang) && is_array($lang)) {
+					$logger->info('Language file  [' . $languageFilePath . '] contains the valid languages keys add them to language list');
 					//Note: may be here the class 'Lang' not yet loaded
-					$langObj =& class_loader('Lang', 'classes');
+					$langObj = & class_loader('Lang', 'classes');
 					$langObj->addLangMessages($lang);
 					//free the memory
 					unset($lang);
@@ -446,13 +446,13 @@ 
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
 			}
-			else{
+			else {
 				show_error('Unable to find language file [' . $file . ']');
 			}
 		}
 
 
-		private function getResourcesFromAutoloadConfig(){
+		private function getResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -460,23 +460,23 @@ 
 			$autoloads['models']    = array();
 			$autoloads['functions'] = array();
 			//loading of the resources in autoload.php configuration file
-			if(file_exists(CONFIG_PATH . 'autoload.php')){
+			if (file_exists(CONFIG_PATH . 'autoload.php')) {
 				$autoload = array();
 				require_once CONFIG_PATH . 'autoload.php';
-				if(! empty($autoload) && is_array($autoload)){
+				if (!empty($autoload) && is_array($autoload)) {
 					$autoloads = array_merge($autoloads, $autoload);
 					unset($autoload);
 				}
 			}
 			//loading autoload configuration for modules
 			$modulesAutoloads = Module::getModulesAutoloadConfig();
-			if(! empty($modulesAutoloads) && is_array($modulesAutoloads)){
+			if (!empty($modulesAutoloads) && is_array($modulesAutoloads)) {
 				$autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
 			}
 			return $autoloads;
 		}
 
-		private function loadResourcesFromAutoloadConfig(){
+		private function loadResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -488,28 +488,28 @@ 
 
 			$autoloads = array_merge($autoloads, $list);
 			//config autoload
-			foreach($autoloads['config'] as $c){
+			foreach ($autoloads['config'] as $c) {
 				$this->config($c);
 			}
 			
 			//languages autoload
-			foreach($autoloads['languages'] as $language){
+			foreach ($autoloads['languages'] as $language) {
 				$this->lang($language);
 			}
 			
 			//libraries autoload
-			foreach($autoloads['libraries'] as $library){
+			foreach ($autoloads['libraries'] as $library) {
 				$this->library($library);
 			}
 
 			//models autoload
-			if(! empty($autoloads['models']) && is_array($autoloads['models'])){
-				foreach($autoloads['models'] as $model){
+			if (!empty($autoloads['models']) && is_array($autoloads['models'])) {
+				foreach ($autoloads['models'] as $model) {
 					$this->model($model);
 				}
 			}
 			
-			foreach($autoloads['functions'] as $function){
+			foreach ($autoloads['functions'] as $function) {
 				$this->functions($function);
 			}
 		}

core/classes/Module.php

Spacing +79 added lines, -79 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     */
    
-	class Module{
+	class Module {
 		
 		/**
 		 * list of loaded module
@@ -42,9 +42,9 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Module');
 			}
 			return self::$logger[0];
@@ -53,27 +53,27 @@ 
 		/**
 		 * Initialise the module list by scanning the directory MODULE_PATH
 		 */
-		public function init(){
+		public function init() {
 			$logger = self::getLogger();
 			$logger->debug('Check if the application contains the modules ...');
 			$moduleDir = opendir(MODULE_PATH);
-			if(is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+			if (is_resource($moduleDir)) {
+				while (($module = readdir($moduleDir)) !== false) {
+					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)) {
 						self::$list[] = $module;
 					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+					else {
+						$logger->info('Skipping [' . $module . '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
 				closedir($moduleDir);
 			}
 			ksort(self::$list);
 			
-			if(self::hasModule()){
+			if (self::hasModule()) {
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
 			}
-			else{
+			else {
 				$logger->info('The application contains no module skipping');
 			}
 		}
@@ -82,9 +82,9 @@ 
 		 * Get the list of the custom autoload configuration from module if exists
 		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
 		 */
-		public static function getModulesAutoloadConfig(){
+		public static function getModulesAutoloadConfig() {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
@@ -97,10 +97,10 @@ 
 			
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					$autoload = array();
 					require_once $file;
-					if(! empty($autoload) && is_array($autoload)){
+					if (!empty($autoload) && is_array($autoload)) {
 						$autoloads = array_merge_recursive($autoloads, $autoload);
 						unset($autoload);
 					}
@@ -113,23 +113,23 @@ 
 		 * Get the list of the custom routes configuration from module if exists
 		 * @return array|boolean the routes list or false if no module contains the routes configuration
 		 */
-		public static function getModulesRoutes(){
+		public static function getModulesRoutes() {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
 			$routes = array();
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					require_once $file;
-					if(! empty($route) && is_array($route)){
+					if (!empty($route) && is_array($route)) {
 						$routes = array_merge($routes, $route);
 						unset($route);
 					}
-					else{
-						show_error('No routing configuration found in [' .$file. '] for module [' . $module . ']');
+					else {
+						show_error('No routing configuration found in [' . $file . '] for module [' . $module . ']');
 					}
 				}
 			}
@@ -143,23 +143,23 @@ 
 		 * @param  string $module  the module name
 		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
 		 */
-		public static function findControllerFullPath($class, $module = null){
+		public static function findControllerFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking the controller [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found controller [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Controller [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -170,23 +170,23 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this model, return the full path of this model
 		 */
-		public static function findModelFullPath($class, $module = null){
+		public static function findModelFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking model [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found model [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Model [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -197,22 +197,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
 		 */
-		public static function findConfigFullPath($configuration, $module = null){
+		public static function findConfigFullPath($configuration, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$configuration = str_ireplace('.php', '', $configuration);
-			$file = $configuration.'.php';
-			$logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
+			$file = $configuration . '.php';
+			$logger->debug('Checking configuration [' . $configuration . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found configuration [' . $configuration . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -223,23 +223,23 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
 		 */
-		public static function findFunctionFullPath($helper, $module = null){
+		public static function findFunctionFullPath($helper, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$helper = str_ireplace('.php', '', $helper);
 			$helper = str_ireplace('function_', '', $helper);
-			$file = 'function_'.$helper.'.php';
-			$logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
+			$file = 'function_' . $helper . '.php';
+			$logger->debug('Checking helper [' . $helper . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found helper [' . $helper . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Helper [' . $helper . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -251,22 +251,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
 		 */
-		public static function findLibraryFullPath($class, $module = null){
+		public static function findLibraryFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
-			$file = $class.'.php';
-			$logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
+			$file = $class . '.php';
+			$logger->debug('Checking library [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found library [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Library [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -278,9 +278,9 @@ 
 		 * @param string $module the module name to check
 		 * @return boolean|string  false or null if no module have this view, path the full path of the view
 		 */
-		public static function findViewFullPath($view, $module = null){
+		public static function findViewFullPath($view, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
@@ -288,14 +288,14 @@ 
 			$view = trim($view, '/\\');
 			$view = str_ireplace('/', DS, $view);
 			$viewFile = $view . '.php';
-			$logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
+			$logger->debug('Checking view [' . $view . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
-			if(file_exists($filePath)){
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found view [' . $view . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('View [' . $view . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -307,23 +307,23 @@ 
 		 * @param string $appLang the application language like 'en', 'fr'
 		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
 		 */
-		public static function findLanguageFullPath($language, $module = null, $appLang){
+		public static function findLanguageFullPath($language, $module = null, $appLang) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$language = str_ireplace('.php', '', $language);
 			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
+			$file = 'lang_' . $language . '.php';
+			$logger->debug('Checking language [' . $language . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found language [' . $language . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Language [' . $language . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -332,7 +332,7 @@ 
 		 * Get the list of module loaded
 		 * @return array the module list
 		 */
-		public static function getModuleList(){
+		public static function getModuleList() {
 			return self::$list;
 		}
 
@@ -340,7 +340,7 @@ 
 		 * Check if the application has an module
 		 * @return boolean
 		 */
-		public static function hasModule(){
+		public static function hasModule() {
 			return !empty(self::$list);
 		}
 

core/classes/cache/FileCache.php

Spacing +62 added lines, -62 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class FileCache implements CacheInterface{
+	class FileCache implements CacheInterface {
 		
 		/**
 		 * Whether to enable compression of the cache data file.
@@ -39,23 +39,23 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
 			}
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
 			
 			//if Zlib extension is not loaded set compressCacheData to false
-			if(! extension_loaded('zlib')){
+			if (!extension_loaded('zlib')) {
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
@@ -66,17 +66,17 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			if(! file_exists($filePath)){
-				$this->logger->info('No cache file found for the key ['. $key .'], return false');
+			if (!file_exists($filePath)) {
+				$this->logger->info('No cache file found for the key [' . $key . '], return false');
 				return false;
 			}
-			$this->logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
-			$handle = fopen($filePath,'r');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$this->logger->info('The cache file [' . $filePath . '] for the key [' . $key . '] exists, check if the cache data is valid');
+			$handle = fopen($filePath, 'r');
+			if (!is_resource($handle)) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			// Getting a shared lock 
@@ -84,20 +84,20 @@ 
 		    $data = file_get_contents($filePath);
       		fclose($handle);
       		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+      		if (!$data) {
+      			$this->logger->error('Can not unserialize the cache data for the key [' . $key . '], return false');
 		         // If unserializing somehow didn't work out, we'll delete the file
 		         unlink($filePath);
 		         return false;
 	      	}
 	      	if (time() > $data['expire']) {
-	      		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+	      		$this->logger->info('The cache data for the key [' . $key . '] already expired delete the cache file [' . $filePath . ']');
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
 		     }
-		     else{
-		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+		     else {
+		     	$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
 		}
@@ -110,13 +110,13 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$filePath = $this->getFilePath($key);
-			$handle = fopen($filePath,'w');
-			if(! is_resource($handle)){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$handle = fopen($filePath, 'w');
+			if (!is_resource($handle)) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -129,13 +129,13 @@ 
 									)
 								);		   
 		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+		    if (!$result) {
+		    	$this->logger->error('Can not write cache data into file [' . $filePath . '] for the key [' . $key . '], return false');
 		    	fclose($handle);
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved into file [' . $filePath . '] for the key [' . $key . ']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
 				return true;
@@ -149,16 +149,16 @@ 
 		 * @return boolean      true if the cache is delete, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] remove it');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] remove it');
 	      		unlink($filePath);
 				return true;
 			}
@@ -172,25 +172,25 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-				if(! $data){
+				if (!$data) {
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
 				}
-				else{
+				else {
 					$this->logger->info('This cache data is OK check for expire');
-					if(isset($data['expire']) && $data['expire'] > time()){
+					if (isset($data['expire']) && $data['expire'] > time()) {
 						$this->logger->info('This cache not yet expired return cache informations');
 						$info = array(
 							'mtime' => $data['mtime'],
@@ -199,7 +199,7 @@ 
 							);
 						return $info;
 					}
-					else{
+					else {
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -211,26 +211,26 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			$this->logger->debug('Deleting of expired cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
+		      		if (!$data) {
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
 		      		}
-		      		else if(time() > $data['expire']){
+		      		else if (time() > $data['expire']) {
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			unlink($file);
 		      		}
-		      		else{
+		      		else {
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -240,13 +240,13 @@ 
 		/**
 		 * Remove all file from cache folder
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -258,7 +258,7 @@ 
 	    /**
 	     * @return boolean
 	     */
-	    public function isCompressCacheData(){
+	    public function isCompressCacheData() {
 	        return $this->compressCacheData;
 	    }
 
@@ -267,14 +267,14 @@ 
 	     *
 	     * @return self
 	     */
-	    public function setCompressCacheData($status = true){
+	    public function setCompressCacheData($status = true) {
 			//if Zlib extension is not loaded set compressCacheData to false
-			if($status === true && ! extension_loaded('zlib')){
+			if ($status === true && !extension_loaded('zlib')) {
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
-			else{
+			else {
 				$this->compressCacheData = $status;
 			}
 			return $this;
@@ -285,7 +285,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
 		}
 
@@ -293,7 +293,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -301,7 +301,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -312,7 +312,7 @@ 
 		* @param $key the cache item key
 		* @return string  		the full cache file path for this key
 		*/
-		private function getFilePath($key){
+		private function getFilePath($key) {
 			return CACHE_PATH . md5($key) . '.cache';
 		}
 	}

core/classes/Response.php

Spacing +74 added lines, -74 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Response{
+	class Response {
 
 		/**
 		 * The list of request header to send with response
@@ -65,9 +65,9 @@ 
 		/**
 		 * Construct new response instance
 		 */
-		public function __construct(){
-			$this->_currentUrl =  (! empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '' )
-					. (! empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '' );
+		public function __construct() {
+			$this->_currentUrl = (!empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '')
+					. (!empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '');
 					
 			$this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
@@ -82,9 +82,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Response');
 			}
 			return self::$logger[0];
@@ -95,12 +95,12 @@ 
 		 * @param  integer $httpCode the HTTP status code
 		 * @param  array   $headers   the additional headers to add to the existing headers list
 		 */
-		public static function sendHeaders($httpCode = 200, array $headers = array()){
+		public static function sendHeaders($httpCode = 200, array $headers = array()) {
 			set_http_status_header($httpCode);
 			self::setHeaders($headers);
-			if(! headers_sent()){
-				foreach(self::getHeaders() as $key => $value){
-					header($key .': '.$value);
+			if (!headers_sent()) {
+				foreach (self::getHeaders() as $key => $value) {
+					header($key . ': ' . $value);
 				}
 			}
 		}
@@ -109,7 +109,7 @@ 
 		 * Get the list of the headers
 		 * @return array the headers list
 		 */
-		public static function getHeaders(){
+		public static function getHeaders() {
 			return self::$headers;
 		}
 
@@ -118,7 +118,7 @@ 
 		 * @param  string $name the header name
 		 * @return string       the header value
 		 */
-		public static function getHeader($name){
+		public static function getHeader($name) {
 			return array_key_exists($name, self::$headers) ? self::$headers[$name] : null;
 		}
 
@@ -128,7 +128,7 @@ 
 		 * @param string $name  the header name
 		 * @param string $value the header value to be set
 		 */
-		public static function setHeader($name, $value){
+		public static function setHeader($name, $value) {
 			self::$headers[$name] = $value;
 		}
 
@@ -137,7 +137,7 @@ 
 		 * @param array $headers the list of the headers to set. 
 		 * Note: this will merge with the existing headers
 		 */
-		public static function setHeaders(array $headers){
+		public static function setHeaders(array $headers) {
 			self::$headers = array_merge(self::getHeaders(), $headers);
 		}
 		
@@ -145,17 +145,17 @@ 
 		 * Redirect user in the specified page
 		 * @param  string $path the URL or URI to be redirect to
 		 */
-		public static function redirect($path = ''){
+		public static function redirect($path = '') {
 			$logger = self::getLogger();
 			$url = Url::site_url($path);
-			$logger->info('Redirect to URL [' .$url. ']');
-			if(! headers_sent()){
-				header('Location: '.$url);
+			$logger->info('Redirect to URL [' . $url . ']');
+			if (!headers_sent()) {
+				header('Location: ' . $url);
 				exit;
 			}
-			else{
+			else {
 				echo '<script>
-						location.href = "'.$url.'";
+						location.href = "'.$url . '";
 					</script>';
 			}
 		}
@@ -168,10 +168,10 @@ 
 		 * @return void|string          if $return is true will return the view content otherwise
 		 * will display the view content.
 		 */
-		public function render($view, $data = null, $return = false){
+		public function render($view, $data = null, $return = false) {
 			$logger = self::getLogger();
 			//convert data to an array
-			$data = ! is_array($data) ? (array) $data : $data;
+			$data = !is_array($data) ? (array) $data : $data;
 			$view = str_ireplace('.php', '', $view);
 			$view = trim($view, '/\\');
 			$viewFile = $view . '.php';
@@ -180,42 +180,42 @@ 
 			//super instance
 			$obj = & get_instance();
 			
-			if(Module::hasModule()){
+			if (Module::hasModule()) {
 				//check in module first
 				$logger->debug('Checking the view [' . $view . '] from module list ...');
 				$mod = null;
 				//check if the request class contains module name
-				if(strpos($view, '/') !== false){
+				if (strpos($view, '/') !== false) {
 					$viewPath = explode('/', $view);
-					if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
+					if (isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())) {
 						$mod = $viewPath[0];
 						array_shift($viewPath);
 						$view = implode('/', $viewPath);
 						$viewFile = $view . '.php';
 					}
 				}
-				if(! $mod && !empty($obj->moduleName)){
+				if (!$mod && !empty($obj->moduleName)) {
 					$mod = $obj->moduleName;
 				}
-				if($mod){
+				if ($mod) {
 					$moduleViewPath = Module::findViewFullPath($view, $mod);
-					if($moduleViewPath){
+					if ($moduleViewPath) {
 						$path = $moduleViewPath;
-						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
+						$logger->info('Found view [' . $view . '] in module [' . $mod . '], the file path is [' . $moduleViewPath . '] we will used it');
 					}
-					else{
-						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
+					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.');
 				}
 			}
 			$logger->info('The view file path to be loaded is [' . $path . ']');
 			$found = false;
-			if(file_exists($path)){
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
+			if (file_exists($path)) {
+				foreach (get_object_vars($obj) as $key => $value) {
+					if (!isset($this->{$key})) {
 						$this->{$key} = & $obj->{$key};
 					}
 				}
@@ -224,44 +224,44 @@ 
 				//need use require() instead of require_once because can load this view many time
 				require $path;
 				$content = ob_get_clean();
-				if($return){
+				if ($return) {
 					return $content;
 				}
 				$this->_pageRender .= $content;
 				$found = true;
 			}
-			if(! $found){
-				show_error('Unable to find view [' .$view . ']');
+			if (!$found) {
+				show_error('Unable to find view [' . $view . ']');
 			}
 		}
 		
 		/**
 		* Send the final page output to user
 		*/
-		public function renderFinalPage(){
+		public function renderFinalPage() {
 			$logger = self::getLogger();
 			$obj = & get_instance();
 			$cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
 			$dispatcher = $obj->eventdispatcher;
 			$content = $this->_pageRender;
-			if(! $content){
+			if (!$content) {
 				$logger->warning('The final view content is empty.');
 				return;
 			}
 			//dispatch
 			$event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
-			$content = ! empty($event->payload) ? $event->payload : null;
-			if(empty($content)){
+			$content = !empty($event->payload) ? $event->payload : null;
+			if (empty($content)) {
 				$logger->warning('The view content is empty after dispatch to event listeners.');
 			}
 			
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				//current page URL
 				$url = $this->_currentUrl;
 				//Cache view Time to live in second
 				$viewCacheTtl = get_config('cache_ttl');
-				if (!empty($obj->view_cache_ttl)){
+				if (!empty($obj->view_cache_ttl)) {
 					$viewCacheTtl = $obj->view_cache_ttl;
 				}
 				//the cache handler instance
@@ -274,14 +274,14 @@ 
 				
 				//get the cache information to prepare header to send to browser
 				$cacheInfo = $cacheInstance->getInfo($cacheKey);
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$lastModified = $cacheInfo['mtime'];
 					$expire = $cacheInfo['expire'];
 					$maxAge = $expire - time();
 					self::setHeader('Pragma', 'public');
 					self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-					self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-					self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');	
+					self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+					self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');	
 				}
 			}
 			
@@ -293,7 +293,7 @@ 
 			
 			//compress the output if is available
 			$type = null;
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				$type = 'ob_gzhandler';
 			}
 			ob_start($type);
@@ -305,7 +305,7 @@ 
 		/**
 		* Send the final page output to user if is cached
 		*/
-		public function renderFinalPageFromCache(&$cache){
+		public function renderFinalPageFromCache(&$cache) {
 			$logger = self::getLogger();
 			$url = $this->_currentUrl;					
 			//the current page cache key for identification
@@ -314,25 +314,25 @@ 
 			$logger->debug('Checking if the page content for the URL [' . $url . '] is cached ...');
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$lastModified = $cacheInfo['mtime'];
 				$expire = $cacheInfo['expire'];
 				$maxAge = $expire - $_SERVER['REQUEST_TIME'];
 				self::setHeader('Pragma', 'public');
 				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
-				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
+				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 					$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
 					$content = $cache->get($pageCacheKey);
-					if($content){
+					if ($content) {
 						$logger->info('The page content for the URL [' . $url . '] already cached just display it');
 						//load benchmark class
 						$benchmark = & class_loader('Benchmark');
@@ -345,17 +345,17 @@ 
 						
 						///display the final output
 						//compress the output if is available
-						if (self::$_canCompressOutput){
+						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);
 					}
@@ -367,7 +367,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -375,14 +375,14 @@ 
 		 * Send the HTTP 404 error if can not found the 
 		 * routing information for the current request
 		 */
-		public static function send404(){
+		public static function send404() {
 			/********* for logs **************/
 			//can't use $obj = & get_instance()  here because the global super object will be available until
 			//the main controller is loaded even for Loader::library('xxxx');
 			$logger = self::getLogger();
-			$request =& class_loader('Request', 'classes');
-			$userAgent =& class_loader('Browser');
-			$browser = $userAgent->getPlatform().', '.$userAgent->getBrowser().' '.$userAgent->getVersion();
+			$request = & class_loader('Request', 'classes');
+			$userAgent = & class_loader('Browser');
+			$browser = $userAgent->getPlatform() . ', ' . $userAgent->getBrowser() . ' ' . $userAgent->getVersion();
 			
 			//here can't use Loader::functions just include the helper manually
 			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
@@ -392,12 +392,12 @@ 
 			$logger->error($str);
 			/***********************************/
 			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				require_once $path;
@@ -405,8 +405,8 @@ 
 				self::sendHeaders(404);
 				echo $output;
 			}
-			else{
-				show_error('The 404 view [' .$path. '] does not exist');
+			else {
+				show_error('The 404 view [' . $path . '] does not exist');
 			}
 		}
 
@@ -414,14 +414,14 @@ 
 		 * Display the error to user
 		 * @param  array  $data the error information
 		 */
-		public static function sendError(array $data = array()){
+		public static function sendError(array $data = array()) {
 			$path = CORE_VIEWS_PATH . 'errors.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if exists
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				extract($data);
@@ -430,7 +430,7 @@ 
 				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/Router.php

Spacing +59 added lines, -59 removed lines

@@ -92,37 +92,37 @@ 
 		/**
 		 * 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');
 				$route = array();
 				require_once $routesPath;
-				if(! empty($route) && is_array($route)){
+				if (!empty($route) && is_array($route)) {
 					$this->routes = $route;
 					unset($route);
 				}
 			}
-			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);
 			}
 			
@@ -130,14 +130,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);
@@ -152,7 +152,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;
@@ -163,7 +163,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -171,7 +171,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -179,7 +179,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -187,7 +187,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -195,7 +195,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -203,7 +203,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -212,27 +212,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]+', '.*');
@@ -246,20 +246,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;
@@ -269,73 +269,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);
 							}
@@ -345,18 +345,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';
 				}
 			}
@@ -366,20 +366,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();
@@ -389,12 +389,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();
 			}
 		}

core/classes/Database.php

Spacing +115 added lines, -115 removed lines

@@ -23,110 +23,110 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
 	/**
 	 * The PDO instance
 	 * @var object
 	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
 	*/
-	private $databaseName        = null;
+	private $databaseName = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
 	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
 	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
 	*/
-    private $query               = null;
+    private $query = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
 	*/
-	private $cacheTtl              = 0;
+	private $cacheTtl = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
 	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
 	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
 	*/
-    private $data                = array();
+    private $data = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
 	*/
-    private $config              = array();
+    private $config = array();
 	
 	/**
 	 * The logger instance
 	 * @var object
 	 */
-    private $logger              = null;
+    private $logger = null;
 
     /**
     * The cache instance
     * @var object
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
     /**
     * The benchmark instance
     * @var object
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 	
 	/**
     * The DatabaseQueryBuilder instance
     * @var object
     */
-    private $queryBuilder        = null;
+    private $queryBuilder = null;
 
 
     /**
      * Construct new database
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      */
-    public function __construct($overwriteConfig = array()){
+    public function __construct($overwriteConfig = array()) {
         //Set Log instance to use
         $this->setLoggerFromParamOrCreateNewInstance(null);
 		
@@ -144,23 +144,23 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $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;
       }
@@ -171,7 +171,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -179,15 +179,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if ($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -198,13 +198,13 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->getQueryBuilder()->limit(1);
       $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
+      else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
       }
     }
@@ -215,9 +215,9 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
 	   $query = $this->getQueryBuilder()->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
+	   if ($returnSQLQueryOrResultType === true) {
       	return $query;
       }
       return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
@@ -229,18 +229,18 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function insert($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
       }
       $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
       $result = $this->query($query);
-      if ($result){
+      if ($result) {
         $this->insertId = $this->pdo->lastInsertId();
 		//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! $this->insertId() ? true : $this->insertId();
+        return !$this->insertId() ? true : $this->insertId();
       }
       return false;
     }
@@ -251,8 +251,8 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function update($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
@@ -265,7 +265,7 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
 		$query = $this->getQueryBuilder()->delete()->getQuery();
     	return $this->query($query);
     }
@@ -275,8 +275,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if ($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
         $this->temporaryCacheTtl = $ttl;
       }
@@ -288,8 +288,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-  	public function cached($ttl = 0){
-        if ($ttl > 0){
+  	public function cached($ttl = 0) {
+        if ($ttl > 0) {
           $this->temporaryCacheTtl = $ttl;
         }
         return $this;
@@ -301,7 +301,7 @@ 
      * @param boolean $escaped whether we can do escape of not 
      * @return mixed       the data after escaped or the same data if not
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
       return $escaped ? 
                       $this->getPdo()->quote(trim($data)) 
                       : $data; 
@@ -311,7 +311,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -319,7 +319,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -327,7 +327,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -335,7 +335,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -344,7 +344,7 @@ 
      * @param object $pdo the pdo object
 	 * @return object Database
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -354,7 +354,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -363,7 +363,7 @@ 
      * @param Log $logger the log object
 	 * @return object Database
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -372,7 +372,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -381,7 +381,7 @@ 
      * @param CacheInterface $cache the cache object
 	 * @return object Database
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -390,7 +390,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -399,7 +399,7 @@ 
      * @param Benchmark $benchmark the benchmark object
 	 * @return object Database
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -409,7 +409,7 @@ 
      * Return the DatabaseQueryBuilder instance
      * @return object DatabaseQueryBuilder
      */
-    public function getQueryBuilder(){
+    public function getQueryBuilder() {
       return $this->queryBuilder;
     }
 
@@ -417,7 +417,7 @@ 
      * Set the DatabaseQueryBuilder instance
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder) {
       $this->queryBuilder = $queryBuilder;
       return $this;
     }
@@ -426,7 +426,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -437,9 +437,9 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value = null, $escape = true){
-  	  if(is_array($key)){
-    		foreach($key as $k => $v){
+    public function setData($key, $value = null, $escape = true) {
+  	  if (is_array($key)) {
+    		foreach ($key as $k => $v) {
     			$this->setData($k, $v, $escape);
     		}	
   	  } else {
@@ -456,7 +456,7 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
       $query = $this->getPreparedQuery($query, $all);
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
@@ -464,9 +464,9 @@ 
       $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
 
       $this->logger->info(
-                          'Execute SQL query ['.$this->query.'], return type: ' 
-                          . ($array?'ARRAY':'OBJECT') .', return as list: ' 
-                          . (is_bool($all) && $all ? 'YES':'NO')
+                          'Execute SQL query [' . $this->query . '], return type: ' 
+                          . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' 
+                          . (is_bool($all) && $all ? 'YES' : 'NO')
                         );
       //cache expire time
       $cacheExpire = $this->temporaryCacheTtl;
@@ -483,15 +483,15 @@ 
       //if can use cache feature for this query
       $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
+      if ($dbCacheStatus && $isSqlSELECTQuery) {
           $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
           $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
       }
       
-      if ( !$cacheContent){
+      if (!$cacheContent) {
         $sqlQuery = $this->runSqlQuery($query, $all, $array);
-        if (is_object($sqlQuery)){
-          if ($isSqlSELECTQuery){
+        if (is_object($sqlQuery)) {
+          if ($isSqlSELECTQuery) {
             $this->setQueryResultForSelect($sqlQuery, $all, $array);
             $this->setCacheContentForQuery(
                                             $this->query, 
@@ -500,15 +500,15 @@ 
                                             $dbCacheStatus && $isSqlSELECTQuery, 
                                             $cacheExpire
                                           );
-            if (! $this->result){
+            if (!$this->result) {
               $this->logger->info('No result where found for the query [' . $query . ']');
             }
           } else {
               $this->setQueryResultForNonSelect($sqlQuery);
           }
         }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      } else if ($isSqlSELECTQuery) {
+          $this->logger->info('The result for query [' . $this->query . '] already cached use it');
           $this->result = $cacheContent;
           $this->numRows = count($this->result);
       }
@@ -521,11 +521,11 @@ 
      * 
      * @return object|void
      */
-    public function runSqlQuery($query, $all, $array){
+    public function runSqlQuery($query, $all, $array) {
        //for database query execution time
         $benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
         $benchmarkInstance = $this->getBenchmark();
-        if (! is_object($benchmarkInstance)){
+        if (!is_object($benchmarkInstance)) {
           $obj = & get_instance();
           $benchmarkInstance = $obj->benchmark; 
           $this->setBenchmark($benchmarkInstance);
@@ -538,13 +538,13 @@ 
         //get response time for this query
         $responseTime = $benchmarkInstance->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 		    //TODO use the configuration value for the high response time currently is 1 second
-        if ($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
 		    //count the number of query execution to server
         $this->queryCount++;
 		
-        if ($sqlQuery !== false){
+        if ($sqlQuery !== false) {
           return $sqlQuery;
         }
         $this->setQueryError();
@@ -555,7 +555,7 @@ 
 	 * Return the database configuration
 	 * @return array
 	 */
-	public  function getDatabaseConfiguration(){
+	public  function getDatabaseConfiguration() {
 	  return $this->config;
 	}
 
@@ -565,9 +565,9 @@ 
     * @param boolean $useConfigFile whether to use database configuration file
 	  * @return object Database
     */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
         $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')) {
             //here don't use require_once because somewhere user can create database instance directly
             require CONFIG_PATH . 'database.php';
         }
@@ -592,7 +592,7 @@ 
     		//determine the port using the hostname like localhost:3307
         //hostname will be "localhost", and port "3307"
         $p = explode(':', $config['hostname']);
-    	  if (count($p) >= 2){
+    	  if (count($p) >= 2) {
     		  $config['hostname'] = $p[0];
     		  $config['port'] = $p[1];
     		}
@@ -611,7 +611,7 @@ 
 		 $this->connect();
 		 
 		 //update queryBuilder with some properties needed
-		 if(is_object($this->getQueryBuilder())){
+		 if (is_object($this->getQueryBuilder())) {
 			  $this->getQueryBuilder()->setDriver($config['driver']);
 			  $this->getQueryBuilder()->setPrefix($config['prefix']);
 			  $this->getQueryBuilder()->setPdo($this->getPdo());
@@ -623,19 +623,19 @@ 
    * Set the result for SELECT query using PDOStatment
    * @see Database::query
    */
-    protected function setQueryResultForSelect($pdoStatment, $all, $array){
+    protected function setQueryResultForSelect($pdoStatment, $all, $array) {
       //if need return all result like list of record
-      if (is_bool($all) && $all){
+      if (is_bool($all) && $all) {
           $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
       }
-      else{
+      else {
           $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
         $this->numRows = count($this->result);  
       }
-      else{
+      else {
         $this->numRows = $pdoStatment->rowCount(); 
       }
     }
@@ -644,13 +644,13 @@ 
      * Set the result for other command than SELECT query using PDOStatment
      * @see Database::query
      */
-    protected function setQueryResultForNonSelect($pdoStatment){
+    protected function setQueryResultForNonSelect($pdoStatment) {
       //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
         $this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $this->numRows = 1; //TODO use the correct method to get the exact affected row
       }
-      else{
+      else {
           $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
           $this->numRows = $pdoStatment->rowCount(); 
       }
@@ -662,9 +662,9 @@ 
      * This method is used to get the PDO DSN string using the configured driver
      * @return string the DSN string
      */
-    protected function getDsnFromDriver(){
+    protected function getDsnFromDriver() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+      if (!empty($config)) {
         $driver = $config['driver'];
         $driverDsnMap = array(
                                 'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
@@ -689,12 +689,12 @@ 
      *
      * @return string
      */
-    protected function getPreparedQuery($query, $data){
-      if (is_array($data)){
+    protected function getPreparedQuery($query, $data) {
+      if (is_array($data)) {
   			$x = explode('?', $query);
   			$q = '';
-  			foreach($x as $k => $v){
-  			  if (! empty($v)){
+  			foreach ($x as $k => $v) {
+  			  if (!empty($v)) {
   				  $q .= $v . (isset($data[$k]) ? $this->escape($data[$k]) : '');
   			  }
   			}
@@ -709,9 +709,9 @@ 
      *      
      * @return mixed
      */
-    protected function getCacheContentForQuery($query, $all, $array){
+    protected function getCacheContentForQuery($query, $all, $array) {
         $cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        if (! is_object($this->getCacheInstance())){
+        if (!is_object($this->getCacheInstance())) {
     			//can not call method with reference in argument
     			//like $this->setCacheInstance(& get_instance()->cache);
     			//use temporary variable
@@ -729,10 +729,10 @@ 
      * @param boolean $status whether can save the query result into cache
      * @param int $expire the cache TTL
      */
-     protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
-        if ($status){
-            $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-            if (! is_object($this->getCacheInstance())){
+     protected function setCacheContentForQuery($query, $key, $result, $status, $expire) {
+        if ($status) {
+            $this->logger->info('Save the result for query [' . $query . '] into cache for future use');
+            if (!is_object($this->getCacheInstance())) {
       				//can not call method with reference in argument
       				//like $this->setCacheInstance(& get_instance()->cache);
       				//use temporary variable
@@ -747,7 +747,7 @@ 
     /**
      * Set error for database query execution
      */
-    protected function setQueryError(){
+    protected function setQueryError() {
       $error = $this->pdo->errorInfo();
       $this->error = isset($error[2]) ? $error[2] : '';
       $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
@@ -761,8 +761,8 @@ 
      * 
      *  @return string
      */
-    protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
-      if (is_array($all)){
+    protected function getCacheBenchmarkKeyForQuery($query, $all, $array) {
+      if (is_array($all)) {
         $all = 'array';
       }
       return md5($query . $all . $array);
@@ -772,12 +772,12 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+      if ($logger !== null) {
         $this->setLogger($logger);
       }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
+      else {
+          $this->logger = & class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
     }
@@ -786,19 +786,19 @@ 
    * Set the DatabaseQueryBuilder instance using argument or create new instance
    * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
    */
-	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
-	  if ($queryBuilder !== null){
+	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null) {
+	  if ($queryBuilder !== null) {
       $this->setQueryBuilder($queryBuilder);
 	  }
-	  else{
-		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes');
+	  else {
+		  $this->queryBuilder = & class_loader('DatabaseQueryBuilder', 'classes');
 	  }
 	}
 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
-    private function reset(){
+    private function reset() {
 	   //query builder reset
       $this->getQueryBuilder()->reset();
       $this->numRows  = 0;
@@ -812,7 +812,7 @@ 
     /**
      * The class destructor
      */
-    public function __destruct(){
+    public function __destruct() {
       $this->pdo = null;
     }
 

core/libraries/Html.php

Spacing +43 added lines, -43 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Html{
+	class Html {
 
 		/**
 		 * Generate the html anchor link
@@ -35,21 +35,21 @@ 
 		 *
 		 * @return string|void             the anchor link generated html if $return is true or display it if not
 		 */
-		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
-			if(! is_url($link)){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
+			if (!is_url($link)) {
 				$link = Url::site_url($link);
 			}
-			if(! $anchor){
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "'.$link.'"';
+			$str .= '<a href = "' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -64,18 +64,18 @@ 
 		 *
 		 * @return string|void             the generated html for mailto link if $return is true or display it if not
 		 */
-		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-			if(! $anchor){
+		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true) {
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
+			$str .= '<a href = "mailto:' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -88,14 +88,14 @@ 
 		 *
 		 * @return string|void      the generated "br" html if $return is true or display it if not
 		 */
-		public static function br($nb = 1, $return = true){
+		public static function br($nb = 1, $return = true) {
 			$nb = (int) $nb;
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
 				$str .= '<br />';
 			}
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -109,13 +109,13 @@ 
 		 *
 		 * @return string|void the generated "hr" html if $return is true or display it if not.
 		 */
-		public static function hr($nb = 1, array $attributes = array(), $return = true){
+		public static function hr($nb = 1, array $attributes = array(), $return = true) {
 			$nb = (int) $nb;
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<hr' .attributes_to_string($attributes). ' />';
+				$str .= '<hr' . attributes_to_string($attributes) . ' />';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -131,17 +131,17 @@ 
 		 *
 		 * @return string|void the generated header html if $return is true or display it if not.
 		 */
-		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
+		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true) {
 			$nb = (int) $nb;
 			$type = (int) $type;
-			if($type <= 0 || $type > 6){
+			if ($type <= 0 || $type > 6) {
 				$type = 1;
 			}
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+				$str .= '<h' . $type . attributes_to_string($attributes) . '>' . $text . '</h' . $type . '>';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -156,15 +156,15 @@ 
 		 *
 		 * @return string|void the generated "ul" html  if $return is true or display it if not.
 		 */
-		public static function ul($data = array(), $attributes = array(), $return = true){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
+			$str .= '<ul' . (!empty($attributes['ul']) ? attributes_to_string($attributes['ul']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ul>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -178,15 +178,15 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "ol" html  if $return is true or display it if not.
 		 */
-		public static function ol($data = array(), $attributes = array(), $return = true){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
+			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ol>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -204,46 +204,46 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "table" html  if $return is true or display it if not.
 		 */
-		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true) {
 			$headers = (array) $headers;
 			$body = (array) $body;
 			$str = null;
-			$str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
-			if(! empty($headers)){
-				$str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
+			$str .= '<table' . (!empty($attributes['table']) ? attributes_to_string($attributes['table']) : '') . '>';
+			if (!empty($headers)) {
+				$str .= '<thead' . (!empty($attributes['thead']) ? attributes_to_string($attributes['thead']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
 			}
-			else{
+			else {
 				//no need check for footer
 				$use_footer = false;
 			}
-			$str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
+			$str .= '<tbody' . (!empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']) : '') . '>';
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . (!empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']) : '') . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
+						$str .= '<td' . (!empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']) : '') . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
 			}
 			$str .= '</tbody>';
-			if($use_footer){
-				$str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
+			if ($use_footer) {
+				$str .= '<tfoot' . (!empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;

core/libraries/Upload.php

Spacing +48 added lines, -48 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload{
+    class Upload {
 
         /**
         *   Version
@@ -69,7 +69,7 @@ 
         *    @version    1.0
         *    @var        array
         */
-        private $file_array    = array();
+        private $file_array = array();
 
         /**
         *    If the file you are trying to upload already exists it will
@@ -119,7 +119,7 @@ 
         *    @version    1.0
         *    @var        float
         */
-        private $max_file_size= 0.0;
+        private $max_file_size = 0.0;
 
         /**
         *    List of allowed mime types
@@ -217,12 +217,12 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
+        public function __construct() {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
 
             Loader::lang('file_upload');
-            $obj =& get_instance();
+            $obj = & get_instance();
 
             $this->error_messages = array(
                 'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
@@ -239,15 +239,15 @@ 
             );
 
             $this->file = array(
-                'status'                =>    false,    // True: success upload
-                'mime'                  =>    '',       // Empty string
-                'filename'              =>    '',       // Empty string
-                'original'              =>    '',       // Empty string
-                'size'                  =>    0,        // 0 Bytes
-                'sizeFormated'          =>    '0B',     // 0 Bytes
-                'destination'           =>    './',     // Default: ./
-                'allowed_mime_types'    =>    array(),  // Allowed mime types
-                'error'                 =>    null,        // File error
+                'status'                =>    false, // True: success upload
+                'mime'                  =>    '', // Empty string
+                'filename'              =>    '', // Empty string
+                'original'              =>    '', // Empty string
+                'size'                  =>    0, // 0 Bytes
+                'sizeFormated'          =>    '0B', // 0 Bytes
+                'destination'           =>    './', // Default: ./
+                'allowed_mime_types'    =>    array(), // Allowed mime types
+                'error'                 =>    null, // File error
             );
 
             // Change dir to current dir
@@ -257,7 +257,7 @@ 
             if (isset($_FILES) && is_array($_FILES)) {
                 $this->file_array = $_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -273,7 +273,7 @@ 
         */
         public function setInput($input)
         {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+            if (!empty($input) && (is_string($input) || is_numeric($input))) {
                 $this->input = $input;
             }
             return $this;
@@ -309,7 +309,7 @@ 
         */
         public function setAutoFilename()
         {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
+            $this->filename = sha1(mt_rand(1, 9999) . uniqid());
             $this->filename .= time();
             return $this;
         }
@@ -330,7 +330,7 @@ 
                 $php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
                 // Calculate difference
                 if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+                    $this->logger->warning('The upload max file size you set [' . $file_size . '] is greather than the PHP configuration for upload max file size [' . $php_size . ']');
                 }
                 $this->max_file_size = $file_size;
             }
@@ -348,7 +348,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -413,7 +413,7 @@ 
         {
             if (!empty($name) && is_string($name)) {
                 if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+                    return $this->setAllowedMimeTypes($this->mime_helping[$name]);
                 }
             }
             return $this;
@@ -432,8 +432,8 @@ 
         */
         public function setUploadFunction($function)
         {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
+            if (!empty($function) && (is_array($function) || is_string($function))) {
+                if (is_callable($function)) {
                     $this->upload_function = $function;
                 }
             }
@@ -478,8 +478,8 @@ 
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -529,7 +529,7 @@ 
         public function isFilename($filename)
         {
             $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+            return (!empty($filename) && (is_string($filename) || is_numeric($filename)));
         }
         /**
         *    Validate mime type with allowed mime types,
@@ -571,11 +571,11 @@ 
         */
         public function isDirpath($path)
         {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+            if (!empty($path) && (is_string($path) || is_numeric($path))) {
                 if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+                    return (preg_match('/^[^*?"<>|:]*$/', $path) == 1);
                 } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+                    return (preg_match("/^[^*?\"<>|:]*$/", substr($path, 2)) == 1);
                 }
             }
             return false;
@@ -603,7 +603,7 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
 
@@ -611,7 +611,7 @@ 
          * Check if the file is uploaded
          * @return boolean
          */
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             && is_uploaded_file($this->file_array[$this->input]['tmp_name']);
         }
@@ -620,15 +620,15 @@ 
          * Check if file upload has error
          * @return boolean
          */
-        protected function uploadHasError(){
+        protected function uploadHasError() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return true;
             }
 
              //check for php upload error
-            if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+            if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
             }
@@ -663,14 +663,14 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             if (count($this->file_array) > 0) {
                 if (array_key_exists($this->input, $this->file_array)) {
                     // set original filename if not have a new name
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
                     }
-                    else{
+                    else {
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -694,15 +694,15 @@ 
                     $this->file['filename']     = $this->filename;
                     $this->file['error']        = $this->file_array[$this->input]['error'];
 
-                    $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+                    $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                     $error = $this->uploadHasError();
-                    if($error){
+                    if ($error) {
                         return false;
                     }
                     // Execute input callback
-                    if (!empty( $this->callbacks['input'])) {
-                        call_user_func($this->callbacks['input'], (object)$this->file);
+                    if (!empty($this->callbacks['input'])) {
+                        call_user_func($this->callbacks['input'], (object) $this->file);
                     }
                    
 
@@ -714,8 +714,8 @@ 
                     );
 
                     // Execute output callback
-                    if (!empty( $this->callbacks['output'])) {
-                        call_user_func($this->callbacks['output'], (object)$this->file);
+                    if (!empty($this->callbacks['output'])) {
+                        call_user_func($this->callbacks['output'], (object) $this->file);
                     }
                     return $this->file['status'];
                 }
@@ -734,10 +734,10 @@ 
         */
         public function sizeFormat($size, $precision = 2)
         {
-            if($size > 0){
+            if ($size > 0) {
                 $base       = log($size) / log(1024);
                 $suffixes   = array('B', 'K', 'M', 'G', 'T');
-                return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
+                return round(pow(1024, $base - floor($base)), $precision) . (isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
             }
             return null;
         }
@@ -761,14 +761,14 @@ 
             if (array_key_exists('unit', $matches)) {
                 $unit = strtoupper($matches['unit']);
             }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+            return (floatval($matches['size']) * pow(1024, $units[$unit]));
         }
 
         /**
          * Get the upload error message
          * @return string
          */
-        public function getError(){
+        public function getError() {
             return $this->error;
         }
 
@@ -776,7 +776,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The file upload got error : ' . $message);
             $this->error = $message;
         }
@@ -786,7 +786,7 @@ 
          * @param  int $code the error code
          * @return string the error message
          */
-        private function getPhpUploadErrorMessageByCode($code){
+        private function getPhpUploadErrorMessageByCode($code) {
             $codeMessageMaps = array(
                 1 => $this->error_messages['upload_err_ini_size'],
                 2 => $this->error_messages['upload_err_form_size'],

core/libraries/Assets.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	 *  @since 1.0.0
 	 *  @filesource
 	 */
-	class Assets{
+	class Assets {
 		
 		/**
 		 * The logger instance
@@ -50,10 +50,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				//can't assign reference to static variable
-				self::$logger[0] =& class_loader('Log', 'classes');
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Assets');
 			}
 			return self::$logger[0];
@@ -72,13 +72,13 @@ 
 		 *  @param $asset the name of the assets file path with the extension.
 		 *  @return string|null       the absolute path of the assets file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function path($asset){
+		public static function path($asset) {
 			$logger = self::getLogger();	
 			$path = ASSETS_PATH . $asset;
 			
 			$logger->debug('Including the Assets file [' . $path . ']');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] included successfully');
 				return Url::base_url($path);
 			}
@@ -98,7 +98,7 @@ 
 		 *  @param $path the name of the css file without the extension.
 		 *  @return string|null the absolute path of the css file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function css($path){
+		public static function css($path) {
 			$logger = self::getLogger();
 			/*
 			* if the file name contains the ".css" extension, replace it with 
@@ -109,7 +109,7 @@ 
 			
 			$logger->debug('Including the Assets file [' . $path . '] for CSS');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for CSS included successfully');
 				return Url::base_url($path);
 			}
@@ -129,12 +129,12 @@ 
 		 *  @param $path the name of the javascript file without the extension.
 		 *  @return string|null the absolute path of the javascript file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function js($path){
+		public static function js($path) {
 			$logger = self::getLogger();
 			$path = str_ireplace('.js', '', $path);
 			$path = ASSETS_PATH . 'js/' . $path . '.js';
 			$logger->debug('Including the Assets file [' . $path . '] for javascript');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for Javascript included successfully');
 				return Url::base_url($path);
 			}
@@ -154,11 +154,11 @@ 
 		 *  @param $path the name of the image file with the extension.
 		 *  @return string|null the absolute path of the image file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function img($path){
+		public static function img($path) {
 			$logger = self::getLogger();
 			$path = ASSETS_PATH . 'images/' . $path;
 			$logger->debug('Including the Assets file [' . $path . '] for image');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for image included successfully');
 				return Url::base_url($path);
 			}