tnhfw / tnh-fw

core/classes/Loader.php

Spacing +105 added lines, -105 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,10 +51,10 @@ 
 		 * The signleton of the logger
 		 * @return object the Log instance
 		 */
-		public static function getLogger(){
-			if(self::$logger == null){
+		public static function getLogger() {
+			if (self::$logger == null) {
 				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Loader');
 				self::$logger = $logger[0];
 			}
@@ -66,7 +66,7 @@ 
 		 * @param object $logger the log object
 		 * @return object the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			self::$logger = $logger;
 			return self::$logger;
 		}
@@ -80,18 +80,18 @@ 
 		 *
 		 * @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) {
 				$instance = self::getModelLibraryInstanceName($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;
 			}
@@ -104,28 +104,28 @@ 
 			$class  = $moduleInfo['class'];
 			
 			$moduleModelFilePath = Module::findModelFullPath($class, $module);
-			if ($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+			if ($moduleModelFilePath) {
+				$logger->info('Found model [' . $class . '] from module [' . $module . '], 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 . ']');
 			}
 		}
@@ -140,22 +140,22 @@ 
 		 *
 		 * @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) {
 				$instance = self::getModelLibraryInstanceName($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();
 			//Check and load Database library
-			if (strtolower($class) == 'database'){
+			if (strtolower($class) == 'database') {
 				$logger->info('This is the Database library ...');
 				$obj->{$instance} = & class_loader('Database', 'classes/database', $params);
 				static::$loaded[$instance] = $class;
@@ -164,18 +164,18 @@ 
 			}
 			$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
 				$libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
 				//***************
 			}
-			if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
+			if (!$libraryFilePath && file_exists(LIBRARY_PATH . $file)) {
 				$libraryFilePath = LIBRARY_PATH . $file;
 			}
 			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
@@ -190,14 +190,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;
 			}
@@ -207,22 +207,22 @@ 
 			$moduleInfo = self::getModuleInfoForFunction($function);
 			$module    = $moduleInfo['module'];
 			$function  = $moduleInfo['function'];
-			if(! empty($moduleInfo['file'])){
+			if (!empty($moduleInfo['file'])) {
 				$file = $moduleInfo['file'];
 			}
 			$moduleFunctionPath = Module::findFunctionFullPath($function, $module);
-			if ($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+			if ($moduleFunctionPath) {
+				$logger->info('Found helper [' . $function . '] from module [' . $module . '], 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;
@@ -230,12 +230,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 . ']');
 			}
 		}
@@ -247,14 +247,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;
 			}
@@ -265,18 +265,18 @@ 
 			$module    = $moduleInfo['module'];
 			$filename  = $moduleInfo['filename'];
 			$moduleConfigPath = Module::findConfigFullPath($filename, $module);
-			if ($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
+			if ($moduleConfigPath) {
+				$logger->info('Found config [' . $filename . '] from module [' . $module . '], 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 . ']');
 			$config = array();
-			if (file_exists($configFilePath)){
+			if (file_exists($configFilePath)) {
 				require_once $configFilePath;
-				if (! empty($config) && is_array($config)){
+				if (!empty($config) && is_array($config)) {
 					Config::setAll($config);
 					static::$loaded['config_' . $filename] = $configFilePath;
 					$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
@@ -284,8 +284,8 @@ 
 					unset($config);
 				}
 			}
-			else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
+			else {
+				show_error('Unable to find config file [' . $configFilePath . ']');
 			}
 		}
 
@@ -297,14 +297,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;
 			}
@@ -316,22 +316,22 @@ 
 			$moduleInfo = self::getModuleInfoForLanguage($language);
 			$module    = $moduleInfo['module'];
 			$language  = $moduleInfo['language'];
-			if(! empty($moduleInfo['file'])){
+			if (!empty($moduleInfo['file'])) {
 				$file = $moduleInfo['file'];
 			}
 			$moduleLanguagePath = Module::findLanguageFullPath($language, $module, $appLang);
-			if ($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+			if ($moduleLanguagePath) {
+				$logger->info('Found language [' . $language . '] from module [' . $module . '], 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;
 						//already found no need continue
 						break;
@@ -347,14 +347,14 @@ 
 		 * if can not found will use the default value from configuration
 		 * @return string the app language like "en", "fr"
 		 */
-		protected static function getAppLang(){
+		protected static function getAppLang() {
 			//determine the current language
 			$appLang = get_config('default_language');
 			//if the language exists in the cookie use it
 			$cfgKey = get_config('language_cookie_name');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if ($cookieLang){
+			if ($cookieLang) {
 				$appLang = $cookieLang;
 			}
 			return $appLang;
@@ -368,20 +368,20 @@ 
 		 * 	'class' => 'class_name'
 		 * )
 		 */
-		protected static function getModuleInfoForModelLibrary($class){
+		protected static function getModuleInfoForModelLibrary($class) {
 			$module = null;
 			$obj = & get_instance();
-			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())) {
 					$module = $path[0];
 					$class = ucfirst($path[1]);
 				}
 			}
-			else{
+			else {
 				$class = ucfirst($class);
 			}
-			if (! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -400,20 +400,20 @@ 
 		 * 	'file' => 'file'
 		 * )
 		 */
-		protected static function getModuleInfoForFunction($function){
+		protected static function getModuleInfoForFunction($function) {
 			$module = null;
 			$file = 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())) {
 					$module = $path[0];
 					$function = 'function_' . $path[1];
-					$file = $path[0] . DS . $function.'.php';
+					$file = $path[0] . DS . $function . '.php';
 				}
 			}
-			if (! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -433,20 +433,20 @@ 
 		 * 	'file' => 'file'
 		 * )
 		 */
-		protected static function getModuleInfoForLanguage($language){
+		protected static function getModuleInfoForLanguage($language) {
 			$module = null;
 			$file = 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())) {
 					$module = $path[0];
 					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS .$language;
+					$file = $path[0] . DS . $language;
 				}
 			}
-			if (! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -466,18 +466,18 @@ 
 		 * 	'filename' => 'filename'
 		 * )
 		 */
-		protected static function getModuleInfoForConfig($filename){
+		protected static function getModuleInfoForConfig($filename) {
 			$module = 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())) {
 					$module = $path[0];
 					$filename = $path[1] . '.php';
 				}
 			}
-			if (! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -491,16 +491,16 @@ 
 		 * @param  string $class the class name to determine the instance
 		 * @return string        the instance name
 		 */
-		protected static function getModelLibraryInstanceName($class){
+		protected static function getModelLibraryInstanceName($class) {
 			//for module
 			$instance = null;
-			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);
 			}
 			return $instance;
@@ -511,7 +511,7 @@ 
 		 * @param  string $class the class name
 		 * @return string|null        the library file path otherwise null will be returned
 		 */
-		protected static function getLibraryPathUsingModuleInfo($class){
+		protected static function getLibraryPathUsingModuleInfo($class) {
 			$logger = static::getLogger();
 			$libraryFilePath = null;
 			$logger->debug('Checking library [' . $class . '] from module list ...');
@@ -519,11 +519,11 @@ 
 			$module = $moduleInfo['module'];
 			$class  = $moduleInfo['class'];
 			$moduleLibraryPath = Module::findLibraryFullPath($class, $module);
-			if ($moduleLibraryPath){
-				$logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+			if ($moduleLibraryPath) {
+				$logger->info('Found library [' . $class . '] from module [' . $module . '], 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');
 			}
 			return $libraryFilePath;
@@ -537,22 +537,22 @@ 
 		 * @param  array  $params          the parameter to use
 		 * @return void
 		 */
-		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
-			if ($libraryFilePath){
+		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()) {
+			if ($libraryFilePath) {
 				$logger = static::getLogger();
 				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 . ']');
 			}
 		}
@@ -563,15 +563,15 @@ 
 		 * @param  string $language           the language name
 		 * @return void
 		 */
-		protected static function loadLanguage($languageFilePath, $language){
-			if ($languageFilePath){
+		protected static function loadLanguage($languageFilePath, $language) {
+			if ($languageFilePath) {
 				$logger = static::getLogger();
 				$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);
@@ -579,7 +579,7 @@ 
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
 			}
-			else{
+			else {
 				show_error('Unable to find language [' . $language . ']');
 			}
 		}
@@ -588,7 +588,7 @@ 
 		 * Get all the autoload using the configuration file
 		 * @return array
 		 */
-		private function getResourcesFromAutoloadConfig(){
+		private function getResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -596,17 +596,17 @@ 
 			$autoloads['models']    = array();
 			$autoloads['functions'] = array();
 			//loading of the resources from autoload 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;
@@ -616,7 +616,7 @@ 
 		 * Load the autoload configuration
 		 * @return void
 		 */
-		private function loadResourcesFromAutoloadConfig(){
+		private function loadResourcesFromAutoloadConfig() {
 			$autoloads = array();
 			$autoloads['config']    = array();
 			$autoloads['languages'] = array();
@@ -649,7 +649,7 @@ 
 		 * @param  array  $resources the resource to load
 		 * @return void            
 		 */
-		private function loadAutoloadResourcesArray($method, array $resources){
+		private function loadAutoloadResourcesArray($method, array $resources) {
 			foreach ($resources as $name) {
 				$this->{$method}($name);
 			}

core/libraries/Html.php

Spacing +53 added lines, -53 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,19 +35,19 @@ 
 		 *
 		 * @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){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
 			$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;
@@ -62,18 +62,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;
@@ -86,14 +86,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;
@@ -107,13 +107,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;
@@ -129,14 +129,14 @@ 
 		 *
 		 * @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;
 			$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;
@@ -151,8 +151,8 @@ 
 		 *
 		 * @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){
-			if($return){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
+			if ($return) {
 				return self::buildUlOl($data, $attributes, true, 'ul');
 			}
 			self::buildUlOl($data, $attributes, false, 'ul');
@@ -166,8 +166,8 @@ 
 		 * @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){
-			if($return){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
+			if ($return) {
 				return self::buildUlOl($data, $attributes, true, 'ol');
 			}
 			self::buildUlOl($data, $attributes, false, 'ol');
@@ -186,23 +186,23 @@ 
 		 * @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;
 			$tableAttributes = '';
-			if(! empty($attributes['table'])){
+			if (!empty($attributes['table'])) {
 				$tableAttributes = ' ' . attributes_to_string($attributes['table']);
 			}
 			$str .= '<table' . $tableAttributes . '>';
 			$str .= self::buildTableHeader($headers, $attributes);
 			$str .= self::buildTableBody($body, $attributes);
 
-			if($use_footer){
+			if ($use_footer) {
 				$str .= self::buildTableFooter($headers, $attributes);
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -213,24 +213,24 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableHeader(array $headers, $attributes = array()){
+		protected static function buildTableHeader(array $headers, $attributes = array()) {
 			$str = null;
 			$theadAttributes = '';
-			if(! empty($attributes['thead'])){
+			if (!empty($attributes['thead'])) {
 				$theadAttributes = ' ' . attributes_to_string($attributes['thead']);
 			}
 			$theadtrAttributes = '';
-			if(! empty($attributes['thead_tr'])){
+			if (!empty($attributes['thead_tr'])) {
 				$theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
 			}
 			$thAttributes = '';
-			if(! empty($attributes['thead_th'])){
+			if (!empty($attributes['thead_th'])) {
 				$thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
 			}
-			$str .= '<thead' . $theadAttributes .'>';
-			$str .= '<tr' . $theadtrAttributes .'>';
+			$str .= '<thead' . $theadAttributes . '>';
+			$str .= '<tr' . $theadtrAttributes . '>';
 			foreach ($headers as $value) {
-				$str .= '<th' . $thAttributes .'>' .$value. '</th>';
+				$str .= '<th' . $thAttributes . '>' . $value . '</th>';
 			}
 			$str .= '</tr>';
 			$str .= '</thead>';
@@ -242,21 +242,21 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableBody(array $body, $attributes = array()){
+		protected static function buildTableBody(array $body, $attributes = array()) {
 			$str = null;
 			$tbodyAttributes = '';
-			if(! empty($attributes['tbody'])){
+			if (!empty($attributes['tbody'])) {
 				$tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
 			}
 			$tbodytrAttributes = '';
-			if(! empty($attributes['tbody_tr'])){
+			if (!empty($attributes['tbody_tr'])) {
 				$tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
 			}
 			$tbodytdAttributes = '';
-			if(! empty($attributes['tbody_td'])){
+			if (!empty($attributes['tbody_td'])) {
 				$tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
 			}
-			$str .= '<tbody' . $tbodyAttributes .'>';
+			$str .= '<tbody' . $tbodyAttributes . '>';
 			$str .= self::buildTableBodyContent($body, $tbodytrAttributes, $tbodytdAttributes);
 			$str .= '</tbody>';
 			return $str;
@@ -269,13 +269,13 @@ 
 		 * @param  string $tbodytdAttributes the html attributes for each td in tbody
 		 * @return string                    
 		 */
-		protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes){
+		protected static function buildTableBodyContent(array $body, $tbodytrAttributes, $tbodytdAttributes) {
 			$str = null;
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . $tbodytrAttributes .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . $tbodytrAttributes . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
+						$str .= '<td' . $tbodytdAttributes . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
@@ -288,24 +288,24 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableFooter(array $footers, $attributes = array()){
+		protected static function buildTableFooter(array $footers, $attributes = array()) {
 			$str = null;
 			$tfootAttributes = '';
-			if(! empty($attributes['tfoot'])){
+			if (!empty($attributes['tfoot'])) {
 				$tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
 			}
 			$tfoottrAttributes = '';
-			if(! empty($attributes['tfoot_tr'])){
+			if (!empty($attributes['tfoot_tr'])) {
 				$tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
 			}
 			$thAttributes = '';
-			if(! empty($attributes['tfoot_th'])){
+			if (!empty($attributes['tfoot_th'])) {
 				$thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
 			}
-			$str .= '<tfoot' . $tfootAttributes .'>';
-				$str .= '<tr' . $tfoottrAttributes .'>';
+			$str .= '<tfoot' . $tfootAttributes . '>';
+				$str .= '<tr' . $tfoottrAttributes . '>';
 				foreach ($footers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
+					$str .= '<th' . $thAttributes . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';
@@ -319,23 +319,23 @@ 
 		 * @param  string  $olul   the type 'ol' or 'ul'
 		 * @return void|string
 		 */
-		protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul'){
+		protected static function buildUlOl($data = array(), $attributes = array(), $return = true, $olul = 'ul') {
 			$data = (array) $data;
 			$str = null;
 			$olulAttributes = '';
-			if(! empty($attributes[$olul])){
+			if (!empty($attributes[$olul])) {
 				$olulAttributes = ' ' . attributes_to_string($attributes[$olul]);
 			}
 			$liAttributes = '';
-			if(! empty($attributes['li'])){
+			if (!empty($attributes['li'])) {
 				$liAttributes = ' ' . attributes_to_string($attributes['li']);
 			}
 			$str .= '<' . $olul . $olulAttributes . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
+				$str .= '<li' . $liAttributes . '>' . $row . '</li>';
 			}
 			$str .= '</' . $olul . '>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;

core/classes/model/Model.php

Spacing +44 added lines, -44 removed lines

@@ -33,7 +33,7 @@ 
      * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
      */
 
-    class Model{
+    class Model {
 
         /* --------------------------------------------------------------
          * VARIABLES
@@ -145,13 +145,13 @@ 
          * Initialise the model, tie into the CodeIgniter superobject and
          * try our best to guess the table name.
          */
-        public function __construct(Database $db = null){
-            if (is_object($db)){
+        public function __construct(Database $db = null) {
+            if (is_object($db)) {
                 $this->setDatabaseInstance($db);
             }
-            else{
+            else {
                 $obj = & get_instance();
-        		if (isset($obj->database) && is_object($obj->database)){
+        		if (isset($obj->database) && is_object($obj->database)) {
                     /**
                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                     * to prevent duplication
@@ -187,7 +187,7 @@ 
 
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
     		$this->_set_where($where);
 
@@ -229,9 +229,9 @@ 
             $this->trigger('before_get');
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $this->getQueryBuilder()->from($this->_table);
 			$result = $this->_database->getAll($type);
             $this->_temporary_return_type = $this->return_type;
@@ -264,7 +264,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-				return ! $insert_id ? true : $insert_id;
+				return !$insert_id ? true : $insert_id;
             }
             else
             {
@@ -341,13 +341,13 @@ 
         {
             $args = func_get_args();
             $data = array();
-            if (count($args) == 2){
-                if (is_array($args[1])){
+            if (count($args) == 2) {
+                if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
             }
-            else if (count($args) == 3){
-                if (is_array($args[2])){
+            else if (count($args) == 3) {
+                if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
             }
@@ -386,7 +386,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -410,7 +410,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -432,7 +432,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -502,7 +502,7 @@ 
                 $key = $this->primary_key;
                 $value = $args[0];
             }
-            $this->trigger('before_dropdown', array( $key, $value ));
+            $this->trigger('before_dropdown', array($key, $value));
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, FALSE);
@@ -527,7 +527,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $where = func_get_args();
             $this->_set_where($where);
@@ -543,7 +543,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
 			$this->getQueryBuilder()->from($this->_table);
 			$this->_database->getAll();
@@ -553,8 +553,8 @@ 
 		/**
 		* Enabled cache temporary
 		*/
-		public function cached($ttl = 0){
-		  if ($ttl > 0){
+		public function cached($ttl = 0) {
+		  if ($ttl > 0) {
 			$this->_database = $this->_database->cached($ttl);
 		  }
 		  return $this;
@@ -708,13 +708,13 @@ 
             {
                 if (is_object($row))
                 {
-					if (isset($row->$attr)){
+					if (isset($row->$attr)) {
 						unset($row->$attr);
 					}
                 }
                 else
                 {
-					if (isset($row[$attr])){
+					if (isset($row[$attr])) {
 						unset($row[$attr]);
 					}
                 }
@@ -726,7 +726,7 @@ 
          * Return the database instance
          * @return Database the database instance
          */
-        public function getDatabaseInstance(){
+        public function getDatabaseInstance() {
             return $this->_database;
         }
 
@@ -734,9 +734,9 @@ 
          * set the Database instance for future use
          * @param Database $db the database object
          */
-         public function setDatabaseInstance($db){
+         public function setDatabaseInstance($db) {
             $this->_database = $db;
-            if ($this->dbCacheTime > 0){
+            if ($this->dbCacheTime > 0) {
                 $this->_database->setCache($this->dbCacheTime);
             }
             return $this;
@@ -746,7 +746,7 @@ 
          * Return the loader instance
          * @return Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loaderInstance;
         }
 
@@ -755,7 +755,7 @@ 
          * @param Loader $loader the loader object
 		 * @return object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loaderInstance = $loader;
             return $this;
         }
@@ -764,7 +764,7 @@ 
          * Return the queryBuilder instance this is the shortcut to database queryBuilder
          * @return object the DatabaseQueryBuilder instance
          */
-        public function getQueryBuilder(){
+        public function getQueryBuilder() {
             return $this->_database->getQueryBuilder();
         }
 
@@ -773,7 +773,7 @@ 
          * @param object $queryBuilder the DatabaseQueryBuilder object
 		 * @return object
          */
-         public function setQueryBuilder($queryBuilder){
+         public function setQueryBuilder($queryBuilder) {
             $this->_database->setQueryBuilder($queryBuilder);
             return $this;
         }
@@ -783,7 +783,7 @@ 
          * Return the FormValidation instance
          * @return FormValidation the form validation instance
          */
-        public function getFormValidation(){
+        public function getFormValidation() {
             return $this->formValidationInstance;
         }
 
@@ -792,7 +792,7 @@ 
          * @param FormValidation $fv the form validation object
 		 * @return object
          */
-         public function setFormValidation($fv){
+         public function setFormValidation($fv) {
             $this->formValidationInstance = $fv;
             return $this;
         }
@@ -806,7 +806,7 @@ 
          */
         public function order_by($criteria, $order = 'ASC')
         {
-            if ( is_array($criteria) )
+            if (is_array($criteria))
             {
                 foreach ($criteria as $key => $value)
                 {
@@ -837,13 +837,13 @@ 
 		* relate for the relation "belongs_to"
 		* @return mixed
 		*/
-		protected function relateBelongsTo($row){
+		protected function relateBelongsTo($row) {
 			foreach ($this->belongs_to as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $value . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -853,10 +853,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -876,13 +876,13 @@ 
 		* relate for the relation "has_many"
 		* @return mixed
 		*/
-		protected function relateHasMany($row){
+		protected function relateHasMany($row) {
 			foreach ($this->has_many as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $this->_table . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -892,10 +892,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -944,7 +944,7 @@ 
                 return $data;
             }
             $fv = $this->formValidationInstance;
-            if (! is_object($fv)){
+            if (!is_object($fv)) {
                  Loader::library('FormValidation');
                 $fv = $this->formvalidation;
                 $this->setFormValidation($fv);  
@@ -964,7 +964,7 @@ 
 		* Set WHERE parameters, when is array
 		* @param array $params
 		*/
-		protected function _set_where_array(array $params){
+		protected function _set_where_array(array $params) {
 			foreach ($params as $field => $filter)
 			{
 				if (is_array($filter))
@@ -1030,7 +1030,7 @@ 
         /**
             Shortcut to controller
         */
-        public function __get($key){
+        public function __get($key) {
             return get_instance()->{$key};
         }
 

core/classes/Response.php

Spacing +78 added lines, -78 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,15 +65,15 @@ 
 		/**
 		 * Construct new response instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			$currentUrl = '';
-			if (! empty($_SERVER['REQUEST_URI'])){
+			if (!empty($_SERVER['REQUEST_URI'])) {
 				$currentUrl = $_SERVER['REQUEST_URI'];
 			}
-			if (! empty($_SERVER['QUERY_STRING'])){
+			if (!empty($_SERVER['QUERY_STRING'])) {
 				$currentUrl .= '?' . $_SERVER['QUERY_STRING'];
 			}
-			$this->_currentUrl =  $currentUrl;
+			$this->_currentUrl = $currentUrl;
 					
 			$this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
@@ -89,10 +89,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		public static function getLogger(){
-			if(self::$logger == null){
+		public static function getLogger() {
+			if (self::$logger == null) {
 				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Response');
 				self::$logger = $logger[0];
 			}
@@ -104,7 +104,7 @@ 
 		 * @param object $logger the log object
 		 * @return object the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			self::$logger = $logger;
 			return self::$logger;
 		}
@@ -115,12 +115,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);
 				}
 			}
 		}
@@ -129,7 +129,7 @@ 
 		 * Get the list of the headers
 		 * @return array the headers list
 		 */
-		public static function getHeaders(){
+		public static function getHeaders() {
 			return self::$headers;
 		}
 
@@ -138,8 +138,8 @@ 
 		 * @param  string $name the header name
 		 * @return string|null       the header value
 		 */
-		public static function getHeader($name){
-			if(array_key_exists($name, self::$headers)){
+		public static function getHeader($name) {
+			if (array_key_exists($name, self::$headers)) {
 				return self::$headers[$name];
 			}
 			return null;
@@ -151,7 +151,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;
 		}
 
@@ -160,7 +160,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);
 		}
 		
@@ -168,16 +168,16 @@ 
 		 * Redirect user to 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;
 			}
 			echo '<script>
-					location.href = "'.$url.'";
+					location.href = "'.$url . '";
 				</script>';
 		}
 
@@ -189,7 +189,7 @@ 
 		 * @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 = (array) $data;
@@ -201,22 +201,22 @@ 
 			//check in module first
 			$logger->debug('Checking the view [' . $view . '] from module list ...');
 			$moduleInfo = $this->getModuleInfoForView($view);
-			$module    = $moduleInfo['module'];
-			$view  = $moduleInfo['view'];
+			$module = $moduleInfo['module'];
+			$view = $moduleInfo['view'];
 			
 			$moduleViewPath = Module::findViewFullPath($view, $module);
-			if($moduleViewPath){
+			if ($moduleViewPath) {
 				$path = $moduleViewPath;
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$moduleViewPath. '] we will used it');
+				$logger->info('Found view [' . $view . '] in module [' . $module . '], the file path is [' . $moduleViewPath . '] we will used it');
 			}
-			else{
-				$logger->info('Cannot find view [' . $view . '] in module [' .$module. '] using the default location');
+			else {
+				$logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location');
 			}
 			
 			$logger->info('The view file path to be loaded is [' . $path . ']');
 			
 			/////////
-			if($return){
+			if ($return) {
 				return $this->loadView($path, $data, true);
 			}
 			$this->loadView($path, $data, false);
@@ -226,36 +226,36 @@ 
 		/**
 		* 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 = null;
-			if(! empty($event->payload)){
+			if (!empty($event->payload)) {
 				$content = $event->payload;
 			}
-			if(empty($content)){
+			if (empty($content)) {
 				$logger->warning('The view content is empty after dispatch to event listeners.');
 			}
 			//remove unsed space in the content
 			$content = preg_replace('~>\s*\n\s*<~', '><', $content);
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				$this->savePageContentIntoCache($content);
 			}
 			$content = $this->replaceElapseTimeAndMemoryUsage($content);
 
 			//compress the output if is available
 			$type = null;
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				$type = 'ob_gzhandler';
 			}
 			ob_start($type);
@@ -271,7 +271,7 @@ 
 		*
 		* @return boolean whether the page content if available or not
 		*/
-		public function renderFinalPageFromCache(&$cache){
+		public function renderFinalPageFromCache(&$cache) {
 			$logger = self::getLogger();
 			//the current page cache key for identification
 			$pageCacheKey = $this->_currentUrlCacheKey;
@@ -279,9 +279,9 @@ 
 			$logger->debug('Checking if the page content for the URL [' . $this->_currentUrl . '] is cached ...');
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$status = $this->sendCacheNotYetExpireInfo($cacheInfo);
-				if($status === false){
+				if ($status === false) {
 					return $this->sendCachePageContentToBrowser($cache);
 				}
 				return true;
@@ -294,7 +294,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -302,14 +302,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';
@@ -319,10 +319,10 @@ 
 			$logger->error($str);
 			/***********************************/
 			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -331,8 +331,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');
 			}
 		}
 
@@ -340,12 +340,12 @@ 
 		 * 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 is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -355,7 +355,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';
@@ -367,17 +367,17 @@ 
 		 * @param  array $cacheInfo the cache information
 		 * @return boolean            true if the information is sent otherwise false
 		 */
-		protected function sendCacheNotYetExpireInfo($cacheInfo){
-			if(! empty($cacheInfo)){
+		protected function sendCacheNotYetExpireInfo($cacheInfo) {
+			if (!empty($cacheInfo)) {
 				$logger = self::getLogger();
 				$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 [' . $this->_currentUrl . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return true;
@@ -392,7 +392,7 @@ 
 		 * @return string          the page content after replace 
 		 * '{elapsed_time}', '{memory_usage}'
 		 */
-		protected function replaceElapseTimeAndMemoryUsage($content){
+		protected function replaceElapseTimeAndMemoryUsage($content) {
 			//load benchmark class
 			$benchmark = & class_loader('Benchmark');
 			
@@ -408,7 +408,7 @@ 
 		 * @param object $cache the cache instance
 		 * @return boolean     the status of the operation
 		 */
-		protected function sendCachePageContentToBrowser(&$cache){
+		protected function sendCachePageContentToBrowser(&$cache) {
 			$logger = self::getLogger();
 			$logger->info('The cache page content is expired or the browser doesn\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] send cache headers to tell the browser');
 			self::sendHeaders(200);
@@ -416,13 +416,13 @@ 
 			$pageCacheKey = $this->_currentUrlCacheKey;
 			//get the cache content
 			$content = $cache->get($pageCacheKey);
-			if($content){
+			if ($content) {
 				$logger->info('The page content for the URL [' . $this->_currentUrl . '] already cached just display it');
 				$content = $this->replaceElapseTimeAndMemoryUsage($content);
 				///display the final output
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -440,7 +440,7 @@ 
 		 * @param  string $content the page content to be saved
 		 * @return void
 		 */
-		protected function savePageContentIntoCache($content){
+		protected function savePageContentIntoCache($content) {
 			$obj = & get_instance();
 			$logger = self::getLogger();
 
@@ -448,7 +448,7 @@ 
 			$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
@@ -460,14 +460,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');	
 			}
 		}
 		
@@ -483,21 +483,21 @@ 
 		 * 	'viewFile' => 'view_file'
 		 * )
 		 */
-		protected  function getModuleInfoForView($view){
+		protected  function getModuleInfoForView($view) {
 			$module = null;
 			$viewFile = null;
 			$obj = & get_instance();
 			//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())) {
 					$module = $viewPath[0];
 					array_shift($viewPath);
 					$view = implode('/', $viewPath);
 					$viewFile = $view . '.php';
 				}
 			}
-			if(! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -512,13 +512,13 @@ 
 		 * @see  Response::render
 		 * @return void|string
 		 */
-		protected  function loadView($path, array $data = array(), $return = false){
+		protected  function loadView($path, array $data = array(), $return = false) {
 			$found = false;
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//super instance
 				$obj = & get_instance();
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
+				foreach (get_object_vars($obj) as $key => $value) {
+					if (!isset($this->{$key})) {
 						$this->{$key} = & $obj->{$key};
 					}
 				}
@@ -527,14 +527,14 @@ 
 				//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 . ']');
 			}
 		}
 

core/classes/Log.php

Spacing +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Log{
+	class Log {
 		
 		/**
 		 * The defined constante for Log level
@@ -52,14 +52,14 @@ 
 		/**
 		 * Create new Log instance
 		 */
-		public function __construct(){
+		public function __construct() {
 		}
 
 		/**
 		 * Set the logger to identify each message in the log
 		 * @param string $logger the logger name
 		 */
-		public  function setLogger($logger){
+		public  function setLogger($logger) {
 			$this->logger = $logger;
 		}
 
@@ -68,7 +68,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function fatal($message){
+		public function fatal($message) {
 			$this->writeLog($message, self::FATAL);
 		} 
 		
@@ -77,7 +77,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function error($message){
+		public function error($message) {
 			$this->writeLog($message, self::ERROR);
 		} 
 
@@ -86,7 +86,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function warning($message){
+		public function warning($message) {
 			$this->writeLog($message, self::WARNING);
 		} 
 		
@@ -95,7 +95,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function info($message){
+		public function info($message) {
 			$this->writeLog($message, self::INFO);
 		} 
 		
@@ -104,7 +104,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function debug($message){
+		public function debug($message) {
 			$this->writeLog($message, self::DEBUG);
 		} 
 		
@@ -115,31 +115,31 @@ 
 		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
 		 * to allow check the log level threshold.
 		 */
-		public function writeLog($message, $level = self::INFO){
+		public function writeLog($message, $level = self::INFO) {
 			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
+			if (!$configLogLevel) {
 				//so means no need log just stop here
 				return;
 			}
 			//check config log level
-			if(! self::isValidConfigLevel($configLogLevel)){
+			if (!self::isValidConfigLevel($configLogLevel)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
 			}
 			
 			//check if config log_logger_name and current log can save log data
-			if(! $this->canSaveLogDataForLogger()){
+			if (!$this->canSaveLogDataForLogger()) {
 				return;
 			}
 			
 			//if $level is not an integer
-			if(! is_numeric($level)){
+			if (!is_numeric($level)) {
 				$level = self::getLevelValue($level);
 			}
 			
 			//check if can logging regarding the log level config
 			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
+			if ($configLevel > $level) {
 				//can't log
 				return;
 			}
@@ -156,7 +156,7 @@ 
 		 * @param  string $message the log message to save
 		 * @return void
 		 */
-		protected function saveLogData($path, $level, $message){
+		protected function saveLogData($path, $level, $message) {
 			//may be at this time helper user_agent not yet included
 			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 			
@@ -169,7 +169,7 @@ 
 			$ip = get_ip();
 			
 			//if $level is not an integer
-			if(! is_numeric($level)){
+			if (!is_numeric($level)) {
 				$level = self::getLevelValue($level);
 			}
 
@@ -179,13 +179,13 @@ 
 			//debug info
 			$dtrace = debug_backtrace();
 			$fileInfo = $dtrace[0];
-			if ($dtrace[0]['file'] == __FILE__){
+			if ($dtrace[0]['file'] == __FILE__) {
 				$fileInfo = $dtrace[1];
 			}
 			
 			$str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
 			$fp = fopen($path, 'a+');
-			if(is_resource($fp)){
+			if (is_resource($fp)) {
 				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
 				fwrite($fp, $str);
 				fclose($fp);
@@ -197,13 +197,13 @@ 
 		 * of logger filter
 		 * @return boolean
 		 */
-		protected function canSaveLogDataForLogger(){
-			if(! empty($this->logger)){
+		protected function canSaveLogDataForLogger() {
+			if (!empty($this->logger)) {
 				$configLoggersName = get_config('log_logger_name', array());
 				if (!empty($configLoggersName)) {
 					//for best comparaison put all string to lowercase
 					$configLoggersName = array_map('strtolower', $configLoggersName);
-					if(! in_array(strtolower($this->logger), $configLoggersName)){
+					if (!in_array(strtolower($this->logger), $configLoggersName)) {
 						return false;
 					}
 				}
@@ -215,19 +215,19 @@ 
 		 * Check the file and directory 
 		 * @return string the log file path
 		 */
-		protected function checkAndSetLogFileDirectory(){
+		protected function checkAndSetLogFileDirectory() {
 			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
+			if (!$logSavePath) {
 				$logSavePath = LOGS_PATH;
 			}
 			
-			if(! is_dir($logSavePath) || !is_writable($logSavePath)){
+			if (!is_dir($logSavePath) || !is_writable($logSavePath)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
 			}
 			
 			$path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
-			if(! file_exists($path)){
+			if (!file_exists($path)) {
 				touch($path);
 			}
 			return $path;
@@ -240,7 +240,7 @@ 
 		 *
 		 * @return boolean        true if the given log level is valid, false if not
 		 */
-		protected static function isValidConfigLevel($level){
+		protected static function isValidConfigLevel($level) {
 			$level = strtolower($level);
 			return in_array($level, self::$validConfigLevel);
 		}
@@ -251,7 +251,7 @@ 
 		 * 
 		 * @return int        the log level in integer format using the predefined constants
 		 */
-		protected static function getLevelValue($level){
+		protected static function getLevelValue($level) {
 			$level = strtolower($level);
 			$levelMaps = array(
 				'fatal'   => self::FATAL,
@@ -264,7 +264,7 @@ 
 			);
 			//the default value is NONE, so means no need test for NONE
 			$value = self::NONE;
-			if(isset($levelMaps[$level])){
+			if (isset($levelMaps[$level])) {
 				$value = $levelMaps[$level];
 			}
 			return $value;
@@ -275,7 +275,7 @@ 
 		 * @param  integer $level the log level in integer format
 		 * @return string        the log level in string format
 		 */
-		protected static function getLevelName($level){
+		protected static function getLevelName($level) {
 			$levelMaps = array(
 				self::FATAL   => 'FATAL',
 				self::ERROR   => 'ERROR',
@@ -284,7 +284,7 @@ 
 				self::DEBUG   => 'DEBUG'
 			);
 			$value = '';
-			if(isset($levelMaps[$level])){
+			if (isset($levelMaps[$level])) {
 				$value = $levelMaps[$level];
 			}
 			return $value;

core/bootstrap.php

Spacing +19 added lines, -19 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
+	if (IS_CLI) {
 		$_SESSION = array();
 	}
 		
@@ -60,14 +60,14 @@ 
 	/**
 	 * The Benchmark class
 	 */
-	$BENCHMARK =& class_loader('Benchmark');
+	$BENCHMARK = & class_loader('Benchmark');
 	
 	$BENCHMARK->mark('APP_EXECUTION_START');
 	
 	/**
     * instance of the Log class
     */
-    $LOGGER =& class_loader('Log', 'classes');
+    $LOGGER = & class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
@@ -76,10 +76,10 @@ 
 	/**
 	* Verification of the PHP environment: minimum and maximum version
 	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')) {
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
 	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	else if (version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')) {
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -101,11 +101,11 @@ 
 	
 	//if user have some composer packages
 	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
 	}
-	else{
+	else {
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -122,7 +122,7 @@ 
 	* Load configurations and using the 
 	* static method "init()" to initialize the Config class .
 	*/
-	$CONFIG =& class_loader('Config', 'classes');	
+	$CONFIG = & class_loader('Config', 'classes');	
 	$CONFIG->init();
 	$BENCHMARK->mark('CONFIG_INIT_END');
 
@@ -131,7 +131,7 @@ 
 	* Load modules and using the 
 	* static method "init()" to initialize the Module class.
 	*/
-	$MODULE =& class_loader('Module', 'classes');
+	$MODULE = & class_loader('Module', 'classes');
 	$MODULE->init();
 	$BENCHMARK->mark('MODULE_INIT_END');
 
@@ -150,36 +150,36 @@ 
 	/**
 	* Loading Security class
 	*/
-	$SECURITY =& class_loader('Security', 'classes');
+	$SECURITY = & class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
 	* Loading Url class
 	*/
-	$URL =& class_loader('Url', 'classes');
+	$URL = & class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
+	if (get_config('cache_enable', false)) {
 		/**
 		 * Load Cache interface file
 		 */
 		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
 		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
+		if (!$cacheHandler) {
 			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
 		}
 		$CACHE = null;
 		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
+		if (file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')) {
+			$CACHE = & class_loader($cacheHandler, 'classes/cache');
 		}
-		else{
+		else {
 			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
+			$CACHE = & class_loader($cacheHandler);
 		}
 		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+		if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
 			$RESPONSE = & class_loader('Response', 'classes');
-			if ($RESPONSE->renderFinalPageFromCache($CACHE)){
+			if ($RESPONSE->renderFinalPageFromCache($CACHE)) {
 				return;
 			}
 		}