tnhfw / tnh-fw

core/classes/Module.php

Spacing +69 added lines, -69 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,24 +53,24 @@ 
 		/**
 		 * 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()) . ']');
 			}
 		}
@@ -79,9 +79,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;
 			}
@@ -94,10 +94,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);
 					}
@@ -110,19 +110,19 @@ 
 		 * 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)) {
 					$route = array();
 					require_once $file;
-					if(! empty($route) && is_array($route)){
+					if (!empty($route) && is_array($route)) {
 						$routes = array_merge($routes, $route);
 						unset($route);
 					}
@@ -138,22 +138,22 @@ 
 		 * @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;
 			}
-			$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Controller [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -163,22 +163,22 @@ 
 		 * @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;
 			}
-			$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Model [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 		
@@ -188,21 +188,21 @@ 
 		 * @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;
 			}
-			$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+			$logger->info('Configuration [' . $configuration . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -212,22 +212,22 @@ 
 		 * @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;
 			}
-			$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+			$logger->info('Helper [' . $helper . '] does not exist in the module [' . $module . ']');
 			return false;
 			
 		}
@@ -239,21 +239,21 @@ 
 		 * @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;
 			}
-			$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Library [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -264,9 +264,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;
 			}
@@ -274,13 +274,13 @@ 
 			$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;
 			}
-			$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+			$logger->info('View [' . $view . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -291,22 +291,22 @@ 
 		 * @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;
 			}
-			$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+			$logger->info('Language [' . $language . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -314,7 +314,7 @@ 
 		 * Get the list of module loaded
 		 * @return array the module list
 		 */
-		public static function getModuleList(){
+		public static function getModuleList() {
 			return self::$list;
 		}
 
@@ -322,7 +322,7 @@ 
 		 * Check if the application has an module
 		 * @return boolean
 		 */
-		public static function hasModule(){
+		public static function hasModule() {
 			return !empty(self::$list);
 		}
 

core/classes/Config.php

Spacing +31 added lines, -31 removed lines

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

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/classes/Response.php

Spacing +77 added lines, -77 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,28 +226,28 @@ 
 		/**
 		* 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.');
 			}
 			
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				$this->savePageContentIntoCache($content);
 			}
 			
@@ -259,7 +259,7 @@ 
 			
 			//compress the output if is available
 			$type = null;
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				$type = 'ob_gzhandler';
 			}
 			ob_start($type);
@@ -275,7 +275,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;
@@ -283,9 +283,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->sendPageContentToBrowser($cache);
 				}
 			}
@@ -297,7 +297,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -305,14 +305,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';
@@ -322,10 +322,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);
@@ -334,8 +334,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');
 			}
 		}
 
@@ -343,12 +343,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);
@@ -358,7 +358,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';
@@ -370,17 +370,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;
@@ -394,7 +394,7 @@ 
 		 * @param object $cache the cache instance
 		 * @return boolean     the status of the operation
 		 */
-		protected function sendPageContentToBrowser(&$cache){
+		protected function sendPageContentToBrowser(&$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);
@@ -402,7 +402,7 @@ 
 			$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');
 				//load benchmark class
 				$benchmark = & class_loader('Benchmark');
@@ -416,7 +416,7 @@ 
 				///display the final output
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -434,7 +434,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();
 
@@ -442,7 +442,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
@@ -455,14 +455,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');	
 			}
 		}
 		
@@ -478,21 +478,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(
@@ -507,13 +507,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};
 					}
 				}
@@ -522,14 +522,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 . ']');
 			}
 		}