tnhfw / tnh-fw

core/classes/Module.php

Spacing +83 added lines, -83 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,25 +53,25 @@ 
 		/**
 		 * 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);
-			while(($module = readdir($moduleDir)) !== false){
-				if($module != '.' && $module != '..'  && preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+			while (($module = readdir($moduleDir)) !== false) {
+				if ($module != '.' && $module != '..' && preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)) {
 					self::$list[] = $module;
 				}
-				else{
-					$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+				else {
+					$logger->info('Skipping [' . $module . '], may be this is not a directory or does not exists or is invalid name');
 				}
 			}
 			closedir($moduleDir);
 			ksort(self::$list);
 			
-			if(self::hasModule()){
+			if (self::hasModule()) {
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
 			}
-			else{
+			else {
 				$logger->info('The application contains no module skipping');
 			}
 		}
@@ -80,9 +80,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;
 			}
@@ -95,27 +95,27 @@ 
 			
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					require_once $file;
-					if(! empty($autoload) && is_array($autoload)){
+					if (!empty($autoload) && is_array($autoload)) {
 						//libraries autoload
-						if(! empty($autoload['libraries']) && is_array($autoload['libraries'])){
+						if (!empty($autoload['libraries']) && is_array($autoload['libraries'])) {
 							$autoloads['libraries'] = array_merge($autoloads['libraries'], $autoload['libraries']);
 						}
 						//config autoload
-						if(! empty($autoload['config']) && is_array($autoload['config'])){
+						if (!empty($autoload['config']) && is_array($autoload['config'])) {
 							$autoloads['config'] = array_merge($autoloads['config'], $autoload['config']);
 						}
 						//models autoload
-						if(! empty($autoload['models']) && is_array($autoload['models'])){
+						if (!empty($autoload['models']) && is_array($autoload['models'])) {
 							$autoloads['models'] = array_merge($autoloads['models'], $autoload['models']);
 						}
 						//functions autoload
-						if(! empty($autoload['functions']) && is_array($autoload['functions'])){
+						if (!empty($autoload['functions']) && is_array($autoload['functions'])) {
 							$autoloads['functions'] = array_merge($autoloads['functions'], $autoload['functions']);
 						}
 						//languages autoload
-						if(! empty($autoload['languages']) && is_array($autoload['languages'])){
+						if (!empty($autoload['languages']) && is_array($autoload['languages'])) {
 							$autoloads['languages'] = array_merge($autoloads['languages'], $autoload['languages']);
 						}
 						unset($autoload);
@@ -129,23 +129,23 @@ 
 		 * Get the list of the custom routes configuration from module if exists
 		 * @return array|boolean the routes list or false if no module contains the routes configuration
 		 */
-		public static function getModulesRoutes(){
+		public static function getModulesRoutes() {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
 			$routes = array();
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					require_once $file;
-					if(! empty($route) && is_array($route)){
+					if (!empty($route) && is_array($route)) {
 						$routes = array_merge($routes, $route);
 						unset($route);
 					}
-					else{
-						show_error('No routing configuration found in [' .$file. '] for module [' . $module . ']');
+					else {
+						show_error('No routing configuration found in [' . $file . '] for module [' . $module . ']');
 					}
 				}
 			}
@@ -159,23 +159,23 @@ 
 		 * @param  string $module  the module name
 		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
 		 */
-		public static function findControllerFullPath($class, $module = null){
+		public static function findControllerFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking the controller [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found controller [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Controller [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -186,23 +186,23 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this model, return the full path of this model
 		 */
-		public static function findModelFullPath($class, $module = null){
+		public static function findModelFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking model [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found model [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Model [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -213,22 +213,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
 		 */
-		public static function findConfigFullPath($configuration, $module = null){
+		public static function findConfigFullPath($configuration, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$configuration = str_ireplace('.php', '', $configuration);
-			$file = $configuration.'.php';
-			$logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
+			$file = $configuration . '.php';
+			$logger->debug('Checking configuration [' . $configuration . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found configuration [' . $configuration . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -239,23 +239,23 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
 		 */
-		public static function findFunctionFullPath($helper, $module = null){
+		public static function findFunctionFullPath($helper, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$helper = str_ireplace('.php', '', $helper);
 			$helper = str_ireplace('function_', '', $helper);
-			$file = 'function_'.$helper.'.php';
-			$logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
+			$file = 'function_' . $helper . '.php';
+			$logger->debug('Checking helper [' . $helper . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found helper [' . $helper . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Helper [' . $helper . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -267,22 +267,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
 		 */
-		public static function findLibraryFullPath($class, $module = null){
+		public static function findLibraryFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
-			$file = $class.'.php';
-			$logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
+			$file = $class . '.php';
+			$logger->debug('Checking library [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found library [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Library [' . $class . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -294,9 +294,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;
 			}
@@ -304,14 +304,14 @@ 
 			$view = trim($view, '/\\');
 			$view = str_ireplace('/', DS, $view);
 			$viewFile = $view . '.php';
-			$logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
+			$logger->debug('Checking view [' . $view . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
-			if(file_exists($filePath)){
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found view [' . $view . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('View [' . $view . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -323,23 +323,23 @@ 
 		 * @param string $appLang the application language like 'en', 'fr'
 		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
 		 */
-		public static function findLanguageFullPath($language, $module = null, $appLang){
+		public static function findLanguageFullPath($language, $module = null, $appLang) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$language = str_ireplace('.php', '', $language);
 			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
+			$file = 'lang_' . $language . '.php';
+			$logger->debug('Checking language [' . $language . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found language [' . $language . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			else{
-				$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+			else {
+				$logger->info('Language [' . $language . '] does not exist in the module [' . $module . ']');
 				return false;
 			}
 		}
@@ -348,7 +348,7 @@ 
 		 * Get the list of module loaded
 		 * @return array the module list
 		 */
-		public static function getModuleList(){
+		public static function getModuleList() {
 			return self::$list;
 		}
 
@@ -356,7 +356,7 @@ 
 		 * Check if the application has an module
 		 * @return boolean
 		 */
-		public static function hasModule(){
+		public static function hasModule() {
 			return !empty(self::$list);
 		}
 

core/classes/Request.php

Spacing +27 added lines, -27 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Request{
+	class Request {
 		
 		/**
 		 * The value for the super global $_GET
@@ -90,21 +90,21 @@ 
 		/**
 		 * Construct new request instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			$this->get = $_GET;
 			$this->post = $_POST;
 			$this->server = $_SERVER;
 			$this->query = $_REQUEST;
 			$this->cookie = $_COOKIE;
 			$this->file = $_FILES;
-			$this->session =& class_loader('Session', 'classes');
+			$this->session = & class_loader('Session', 'classes');
 			$this->method = $this->server('REQUEST_METHOD');
 			$this->requestUri = $this->server('REQUEST_URI');
 			$this->header = array();
-			if(function_exists('apache_request_headers')){
+			if (function_exists('apache_request_headers')) {
 				$this->header = apache_request_headers();
 			}
-			else if(function_exists('getallheaders')){
+			else if (function_exists('getallheaders')) {
 				$this->header = getallheaders();
 			}
 		}
@@ -113,7 +113,7 @@ 
 		 * Get the request method
 		 * @return string
 		 */
-		public function method(){
+		public function method() {
 			return $this->method;
 		}
 		
@@ -121,7 +121,7 @@ 
 		 * Get the request URI
 		 * @return string
 		 */
-		public function requestUri(){
+		public function requestUri() {
 			return $this->requestUri;
 		}
 
@@ -131,13 +131,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function query($key = null, $xss = true){
-			if(empty($key)){
+		public function query($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->query) : $this->query;
 			}
 			$query = array_key_exists($key, $this->query) ? $this->query[$key] : null;
-			if($xss){
+			if ($xss) {
 				$query = clean_input($query);
 			}
 			return $query;
@@ -149,13 +149,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function get($key = null, $xss = true){
-			if(empty($key)){
+		public function get($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->get) : $this->get;
 			}
 			$get = array_key_exists($key, $this->get) ? $this->get[$key] : null;
-			if($xss){
+			if ($xss) {
 				$get = clean_input($get);
 			}
 			return $get;
@@ -167,13 +167,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function post($key = null, $xss = true){
-			if(empty($key)){
+		public function post($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->post) : $this->post;
 			}
 			$post = array_key_exists($key, $this->post) ? $this->post[$key] : null;
-			if($xss){
+			if ($xss) {
 				$post = clean_input($post);
 			}
 			return $post;
@@ -185,13 +185,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function server($key = null, $xss = true){
-			if(empty($key)){
+		public function server($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->server) : $this->server;
 			}
 			$server = array_key_exists($key, $this->server) ? $this->server[$key] : null;
-			if($xss){
+			if ($xss) {
 				$server = clean_input($server);
 			}
 			return $server;
@@ -203,13 +203,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function cookie($key = null, $xss = true){
-			if(empty($key)){
+		public function cookie($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->cookie) : $this->cookie;
 			}
 			$cookie = array_key_exists($key, $this->cookie) ? $this->cookie[$key] : null;
-			if($xss){
+			if ($xss) {
 				$cookie = clean_input($cookie);
 			}
 			return $cookie;
@@ -220,7 +220,7 @@ 
 		 * @param  string  $key the item key to be fetched
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function file($key){
+		public function file($key) {
 			$file = array_key_exists($key, $this->file) ? $this->file[$key] : null;
 			return $file;
 		}
@@ -231,9 +231,9 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or null if the key does not exists
 		 */
-		public function session($key, $xss = true){
+		public function session($key, $xss = true) {
 			$session = $this->session->get($key);
-			if($xss){
+			if ($xss) {
 				$session = clean_input($session);
 			}
 			return $session;
@@ -245,9 +245,9 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return mixed       the item value if the key exists or null if the key does not exists
 		 */
-		public function header($key, $xss = true){
+		public function header($key, $xss = true) {
 			$header = array_key_exists($key, $this->header) ? $this->header[$key] : null;
-			if($xss){
+			if ($xss) {
 				$header = clean_input($header);
 			}
 			return $header;

core/classes/Security.php

Spacing +22 added lines, -22 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Security{
+	class Security {
 		
 		/**
 		 * The logger instance
@@ -36,9 +36,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Security');
 			}
 			return self::$logger[0];
@@ -49,7 +49,7 @@ 
 		 * This method is used to generate the CSRF token
 		 * @return string the generated CSRF token
 		 */
-		public static function generateCSRF(){
+		public static function generateCSRF() {
 			$logger = self::getLogger();
 			$logger->debug('Generation of CSRF ...');
 			
@@ -57,14 +57,14 @@ 
 			$expire = get_config('csrf_expire', 60);
 			$keyExpire = 'csrf_expire';
 			$currentTime = time();
-			if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
+			if (Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime) {
 				$logger->info('The CSRF token not yet expire just return it');
 				return Session::get($key);
 			}
-			else{
+			else {
 				$newTime = $currentTime + $expire;
 				$token = sha1(uniqid()) . sha1(uniqid());
-				$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
+				$logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . '], token [' . $token . ']');
 				Session::set($keyExpire, $newTime);
 				Session::set($key, $token);
 				return Session::get($key);
@@ -75,7 +75,7 @@ 
 		 * This method is used to check the CSRF if is valid, not yet expire, etc.
 		 * @return boolean true if valid, false if not valid
 		 */
-		public static function validateCSRF(){
+		public static function validateCSRF() {
 			$logger = self::getLogger();
 			$logger->debug('Validation of CSRF ...');
 				
@@ -83,23 +83,23 @@ 
 			$expire = get_config('csrf_expire', 60);
 			$keyExpire = 'csrf_expire';
 			$currentTime = time();
-			$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. ']');
-			if(! Session::exists($key) || Session::get($keyExpire) <= $currentTime){
+			$logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . ']');
+			if (!Session::exists($key) || Session::get($keyExpire) <= $currentTime) {
 				$logger->warning('The CSRF session data is not valide');
 				return false;
 			}
-			else{
+			else {
 				//perform form data
 				//need use request->query() for best retrieve
 				//super instance
 				$obj = & get_instance();
 				$token = $obj->request->query($key);
-				if(! $token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime){
-					$logger->warning('The CSRF data [' .$token. '] is not valide may be attacker do his job');
+				if (!$token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime) {
+					$logger->warning('The CSRF data [' . $token . '] is not valide may be attacker do his job');
 					return false;
 				}
-				else{
-					$logger->info('The CSRF data [' .$token. '] is valide the form data is safe continue');
+				else {
+					$logger->info('The CSRF data [' . $token . '] is valide the form data is safe continue');
 					//remove the token from session
 					Session::clear($key);
 					Session::clear($keyExpire);
@@ -111,24 +111,24 @@ 
 		/**
 		 * This method is used to check the whitelist IP address access
 		 */
-		 public static function checkWhiteListIpAccess(){
+		 public static function checkWhiteListIpAccess() {
 			$logger = self::getLogger();
 			$logger->debug('Validation of the IP address access ...');
 			$logger->debug('Check if whitelist IP access is enabled in the configuration ...');
 			$isEnable = get_config('white_list_ip_enable', false);
-			if($isEnable){
+			if ($isEnable) {
 				$logger->info('Whitelist IP access is enabled in the configuration');
 				$list = get_config('white_list_ip_addresses', array());
-				if(! empty($list)){
+				if (!empty($list)) {
 					//Can't use Loader::functions() at this time because teh "Loader" library is loader after the security prossessing
 					require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 					$ip = get_ip();
-					if((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)){
+					if ((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)) {
 						$logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
 						//wildcard to access all ip address
 						return;
 					}
-					else{
+					else {
 						// go through all whitelisted ips
 						foreach ($list as $ipaddr) {
 							// find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -154,7 +154,7 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }

core/classes/Config.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 Config{
+	class Config {
 		
 		/**
 		 * The list of loaded configuration
@@ -42,10 +42,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				$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 Log $logger the log object
 		 * @return Log 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,37 +139,37 @@ 
 		 * 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(){
-			if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
+		private static function setBaseUrlUsingServerVar() {
+			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;
-				if (isset($_SERVER['SERVER_ADDR'])){
+				if (isset($_SERVER['SERVER_ADDR'])) {
 					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
+						$baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
 					}
-					else{
+					else {
 						$baseUrl = $_SERVER['SERVER_ADDR'];
 					}
-					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && ! is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https()) ) ? ':' . $_SERVER['SERVER_PORT'] : '');
-					$baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port
+					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && !is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https())) ? ':' . $_SERVER['SERVER_PORT'] : '');
+					$baseUrl = (is_https() ? 'https' : 'http') . '://' . $baseUrl . $port
 						. substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
 				}
-				else{
+				else {
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
 				self::set('base_url', $baseUrl);
 			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') . '/';
 		}
 	}

core/classes/EventInfo.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * This class represent the event detail to dispatch to correspond listener
 	 */
-	class EventInfo{
+	class EventInfo {
 		
 		/**
 		 * The event name
@@ -54,7 +54,7 @@ 
 		 */
 		public $stop;
 		
-		public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
+		public function __construct($name, $payload = array(), $returnBack = false, $stop = false) {
 			$this->name = $name;
 			$this->payload = $payload;
 			$this->returnBack = $returnBack;

core/classes/EventDispatcher.php

Spacing +39 added lines, -39 removed lines

@@ -29,7 +29,7 @@ 
 	 * also to dispatch the event
 	 */
 	
-	class EventDispatcher{
+	class EventDispatcher {
 		
 		/**
 		 * The list of the registered listeners
@@ -44,8 +44,8 @@ 
 		 */
 		private $logger;
 
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+			$this->logger = & class_loader('Log', 'classes');
 			$this->logger->setLogger('Library::EventDispatcher');
 		}
 
@@ -54,13 +54,13 @@ 
 		 * @param string   $eventName the name of the event to register for
 		 * @param callable $listener  the function or class method to receive the event information after dispatch
 		 */
-		public function addListener($eventName, callable $listener){
-			$this->logger->debug('Adding new event listener for the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(! isset($this->listeners[$eventName])){
+		public function addListener($eventName, callable $listener) {
+			$this->logger->debug('Adding new event listener for the event name [' . $eventName . '], listener [' . stringfy_vars($listener) . ']');
+			if (!isset($this->listeners[$eventName])) {
 				$this->logger->info('This event does not have the registered event listener before, adding new one');
 				$this->listeners[$eventName] = array();
 			}
-			else{
+			else {
 				$this->logger->info('This event already have the registered listener, add this listener to the list');
 			}
 			$this->listeners[$eventName][] = $listener;
@@ -71,19 +71,19 @@ 
 		 * @param  string   $eventName the event name
 		 * @param  callable $listener  the listener callback
 		 */
-		public function removeListener($eventName, callable $listener){
-			$this->logger->debug('Removing of the event listener, the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(isset($this->listeners[$eventName])){
+		public function removeListener($eventName, callable $listener) {
+			$this->logger->debug('Removing of the event listener, the event name [' . $eventName . '], listener [' . stringfy_vars($listener) . ']');
+			if (isset($this->listeners[$eventName])) {
 				$this->logger->info('This event have the listeners, check if this listener exists');
-				if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
-					$this->logger->info('Found the listener at index [' .$index. '] remove it');
+				if (false !== $index = array_search($listener, $this->listeners[$eventName], true)) {
+					$this->logger->info('Found the listener at index [' . $index . '] remove it');
 					unset($this->listeners[$eventName][$index]);
 				}
-				else{
+				else {
 					$this->logger->info('Cannot found this listener in the event listener list');
 				}
 			}
-			else{
+			else {
 				$this->logger->info('This event does not have this listener ignore remove');
 			}
 		}
@@ -93,13 +93,13 @@ 
 		 * remove all listeners for this event
 		 * @param  string $eventName the event name
 		 */
-		public function removeAllListener($eventName = null){
-			$this->logger->debug('Removing of all event listener, the event name [' .$eventName. ']');
-			if($eventName !== null && isset($this->listeners[$eventName])){
+		public function removeAllListener($eventName = null) {
+			$this->logger->debug('Removing of all event listener, the event name [' . $eventName . ']');
+			if ($eventName !== null && isset($this->listeners[$eventName])) {
 				$this->logger->info('The event name is set of exist in the listener just remove all event listener for this event');
 				unset($this->listeners[$eventName]);
 			}
-			else{
+			else {
 				$this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
 				$this->listeners = array();
 			}
@@ -110,7 +110,7 @@ 
 		 * @param string $eventName the event name
 		 * @return array the listeners for this event or empty array if this event does not contain any listener
 		 */
-		public function getListeners($eventName){
+		public function getListeners($eventName) {
 			return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
 		}
 		
@@ -119,21 +119,21 @@ 
 		 * @param  mixed|object $event the event information
 		 * @return void|object if event need return, will return the final EventInfo object.
 		 */	
-		public function dispatch($event){
-			if(! $event || !$event instanceof EventInfo){
+		public function dispatch($event) {
+			if (!$event || !$event instanceof EventInfo) {
 				$this->logger->info('The event is not set or is not an instance of "EventInfo" create the default "EventInfo" object to use instead of.');
 				$event = new EventInfo((string) $event);
 			}			
-			$this->logger->debug('Dispatch to the event listener, the event [' .stringfy_vars($event). ']');
-			if(isset($event->stop) && $event->stop){
+			$this->logger->debug('Dispatch to the event listener, the event [' . stringfy_vars($event) . ']');
+			if (isset($event->stop) && $event->stop) {
 				$this->logger->info('This event need stopped, no need call any listener');
 				return;
 			}
-			if($event->returnBack){
+			if ($event->returnBack) {
 				$this->logger->info('This event need return back, return the result for future use');
 				return $this->dispatchToListerners($event);
 			}
-			else{
+			else {
 				$this->logger->info('This event no need return back the result, just dispatch it');
 				$this->dispatchToListerners($event);
 			}
@@ -144,38 +144,38 @@ 
 		 * @param  object EventInfo $event  the event information
 		 * @return void|object if event need return, will return the final EventInfo instance.
 		 */	
-		private function dispatchToListerners(EventInfo $event){
+		private function dispatchToListerners(EventInfo $event) {
 			$eBackup = $event;
 			$list = $this->getListeners($event->name);
-			if(empty($list)){
-				$this->logger->info('No event listener is registered for the event [' .$event->name. '] skipping.');
-				if($event->returnBack){
+			if (empty($list)) {
+				$this->logger->info('No event listener is registered for the event [' . $event->name . '] skipping.');
+				if ($event->returnBack) {
 					return $event;
 				}
 				return;
 			}
-			else{
-				$this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
+			else {
+				$this->logger->info('Found the registered event listener for the event [' . $event->name . '] the list are: ' . stringfy_vars($list));
 			}
-			foreach($list as $listener){
-				if($eBackup->returnBack){
+			foreach ($list as $listener) {
+				if ($eBackup->returnBack) {
 					$returnedEvent = call_user_func_array($listener, array($event));
-					if($returnedEvent instanceof EventInfo){
+					if ($returnedEvent instanceof EventInfo) {
 						$event = $returnedEvent;
 					}
-					else{
-						show_error('This event [' .$event->name. '] need you return the event object after processing');
+					else {
+						show_error('This event [' . $event->name . '] need you return the event object after processing');
 					}
 				}
-				else{
+				else {
 					call_user_func_array($listener, array($event));
 				}
-				if($event->stop){
+				if ($event->stop) {
 					break;
 				}
 			}
 			//only test for original event may be during the flow some listeners change this parameter
-			if($eBackup->returnBack){
+			if ($eBackup->returnBack) {
 				return $event;
 			}
 		}

core/classes/Database.php

Spacing +254 added lines, -254 removed lines

@@ -23,165 +23,165 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
 	/**
 	 * The PDO instance
 	 * @var object
 	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
 	*/
-	private $databaseName        = null;
+	private $databaseName = null;
     
 	/**
 	 * The SQL SELECT statment
 	 * @var string
 	*/
-	private $select              = '*';
+	private $select = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
 	*/
-    private $from                = null;
+    private $from = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
 	*/
-    private $where               = null;
+    private $where = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
 	*/
-    private $limit               = null;
+    private $limit = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
 	*/
-    private $join                = null;
+    private $join = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
 	*/
-    private $orderBy             = null;
+    private $orderBy = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
 	*/
-    private $groupBy             = null;
+    private $groupBy = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
 	*/
-    private $having              = null;
+    private $having = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
 	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
 	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
 	*/
-    private $query               = null;
+    private $query = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
 	*/
-    private $prefix              = null;
+    private $prefix = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
 	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = array('=', '!=', '<', '>', '<=', '>=', '<>');
     
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
 	*/
-	private $cacheTtl              = 0;
+	private $cacheTtl = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
 	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
 	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
 	*/
-    private $data                = array();
+    private $data = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
 	*/
-    private $config              = array();
+    private $config = array();
 	
 	/**
 	 * The logger instance
 	 * @var Log
 	 */
-    private $logger              = null;
+    private $logger = null;
 
 
     /**
     * The cache instance
     * @var CacheInterface
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
      /**
     * The benchmark instance
     * @var Benchmark
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 
 
     /**
      * Construct new database
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      */
-    public function __construct($overwriteConfig = array()){
+    public function __construct($overwriteConfig = array()) {
         //Set Log instance to use
         $this->setLoggerFromParamOrCreateNewInstance(null);
 
@@ -195,23 +195,23 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
       }
-      else{
+      else {
         show_error('Database configuration is not set.');
         return false;
       }
@@ -222,15 +222,15 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current Database instance
      */
-    public function from($table){
-      if(is_array($table)){
+    public function from($table) {
+      if (is_array($table)) {
         $froms = '';
-        foreach($table as $key){
+        foreach ($table as $key) {
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
       }
-      else{
+      else {
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -241,7 +241,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current Database instance
      */
-    public function select($fields){
+    public function select($fields) {
       $select = (is_array($fields) ? implode(', ', $fields) : $fields);
       $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
       return $this;
@@ -252,7 +252,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current Database instance
      */
-    public function distinct($field){
+    public function distinct($field) {
       $distinct = ' DISTINCT ' . $field;
       $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
 
@@ -265,7 +265,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
       $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -277,7 +277,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
       $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -289,7 +289,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
       $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -301,7 +301,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
       $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -313,7 +313,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
       $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -328,16 +328,16 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current Database instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
       $on = $field1;
       $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
       }
-      if (empty($this->join)){
+      if (empty($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
-      else{
+      else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -348,7 +348,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
+    public function innerJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'INNER ');
     }
 
@@ -357,7 +357,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT ');
 	}
 
@@ -366,7 +366,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT ');
     }
 
@@ -375,7 +375,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function fullOuterJoin($table, $field1, $op = null, $field2 = '') {
     	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
     }
 
@@ -384,7 +384,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
     }
 
@@ -393,7 +393,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
     }
 
@@ -403,18 +403,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
         	$this->whereIsNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NULL ';
           }
       }
       return $this;
@@ -426,18 +426,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNotNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
           $this->whereIsNotNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NOT NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NOT NULL ';
           }
       }
       return $this;
@@ -449,15 +449,15 @@ 
      *
      * @return string
      */
-    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true){
+    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true) {
         $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
+        foreach ($where as $column => $data) {
+          if (is_null($data)) {
             $data = '';
           }
           $_where[] = $type . $column . ' = ' . ($escape ? $this->escape($data) : $data);
         }
-        $where = implode(' '.$andOr.' ', $_where);
+        $where = implode(' ' . $andOr . ' ', $_where);
         return $where;
     }
 
@@ -467,12 +467,12 @@ 
      *
      * @return string
      */
-    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true){
+    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true) {
        $x = explode('?', $where);
        $w = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
-              if(isset($op[$k]) && is_null($op[$k])){
+        foreach ($x as $k => $v) {
+          if (!empty($v)) {
+              if (isset($op[$k]) && is_null($op[$k])) {
                 $op[$k] = '';
               }
               $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -487,16 +487,16 @@ 
      *
      * @return string
      */
-    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true){
+    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true) {
        $w = '';
-       if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
+       if (!in_array((string) $op, $this->operatorList)) {
+          if (is_null($op)) {
             $op = '';
           }
           $w = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
         }
-        else{
-          if(is_null($val)){
+        else {
+          if (is_null($val)) {
             $val = '';
           }
           $w = $type . $where . $op . ($escape ? $this->escape($val) : $val);
@@ -509,16 +509,16 @@ 
        * @param string $whereStr the WHERE clause string
        * @param  string  $andOr the separator type used 'AND', 'OR', etc.
        */
-      protected function setWhereStr($whereStr, $andOr = 'AND'){
-        if (empty($this->where)){
+      protected function setWhereStr($whereStr, $andOr = 'AND') {
+        if (empty($this->where)) {
           $this->where = $whereStr;
         }
-        else{
-          if(substr($this->where, -1) == '('){
+        else {
+          if (substr($this->where, -1) == '(') {
             $this->where = $this->where . ' ' . $whereStr;
           }
-          else{
-            $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
+          else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $whereStr;
           }
         }
       }
@@ -533,13 +533,13 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current Database instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
       $whereStr = '';
-      if (is_array($where)){
+      if (is_array($where)) {
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
       }
-      else{
-        if(is_array($op)){
+      else {
+        if (is_array($op)) {
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
           $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape = true);
@@ -554,7 +554,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
+    public function orWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, '', 'OR', $escape);
     }
 
@@ -564,7 +564,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
+    public function notWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
     }
 
@@ -573,7 +573,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
+    public function orNotWhere($where, $op = null, $val = null, $escape = true) {
     	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
     }
 
@@ -583,15 +583,15 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current Database instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (empty($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+      if (empty($this->where)) {
         $this->where = $type . ' (';
       }
-      else{
-          if(substr($this->where, -1) == '('){
+      else {
+          if (substr($this->where, -1) == '(') {
             $this->where .= $type . ' (';
           }
-          else{
+          else {
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -603,7 +603,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
       return $this->groupStart('NOT');
     }
 
@@ -612,7 +612,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
       return $this->groupStart('', ' OR');
     }
 
@@ -621,7 +621,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
       return $this->groupStart('NOT', ' OR');
     }
 
@@ -629,7 +629,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current Database instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
       $this->where .= ')';
       return $this;
     }
@@ -643,10 +643,10 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
       $_keys = array();
-      foreach ($keys as $k => $v){
-        if(is_null($v)){
+      foreach ($keys as $k => $v) {
+        if (is_null($v)) {
           $v = '';
         }
         $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
@@ -662,7 +662,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function notIn($field, array $keys, $escape = true){
+    public function notIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'AND', $escape);
     }
 
@@ -671,7 +671,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -680,7 +680,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orNotIn($field, array $keys, $escape = true){
+    public function orNotIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'OR', $escape);
     }
 
@@ -694,11 +694,11 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
+    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($value1)) {
         $value1 = '';
       }
-      if(is_null($value2)){
+      if (is_null($value2)) {
         $value2 = '';
       }
       $whereStr = $field . ' ' . $type . ' BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
@@ -711,7 +711,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function notBetween($field, $value1, $value2, $escape = true){
+    public function notBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
     }
 
@@ -720,7 +720,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orBetween($field, $value1, $value2, $escape = true){
+    public function orBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, '', 'OR', $escape);
     }
 
@@ -729,7 +729,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
+    public function orNotBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
     }
 
@@ -742,20 +742,20 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(empty($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+      if (empty($data)) {
         $data = '';
       }
       $like = $escape ? $this->escape($data) : $data;
-      if (empty($this->where)){
+      if (empty($this->where)) {
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
       return $this;
@@ -766,7 +766,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
       return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -775,7 +775,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -784,7 +784,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -795,14 +795,14 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current Database instance
      */
-    public function limit($limit, $limitEnd = null){
-      if(empty($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (empty($limit)) {
         return;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
       }
-      else{
+      else {
         $this->limit = $limit;
       }
       return $this;
@@ -814,16 +814,16 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current Database instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! empty($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (!empty($orderDir)) {
+        $this->orderBy = !$this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
       }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+      else {
+        if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
+          $this->orderBy = !$this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
         }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+        else {
+          $this->orderBy = !$this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
       return $this;
@@ -834,11 +834,11 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current Database instance
      */
-    public function groupBy($field){
-      if(is_array($field)){
+    public function groupBy($field) {
+      if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
       }
-      else{
+      else {
         $this->groupBy = $field;
       }
       return $this;
@@ -852,13 +852,13 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+      if (is_array($op)) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
+        foreach ($x as $k => $v) {
+  	      if (!empty($v)) {
+            if (isset($op[$k]) && is_null($op[$k])) {
               $op[$k] = '';
             }
   	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -866,14 +866,14 @@ 
       	}
         $this->having = $w;
       }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
+      else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
       }
-      else{
-        if(is_null($val)){
+      else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
@@ -885,7 +885,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -893,15 +893,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -912,14 +912,14 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->limit = 1;
       $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+        return $this->query($query, false, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -929,37 +929,37 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
       $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! empty($this->join)){
+      if (!empty($this->join)) {
         $query .= $this->join;
       }
 	  
-      if (! empty($this->where)){
+      if (!empty($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! empty($this->groupBy)){
+      if (!empty($this->groupBy)) {
         $query .= ' GROUP BY ' . $this->groupBy;
       }
 
-      if (! empty($this->having)){
+      if (!empty($this->having)) {
         $query .= ' HAVING ' . $this->having;
       }
 
-      if (! empty($this->orderBy)){
+      if (!empty($this->orderBy)) {
           $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if(! empty($this->limit)){
+      if (!empty($this->limit)) {
       	$query .= ' LIMIT ' . $this->limit;
       }
 	  
-	   if($returnSQLQueryOrResultType === true){
+	   if ($returnSQLQueryOrResultType === true) {
       	return $query;
       }
-      else{
-    	   return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+    	   return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -969,15 +969,15 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
+    public function insert($data = array(), $escape = true) {
       $column = array();
       $val = array();
-      if(empty($data) && $this->getData()){
+      if (empty($data) && $this->getData()) {
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
       }
-      else{
+      else {
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -986,14 +986,14 @@ 
       $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
       $query = $this->query($query);
 
-      if ($query){
-        if(! $this->pdo){
+      if ($query) {
+        if (!$this->pdo) {
           $this->connect();
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
       }
-      else{
+      else {
 		  return false;
       }
     }
@@ -1004,29 +1004,29 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
       $query = 'UPDATE ' . $this->from . ' SET ';
       $values = array();
-      if(empty($data) && $this->getData()){
-        foreach ($this->getData() as $column => $val){
+      if (empty($data) && $this->getData()) {
+        foreach ($this->getData() as $column => $val) {
           $values[] = $column . ' = ' . $val;
         }
       }
-      else{
-        foreach ($data as $column => $val){
+      else {
+        foreach ($data as $column => $val) {
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
       }
       $query .= implode(', ', $values);
-      if (! empty($this->where)){
+      if (!empty($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! empty($this->orderBy)){
+      if (!empty($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if (! empty($this->limit)){
+      if (!empty($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
       }
       return $this->query($query);
@@ -1036,22 +1036,22 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
     	$query = 'DELETE FROM ' . $this->from;
 
-    	if (! empty($this->where)){
+    	if (!empty($this->where)) {
     		$query .= ' WHERE ' . $this->where;
       	}
 
-    	if (! empty($this->orderBy)){
+    	if (!empty($this->orderBy)) {
     	  $query .= ' ORDER BY ' . $this->orderBy;
       	}
 
-    	if (! empty($this->limit)){
+    	if (!empty($this->limit)) {
     		$query .= ' LIMIT ' . $this->limit;
       	}
 
-    	if($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite'){  
+    	if ($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite') {  
     		$query = 'TRUNCATE TABLE ' . $this->from;
       }
     	return $this->query($query);
@@ -1064,13 +1064,13 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
-      if(is_array($all)){
+      if (is_array($all)) {
         $x = explode('?', $query);
         $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
+        foreach ($x as $k => $v) {
+          if (!empty($v)) {
             $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
           }
         }
@@ -1079,7 +1079,7 @@ 
 
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+      $this->logger->info('Execute SQL query [' . $this->query . '], return type: ' . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' . ($all ? 'YES' : 'NO'));
       //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
@@ -1101,34 +1101,34 @@ 
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
+      if ($dbCacheStatus && $sqlSELECTQuery) {
         $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
         $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
+        if (is_object($this->cacheInstance)) {
           $cacheInstance = $this->cacheInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
       }
-      else{
+      else {
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       
-      if (! $cacheContent && $sqlSELECTQuery){
+      if (!$cacheContent && $sqlSELECTQuery) {
 		    //for database query execution time
         $benchmarkMarkerKey = md5($query . $all . $array);
         $bench = null;
-        if(is_object($this->benchmarkInstance)){
+        if (is_object($this->benchmarkInstance)) {
           $bench = $this->benchmarkInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1139,64 +1139,64 @@ 
     		//get response time for this query
         $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
-        if ($sqlQuery){
+        if ($sqlQuery) {
             //if need return all result like list of record
-            if ($all){
+            if ($all) {
     				    $this->result = ($array === false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
     		    }
-            else{
+            else {
 				        $this->result = ($array === false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
-            if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+            if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
               $this->numRows = count($this->result);  
             }
-            else{
+            else {
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
-          if ($dbCacheStatus && $sqlSELECTQuery){
-              $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+          if ($dbCacheStatus && $sqlSELECTQuery) {
+              $this->logger->info('Save the result for query [' . $this->query . '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
         }
-        else{
+        else {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      else if ((!$cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)) {
     		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
+    		if ($queryStr) {
           //Sqlite and pgsql always return 0 when using rowCount()
-          if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+          if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
           }
-          else{
+          else {
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
     		}
-        if (! $this->result){
+        if (!$this->result) {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      else {
+        $this->logger->info('The result for query [' . $this->query . '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
       }
       $this->queryCount++;
-      if(! $this->result){
+      if (!$this->result) {
         $this->logger->info('No result where found for the query [' . $query . ']');
       }
       return $this->result;
@@ -1207,8 +1207,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
 		    $this->temporaryCacheTtl = $ttl;
       }
@@ -1220,8 +1220,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-	public function cached($ttl = 0){
-      if($ttl > 0){
+	public function cached($ttl = 0) {
+      if ($ttl > 0) {
         $this->temporaryCacheTtl = $ttl;
       }
 	  return $this;
@@ -1232,11 +1232,11 @@ 
      * @param  mixed $data the data to be escaped
      * @return mixed       the data after escaped
      */
-    public function escape($data){
-      if(is_null($data)){
+    public function escape($data) {
+      if (is_null($data)) {
         return null;
       }
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       return $this->pdo->quote(trim($data));
@@ -1246,7 +1246,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -1254,7 +1254,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -1262,7 +1262,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -1270,7 +1270,7 @@ 
      * Return the database configuration
      * @return array
      */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
       return $this->config;
     }
 
@@ -1278,7 +1278,7 @@ 
      * set the database configuration
      * @param array $config the configuration
      */
-    public function setDatabaseConfiguration(array $config){
+    public function setDatabaseConfiguration(array $config) {
       $this->config = array_merge($this->config, $config);
       $this->prefix = $this->config['prefix'];
       $this->databaseName = $this->config['database'];
@@ -1290,7 +1290,7 @@ 
      * Return the PDO instance
      * @return PDO
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -1298,7 +1298,7 @@ 
      * Set the PDO instance
      * @param PDO $pdo the pdo object
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -1308,7 +1308,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -1316,7 +1316,7 @@ 
      * Set the log instance
      * @param Log $logger the log object
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -1325,7 +1325,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -1333,7 +1333,7 @@ 
      * Set the cache instance
      * @param CacheInterface $cache the cache object
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -1342,7 +1342,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -1350,7 +1350,7 @@ 
      * Set the benchmark instance
      * @param Benchmark $cache the cache object
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -1359,7 +1359,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -1370,7 +1370,7 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value, $escape = true){
+    public function setData($key, $value, $escape = true) {
       $this->data[$key] = $escape ? $this->escape($value) : $value;
       return $this;
     }
@@ -1379,12 +1379,12 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+      if ($logger !== null) {
         $this->logger = $logger;
       }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
+      else {
+          $this->logger = & class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
     }
@@ -1393,14 +1393,14 @@ 
     * Setting the database configuration using the configuration file
     * @param array $overwriteConfig the additional configuration to overwrite with the existing one
     */
-    protected function setDatabaseConfigurationFromConfigFile(array $overwriteConfig = array()){
+    protected function setDatabaseConfigurationFromConfigFile(array $overwriteConfig = array()) {
         $db = array();
-        if(file_exists(CONFIG_PATH . 'database.php')){
+        if (file_exists(CONFIG_PATH . 'database.php')) {
             //here don't use require_once because somewhere user can create database instance directly
             require CONFIG_PATH . 'database.php';
         }
           
-        if(! empty($overwriteConfig)){
+        if (!empty($overwriteConfig)) {
           $db = array_merge($db, $overwriteConfig);
         }
         $config = array();
@@ -1413,12 +1413,12 @@ 
         $config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
         $config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
         $port = '';
-        if(strstr($config['hostname'], ':')){
+        if (strstr($config['hostname'], ':')) {
           $p = explode(':', $config['hostname']);
           $port = isset($p[1]) ? $p[1] : '';
           $config['hostname'] = isset($p[0]) ? $p[0] : '';
         }
-        $config['port']      = $port;
+        $config['port'] = $port;
         $this->setDatabaseConfiguration($config);  
     }
 
@@ -1426,9 +1426,9 @@ 
      * This method is used to get the PDO DSN string using th configured driver
      * @return string the DSN string
      */
-    protected function getDsnFromDriver(){
+    protected function getDsnFromDriver() {
       $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
+      if (!empty($config)) {
             $driverDsnMap = array(
                                     'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
                                                 . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
@@ -1451,7 +1451,7 @@ 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
-  private function reset(){
+  private function reset() {
     $this->select   = '*';
     $this->from     = null;
     $this->where    = null;
@@ -1471,7 +1471,7 @@ 
   /**
    * The class destructor
    */
-  public function __destruct(){
+  public function __destruct() {
     $this->pdo = null;
   }
 

core/classes/Response.php

Spacing +74 added lines, -74 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Response{
+	class Response {
 
 		/**
 		 * The list of request header to send with response
@@ -65,9 +65,9 @@ 
 		/**
 		 * Construct new response instance
 		 */
-		public function __construct(){
-			$this->_currentUrl =  (! empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '' )
-					. (! empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '' );
+		public function __construct() {
+			$this->_currentUrl = (!empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '')
+					. (!empty($_SERVER['QUERY_STRING']) ? ('?' . $_SERVER['QUERY_STRING']) : '');
 					
 			$this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
@@ -82,9 +82,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Response');
 			}
 			return self::$logger[0];
@@ -95,12 +95,12 @@ 
 		 * @param  integer $httpCode the HTTP status code
 		 * @param  array   $headers   the additional headers to add to the existing headers list
 		 */
-		public static function sendHeaders($httpCode = 200, array $headers = array()){
+		public static function sendHeaders($httpCode = 200, array $headers = array()) {
 			set_http_status_header($httpCode);
 			self::setHeaders($headers);
-			if(! headers_sent()){
-				foreach(self::getHeaders() as $key => $value){
-					header($key .': '.$value);
+			if (!headers_sent()) {
+				foreach (self::getHeaders() as $key => $value) {
+					header($key . ': ' . $value);
 				}
 			}
 		}
@@ -109,7 +109,7 @@ 
 		 * Get the list of the headers
 		 * @return array the headers list
 		 */
-		public static function getHeaders(){
+		public static function getHeaders() {
 			return self::$headers;
 		}
 
@@ -118,7 +118,7 @@ 
 		 * @param  string $name the header name
 		 * @return string       the header value
 		 */
-		public static function getHeader($name){
+		public static function getHeader($name) {
 			return array_key_exists($name, self::$headers) ? self::$headers[$name] : null;
 		}
 
@@ -128,7 +128,7 @@ 
 		 * @param string $name  the header name
 		 * @param string $value the header value to be set
 		 */
-		public static function setHeader($name, $value){
+		public static function setHeader($name, $value) {
 			self::$headers[$name] = $value;
 		}
 
@@ -137,7 +137,7 @@ 
 		 * @param array $headers the list of the headers to set. 
 		 * Note: this will merge with the existing headers
 		 */
-		public static function setHeaders(array $headers){
+		public static function setHeaders(array $headers) {
 			self::$headers = array_merge(self::getHeaders(), $headers);
 		}
 		
@@ -145,17 +145,17 @@ 
 		 * Redirect user in the specified page
 		 * @param  string $path the URL or URI to be redirect to
 		 */
-		public static function redirect($path = ''){
+		public static function redirect($path = '') {
 			$logger = self::getLogger();
 			$url = Url::site_url($path);
-			$logger->info('Redirect to URL [' .$url. ']');
-			if(! headers_sent()){
-				header('Location: '.$url);
+			$logger->info('Redirect to URL [' . $url . ']');
+			if (!headers_sent()) {
+				header('Location: ' . $url);
 				exit;
 			}
-			else{
+			else {
 				echo '<script>
-						location.href = "'.$url.'";
+						location.href = "'.$url . '";
 					</script>';
 			}
 		}
@@ -168,10 +168,10 @@ 
 		 * @return void|string          if $return is true will return the view content otherwise
 		 * will display the view content.
 		 */
-		public function render($view, $data = null, $return = false){
+		public function render($view, $data = null, $return = false) {
 			$logger = self::getLogger();
 			//convert data to an array
-			$data = ! is_array($data) ? (array) $data : $data;
+			$data = !is_array($data) ? (array) $data : $data;
 			$view = str_ireplace('.php', '', $view);
 			$view = trim($view, '/\\');
 			$viewFile = $view . '.php';
@@ -180,42 +180,42 @@ 
 			//super instance
 			$obj = & get_instance();
 			
-			if(Module::hasModule()){
+			if (Module::hasModule()) {
 				//check in module first
 				$logger->debug('Checking the view [' . $view . '] from module list ...');
 				$mod = null;
 				//check if the request class contains module name
-				if(strpos($view, '/') !== false){
+				if (strpos($view, '/') !== false) {
 					$viewPath = explode('/', $view);
-					if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
+					if (isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())) {
 						$mod = $viewPath[0];
 						array_shift($viewPath);
 						$view = implode('/', $viewPath);
 						$viewFile = $view . '.php';
 					}
 				}
-				if(! $mod && !empty($obj->moduleName)){
+				if (!$mod && !empty($obj->moduleName)) {
 					$mod = $obj->moduleName;
 				}
-				if($mod){
+				if ($mod) {
 					$moduleViewPath = Module::findViewFullPath($view, $mod);
-					if($moduleViewPath){
+					if ($moduleViewPath) {
 						$path = $moduleViewPath;
-						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
+						$logger->info('Found view [' . $view . '] in module [' . $mod . '], the file path is [' . $moduleViewPath . '] we will used it');
 					}
-					else{
-						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
+					else {
+						$logger->info('Cannot find view [' . $view . '] in module [' . $mod . '] using the default location');
 					}
 				}
-				else{
+				else {
 					$logger->info('The current request does not use module using the default location.');
 				}
 			}
 			$logger->info('The view file path to be loaded is [' . $path . ']');
 			$found = false;
-			if(file_exists($path)){
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
+			if (file_exists($path)) {
+				foreach (get_object_vars($obj) as $key => $value) {
+					if (!isset($this->{$key})) {
 						$this->{$key} = & $obj->{$key};
 					}
 				}
@@ -224,39 +224,39 @@ 
 				//need use require() instead of require_once because can load this view many time
 				require $path;
 				$content = ob_get_clean();
-				if($return){
+				if ($return) {
 					return $content;
 				}
 				$this->_pageRender .= $content;
 				$found = true;
 			}
-			if(! $found){
-				show_error('Unable to find view [' .$view . ']');
+			if (!$found) {
+				show_error('Unable to find view [' . $view . ']');
 			}
 		}
 		
 		/**
 		* Send the final page output to user
 		*/
-		public function renderFinalPage(){
+		public function renderFinalPage() {
 			$logger = self::getLogger();
 			$obj = & get_instance();
 			$cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
 			$dispatcher = $obj->eventdispatcher;
 			$content = $this->_pageRender;
-			if(! $content){
+			if (!$content) {
 				$logger->warning('The final view content is empty.');
 				return;
 			}
 			//dispatch
 			$event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
-			$content = ! empty($event->payload) ? $event->payload : null;
-			if(empty($content)){
+			$content = !empty($event->payload) ? $event->payload : null;
+			if (empty($content)) {
 				$logger->warning('The view content is empty after dispatch to event listeners.');
 			}
 			
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				//current page URL
 				$url = $this->_currentUrl;
 				//Cache view Time to live in second
@@ -271,14 +271,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');	
 				}
 			}
 			
@@ -289,10 +289,10 @@ 
 			$content = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content);
 			
 			//compress the output if is available
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				ob_start('ob_gzhandler');
 			}
-			else{
+			else {
 				ob_start();
 			}
 			self::sendHeaders(200);
@@ -303,7 +303,7 @@ 
 		/**
 		* Send the final page output to user if is cached
 		*/
-		public function renderFinalPageFromCache(&$cache){
+		public function renderFinalPageFromCache(&$cache) {
 			$logger = self::getLogger();
 			$url = $this->_currentUrl;					
 			//the current page cache key for identification
@@ -312,25 +312,25 @@ 
 			$logger->debug('Checking if the page content for the URL [' . $url . '] is cached ...');
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$lastModified = $cacheInfo['mtime'];
 				$expire = $cacheInfo['expire'];
 				$maxAge = $expire - $_SERVER['REQUEST_TIME'];
 				self::setHeader('Pragma', 'public');
 				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
-				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
+				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 					$logger->info('The cache page content is not yet expire for the URL [' . $url . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return;
 				}
-				else{
+				else {
 					$logger->info('The cache page content is expired or the browser don\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $url . '] send cache headers to tell the browser');
 					self::sendHeaders(200);
 					//get the cache content
 					$content = $cache->get($pageCacheKey);
-					if($content){
+					if ($content) {
 						$logger->info('The page content for the URL [' . $url . '] already cached just display it');
 						//load benchmark class
 						$benchmark = & class_loader('Benchmark');
@@ -343,17 +343,17 @@ 
 						
 						///display the final output
 						//compress the output if is available
-						if (self::$_canCompressOutput){
+						if (self::$_canCompressOutput) {
 							ob_start('ob_gzhandler');
 						}
-						else{
+						else {
 							ob_start();
 						}
 						echo $content;
 						ob_end_flush();
 						return;
 					}
-					else{
+					else {
 						$logger->info('The page cache content for the URL [' . $url . '] is not valid may be already expired');
 						$cache->delete($pageCacheKey);
 					}
@@ -365,7 +365,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -373,14 +373,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';
@@ -390,12 +390,12 @@ 
 			$logger->error($str);
 			/***********************************/
 			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				require_once $path;
@@ -403,8 +403,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');
 			}
 		}
 
@@ -412,14 +412,14 @@ 
 		 * Display the error to user
 		 * @param  array  $data the error information
 		 */
-		public static function sendError(array $data = array()){
+		public static function sendError(array $data = array()) {
 			$path = CORE_VIEWS_PATH . 'errors.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if exists
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					ob_start('ob_gzhandler');
 				}
-				else{
+				else {
 					ob_start();
 				}
 				extract($data);
@@ -428,7 +428,7 @@ 
 				self::sendHeaders(503);
 				echo $output;
 			}
-			else{
+			else {
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';

core/classes/Controller.php

Spacing +20 added lines, -20 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Controller{
+	class Controller {
 		
 		/**
 		 * The name of the module if this controller belong to an module
@@ -48,7 +48,7 @@ 
 		 * Class constructor
 		 * @param object $logger the Log instance to use if is null will create one
 		 */
-		public function __construct(Log $logger = null){
+		public function __construct(Log $logger = null) {
 			//setting the Log instance
 			$this->setLoggerFromParamOrCreateNewInstance(null);
 			
@@ -84,9 +84,9 @@ 
 		/**
 		 * This method is used to set the module name
 		 */
-		protected function setModuleNameFromRouter(){
+		protected function setModuleNameFromRouter() {
 			//determine the current module
-			if(isset($this->router) && $this->router->getModule()){
+			if (isset($this->router) && $this->router->getModule()) {
 				$this->moduleName = $this->router->getModule();
 			}
 		}
@@ -95,13 +95,13 @@ 
 		 * Set the cache using the argument otherwise will use the configuration
 		 * @param CacheInterface $cache the implementation of CacheInterface if null will use the configured
 		 */
-		protected function setCacheFromParamOrConfig(CacheInterface $cache = null){
+		protected function setCacheFromParamOrConfig(CacheInterface $cache = null) {
 			$this->logger->debug('Setting the cache handler instance');
 			//set cache handler instance
-			if(get_config('cache_enable', false)){
-				if ($cache !== null){
+			if (get_config('cache_enable', false)) {
+				if ($cache !== null) {
 					$this->cache = $cache;
-				} else if (isset($this->{strtolower(get_config('cache_handler'))})){
+				} else if (isset($this->{strtolower(get_config('cache_handler'))})) {
 					$this->cache = $this->{strtolower(get_config('cache_handler'))};
 					unset($this->{strtolower(get_config('cache_handler'))});
 				} 
@@ -112,12 +112,12 @@ 
 		 * Set the Log instance using argument or create new instance
 		 * @param object $logger the Log instance if not null
 		 */
-		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-			if($logger !== null){
+		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+			if ($logger !== null) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }
 		}
@@ -126,20 +126,20 @@ 
 		 * This method is used to load the required resources for framework to work
 		 * @return void 
 		 */
-		private function loadRequiredResources(){
+		private function loadRequiredResources() {
 			$this->logger->debug('Adding the loaded classes to the super instance');
-			foreach (class_loaded() as $var => $class){
-				$this->$var =& class_loader($class);
+			foreach (class_loaded() as $var => $class) {
+				$this->$var = & class_loader($class);
 			}
 
 			$this->logger->debug('Loading the required classes into super instance');
-			$this->eventdispatcher =& class_loader('EventDispatcher', 'classes');
-			$this->loader =& class_loader('Loader', 'classes');
-			$this->lang =& class_loader('Lang', 'classes');
-			$this->request =& class_loader('Request', 'classes');
+			$this->eventdispatcher = & class_loader('EventDispatcher', 'classes');
+			$this->loader = & class_loader('Loader', 'classes');
+			$this->lang = & class_loader('Lang', 'classes');
+			$this->request = & class_loader('Request', 'classes');
 			//dispatch the request instance created event
 			$this->eventdispatcher->dispatch('REQUEST_CREATED');
-			$this->response =& class_loader('Response', 'classes', 'classes');
+			$this->response = & class_loader('Response', 'classes', 'classes');
 		}
 
 	}