tnhfw / tnh-fw

core/classes/model/DBSessionHandlerModel.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
 	 * DB session handler class

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 		 */
 		protected $sessionTableColumns = array();
 
-		public function __construct(Database $db = null){
+		public function __construct(Database $db = null) {
 			parent::__construct($db);
 		}
 
@@ -53,7 +53,7 @@ 
 		 * Return the session database table columns
 		 * @return array 
 		 */
-		public function getSessionTableColumns(){
+		public function getSessionTableColumns() {
 			return $this->sessionTableColumns;
 		}
 
@@ -61,7 +61,7 @@ 
 		 * Set the session database table columns
 		 * @param array $columns the columns definition
 		 */
-		public function setSessionTableColumns(array $columns){
+		public function setSessionTableColumns(array $columns) {
 			$this->sessionTableColumns = $columns;
 			return $this;
 		}

core/classes/Url.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 
 	class Url{

Spacing +25 added lines, -25 removed lines

@@ -25,15 +25,15 @@ 
 	*/
 
 
-	class Url{
+	class Url {
 
 		/**
 		 * Return the link using base_url config without front controller "index.php"
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function base_url($path = ''){
-			if(is_url($path)){
+		public static function base_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			return get_config('base_url') . $path;
@@ -44,26 +44,26 @@ 
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function site_url($path = ''){
-			if(is_url($path)){
+		public static function site_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			$path = rtrim($path, '/');
 			$baseUrl = get_config('base_url');
 			$frontController = get_config('front_controller');
 			$url = $baseUrl;
-			if($frontController){
+			if ($frontController) {
 				$url .= $frontController . '/';
 			}
-			if(($suffix = get_config('url_suffix')) && $path){
-				if(strpos($path, '?') !== false){
+			if (($suffix = get_config('url_suffix')) && $path) {
+				if (strpos($path, '?') !== false) {
 					$query = explode('?', $path);
 					$query[0] = str_ireplace($suffix, '', $query[0]);
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
 				}
-				else{
+				else {
 					$path .= $suffix;
 				}
 			}
@@ -74,10 +74,10 @@ 
 		 * Return the current site URL
 		 * @return string
 		 */
-		public static function current(){
+		public static function current() {
 			$current = '/';
 			$requestUri = get_instance()->request->requestUri();
-			if($requestUri){
+			if ($requestUri) {
 				$current = $requestUri;
 			}
 			return static::domain() . $current;
@@ -90,18 +90,18 @@ 
 		 * @param  boolean $lowercase whether to set the final text to lowe case or not
 		 * @return string the friendly generated text
 		 */
-		public static function title($str = null, $separator = '-', $lowercase = true){
+		public static function title($str = null, $separator = '-', $lowercase = true) {
 			$str = trim($str);
-			$from = array('ç','À','Á','Â','Ã','Ä','Å','à','á','â','ã','ä','å','Ò','Ó','Ô','Õ','Ö','Ø','ò','ó','ô','õ','ö','ø','È','É','Ê','Ë','è','é','ê','ë','Ç','ç','Ì','Í','Î','Ï','ì','í','î','ï','Ù','Ú','Û','Ü','ù','ú','û','ü','ÿ','Ñ','ñ');
-			$to = array('c','a','a','a','a','a','a','a','a','a','a','a','a','o','o','o','o','o','o','o','o','o','o','o','o','e','e','e','e','e','e','e','e','e','e','i','i','i','i','i','i','i','i','u','u','u','u','u','u','u','u','y','n','n');
+			$from = array('ç', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'à', 'á', 'â', 'ã', 'ä', 'å', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'È', 'É', 'Ê', 'Ë', 'è', 'é', 'ê', 'ë', 'Ç', 'ç', 'Ì', 'Í', 'Î', 'Ï', 'ì', 'í', 'î', 'ï', 'Ù', 'Ú', 'Û', 'Ü', 'ù', 'ú', 'û', 'ü', 'ÿ', 'Ñ', 'ñ');
+			$to = array('c', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'y', 'n', 'n');
 			$str = str_replace($from, $to, $str);
 			$str = preg_replace('#([^a-z0-9]+)#i', $separator, $str);
 			$str = str_replace('--', $separator, $str);
 			//if after process we get something like one-two-three-, need truncate the last separator "-"
-			if(substr($str, -1) == $separator){
+			if (substr($str, -1) == $separator) {
 				$str = substr($str, 0, -1);
 			}
-			if($lowercase){
+			if ($lowercase) {
 				$str = strtolower($str);
 			}
 			return $str;
@@ -111,36 +111,36 @@ 
 		 * Get the current application domain with protocol
 		 * @return string the domain name
 		 */
-		public static function domain(){
+		public static function domain() {
 			$obj = & get_instance();
 			$domain = 'localhost';
 			$port = $obj->request->server('SERVER_PORT');
 			$protocol = is_https() ? 'https' : 'http';
 			
-			if($obj->request->server('HTTP_HOST')){
+			if ($obj->request->server('HTTP_HOST')) {
 				$domain = $obj->request->server('HTTP_HOST');
 			}
-			else if($obj->request->server('SERVER_NAME')){
+			else if ($obj->request->server('SERVER_NAME')) {
 				$domain = $obj->request->server('SERVER_NAME');
 			}
-			else if($obj->request->server('SERVER_ADDR')){
+			else if ($obj->request->server('SERVER_ADDR')) {
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
-			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){
+			if ($port && (is_https() && $port != 443 || !is_https() && $port != 80)) {
 				//some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
 				//of the domain like https://my.domain.com:787
-				if(is_https() && $port != 80){
-					$domain .= ':'.$port;
+				if (is_https() && $port != 80) {
+					$domain .= ':' . $port;
 				}
 			}
-			return $protocol.'://'.$domain;
+			return $protocol . '://' . $domain;
 		}
 
 		/**
 		 * Get the current request query string
 		 * @return string
 		 */
-		public static function queryString(){
+		public static function queryString() {
 			return get_instance()->request->server('QUERY_STRING');
 		}
 	}
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -62,8 +62,7 @@ 
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
-				}
-				else{
+				} else{
 					$path .= $suffix;
 				}
 			}
@@ -119,11 +118,9 @@ 
 			
 			if($obj->request->server('HTTP_HOST')){
 				$domain = $obj->request->server('HTTP_HOST');
-			}
-			else if($obj->request->server('SERVER_NAME')){
+			} else if($obj->request->server('SERVER_NAME')){
 				$domain = $obj->request->server('SERVER_NAME');
-			}
-			else if($obj->request->server('SERVER_ADDR')){
+			} else if($obj->request->server('SERVER_ADDR')){
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
 			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){

core/classes/Session.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	class Session{
 		
 		/**

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 			($_SESSION[$key]) : $default;
 			if(array_key_exists($key, $_SESSION)){
 				unset($_SESSION[$key]);
-			}
-			else{
+			} else{
 				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
 			}
 			return $return;
@@ -126,8 +125,7 @@ 
 			if(array_key_exists($item, $_SESSION)){
 				$logger->info('Deleting of session for item ['.$item.' ]');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
 			}
 		}
@@ -142,8 +140,7 @@ 
 			if(array_key_exists($key, $_SESSION)){
 				$logger->info('Delete session flash for item ['.$item.']');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
 			}
 		}

Spacing +31 added lines, -31 removed lines

@@ -23,7 +23,7 @@ 
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
-	class Session{
+	class Session {
 		
 		/**
 		 * The session flash key to use
@@ -41,9 +41,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::Session');
 			}
 			return self::$logger[0];
@@ -55,14 +55,14 @@ 
 		 * @param  mixed $default the default value to use if can not find the session item in the list
 		 * @return mixed          the session value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = self::getLogger();
-			$logger->debug('Getting session data for item [' .$item. '] ...');
-			if(array_key_exists($item, $_SESSION)){
+			$logger->debug('Getting session data for item [' . $item . '] ...');
+			if (array_key_exists($item, $_SESSION)) {
 				$logger->info('Found session data for item [' . $item . '] the vaue is : [' . stringfy_vars($_SESSION[$item]) . ']');
 				return $_SESSION[$item];
 			}
-			$logger->warning('Cannot find session item [' . $item . '] using the default value ['. $default . ']');
+			$logger->warning('Cannot find session item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -71,7 +71,7 @@ 
 		 * @param string $item  the session item name to set
 		 * @param mixed $value the session item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			$logger = self::getLogger();
 			$logger->debug('Setting session data for item [' . $item . '], value [' . stringfy_vars($value) . ']');
 			$_SESSION[$item] = $value;
@@ -83,16 +83,16 @@ 
 		 * @param  mixed $default the default value to use if can not find the session flash item in the list
 		 * @return mixed          the session flash value if exist or the default value
 		 */
-		public static function getFlash($item, $default = null){
+		public static function getFlash($item, $default = null) {
 			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$return = array_key_exists($key, $_SESSION) ?
 			($_SESSION[$key]) : $default;
-			if(array_key_exists($key, $_SESSION)){
+			if (array_key_exists($key, $_SESSION)) {
 				unset($_SESSION[$key]);
 			}
-			else{
-				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
+			else {
+				$logger->warning('Cannot find session flash item [' . $key . '] using the default value [' . $default . ']');
 			}
 			return $return;
 		}
@@ -102,8 +102,8 @@ 
 		 * @param  string  $item the session flash item name
 		 * @return boolean 
 		 */
-		public static function hasFlash($item){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function hasFlash($item) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			return array_key_exists($key, $_SESSION);
 		}
 
@@ -112,8 +112,8 @@ 
 		 * @param string $item  the session flash item name to set
 		 * @param mixed $value the session flash item value
 		 */
-		public static function setFlash($item, $value){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function setFlash($item, $value) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$_SESSION[$key] = $value;
 		}
 
@@ -121,14 +121,14 @@ 
 		 * Clear the session item in the list
 		 * @param  string $item the session item name to be deleted
 		 */
-		public static function clear($item){
+		public static function clear($item) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Deleting of session for item ['.$item.' ]');
+			if (array_key_exists($item, $_SESSION)) {
+				$logger->info('Deleting of session for item [' . $item . ' ]');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Session item [' . $item . '] to be deleted does not exists');
 			}
 		}
 		
@@ -136,15 +136,15 @@ 
 		 * Clear the session flash item in the list
 		 * @param  string $item the session flash item name to be deleted
 		 */
-		public static function clearFlash($item){
+		public static function clearFlash($item) {
 			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			if(array_key_exists($key, $_SESSION)){
-				$logger->info('Delete session flash for item ['.$item.']');
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
+			if (array_key_exists($key, $_SESSION)) {
+				$logger->info('Delete session flash for item [' . $item . ']');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Dession flash item [' . $item . '] to be deleted does not exists');
 			}
 		}
 
@@ -153,14 +153,14 @@ 
 		 * @param  string  $item the session item name
 		 * @return boolean 
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_SESSION);
 		}
 
 		/**
 		 * Destroy all session data values
 		 */
-		public static function clearAll(){
+		public static function clearAll() {
 			session_unset();
 			session_destroy();
 		}

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -22,23 +22,23 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Router {
 		
 		/**
-		* @var array $pattern: The list of URIs to validate against
-		*/
+		 * @var array $pattern: The list of URIs to validate against
+		 */
 		private $pattern = array();
 
 		/**
-		* @var array $callback: The list of callback to call
-		*/
+		 * @var array $callback: The list of callback to call
+		 */
 		private $callback = array();
 
 		/**
-		* @var string $uriTrim: The char to remove from the URIs
-		*/
+		 * @var string $uriTrim: The char to remove from the URIs
+		 */
 		protected $uriTrim = '/\^$';
 
 		/**
@@ -94,9 +94,9 @@ 
 		 */
 		public function __construct(){
 			$this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Router');
-	        $routesPath = CONFIG_PATH . 'routes.php';
-	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
+			$this->logger->setLogger('Library::Router');
+			$routesPath = CONFIG_PATH . 'routes.php';
+			$this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
 			if(file_exists($routesPath)){
 				 $this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
 				require_once $routesPath;
@@ -147,11 +147,11 @@ 
 		}
 
 		/**
-		* Add the URI and callback to the list of URIs to validate
-		*
-		* @param string $uri the request URI
-		* @param object $callback the callback function
-		*/
+		 * Add the URI and callback to the list of URIs to validate
+		 *
+		 * @param string $uri the request URI
+		 * @param object $callback the callback function
+		 */
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
 			if(in_array($uri, $this->pattern)){

Spacing +59 added lines, -59 removed lines

@@ -92,36 +92,36 @@ 
 		/**
 		 * Construct the new Router instance
 		 */
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+			$this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Router');
 	        $routesPath = CONFIG_PATH . 'routes.php';
 	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
-			if(file_exists($routesPath)){
-				 $this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
+			if (file_exists($routesPath)) {
+				 $this->logger->info('Found routes configuration file --> ' . $routesPath . ' now load it');
 				require_once $routesPath;
-				if(! empty($route) && is_array($route)){
+				if (!empty($route) && is_array($route)) {
 					$this->routes = $route;
 					unset($route);
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
 			//loading routes for module
 			$this->logger->debug('Loading of modules routes ... ');
 			$modulesRoutes = Module::getModulesRoutes();
-			if($modulesRoutes && is_array($modulesRoutes)){
+			if ($modulesRoutes && is_array($modulesRoutes)) {
 				$this->routes = array_merge($this->routes, $modulesRoutes);
 				$this->logger->info('Routes for all modules loaded successfully');
 			}
-			else{
+			else {
 				$this->logger->info('No routes found for all modules skipping.');
 			}
 			$this->logger->info('The routes configuration are listed below: ' . stringfy_vars($this->routes));
 
-			foreach($this->routes as $pattern => $callback){
+			foreach ($this->routes as $pattern => $callback) {
 				$this->add($pattern, $callback);
 			}
 			
@@ -129,14 +129,14 @@ 
 			$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 			$this->logger->debug('Check if URL suffix is enabled in the configuration');
 			//remove url suffix from the request URI
-			if($suffix = get_config('url_suffix')){
-				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
+			if ($suffix = get_config('url_suffix')) {
+				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']');
 				$uri = str_ireplace($suffix, '', $uri);
 			}
-			else{
+			else {
 				$this->logger->info('URL suffix is not enabled in the configuration');
 			}
-			if(strpos($uri, '?') !== false){
+			if (strpos($uri, '?') !== false) {
 				$uri = substr($uri, 0, strpos($uri, '?'));
 			}
 			$uri = trim($uri, $this->uriTrim);
@@ -151,7 +151,7 @@ 
 		*/
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
-			if(in_array($uri, $this->pattern)){
+			if (in_array($uri, $this->pattern)) {
 				$this->logger->warning('The route [' . $uri . '] already added, may be adding again can have route conflict');
 			}
 			$this->pattern[] = $uri;
@@ -162,7 +162,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -170,7 +170,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -178,7 +178,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -186,7 +186,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -194,7 +194,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -202,7 +202,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -211,27 +211,27 @@ 
 		 * otherwise send 404 error.
 		 */
 		public function run() {
-			$benchmark =& class_loader('Benchmark');
+			$benchmark = & class_loader('Benchmark');
 			$benchmark->mark('ROUTING_PROCESS_START');
 			$this->logger->debug('Routing process start ...');
 			$segment = $this->segments;
 			$baseUrl = get_config('base_url');
 			//check if the app is not in DOCUMENT_ROOT
-			if(isset($segment[0]) && stripos($baseUrl, $segment[0]) != false){
+			if (isset($segment[0]) && stripos($baseUrl, $segment[0]) != false) {
 				array_shift($segment);
 				$this->segments = $segment;
 			}
 			$this->logger->debug('Check if the request URI contains the front controller');
-			if(isset($segment[0]) && $segment[0] == SELF){
+			if (isset($segment[0]) && $segment[0] == SELF) {
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
 			}
-			else{
+			else {
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
-			$this->logger->info('The final Request URI is [' . $uri . ']' );
+			$this->logger->info('The final Request URI is [' . $uri . ']');
 			//generic routes
 			$pattern = array(':num', ':alpha', ':alnum', ':any');
 			$replace = array('[0-9]+', '[a-zA-Z]+', '[a-zA-Z0-9]+', '.*');
@@ -245,20 +245,20 @@ 
 					array_shift($args);
 					//check if this contains an module
 					$moduleControllerMethod = explode('#', $this->callback[$index]);
-					if(is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2){
-						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
+					if (is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2) {
+						$this->logger->info('The current request use the module [' . $moduleControllerMethod[0] . ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
 					}
-					else{
+					else {
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
-					if(is_array($moduleControllerMethod)){
-						if(isset($moduleControllerMethod[0])){
+					if (is_array($moduleControllerMethod)) {
+						if (isset($moduleControllerMethod[0])) {
 							$this->controller = $moduleControllerMethod[0];	
 						}
-						if(isset($moduleControllerMethod[1])){
+						if (isset($moduleControllerMethod[1])) {
 							$this->method = $moduleControllerMethod[1];
 						}
 						$this->args = $args;
@@ -268,73 +268,73 @@ 
 				}
 			}
 			//first if the controller is not set and the module is set use the module name as the controller
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After loop in predefined routes configuration, the module name is set but the controller is not set, so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//if can not determine the module/controller/method via the defined routes configuration we will use
 			//the URL like http://domain.com/module/controller/method/arg1/arg2
-			if(! $this->getController()){
+			if (!$this->getController()) {
 				$this->logger->info('Cannot determine the routing information using the predefined routes configuration, will use the request URI parameters');
 				$nbSegment = count($segment);
 				//if segment is null so means no need to perform
-				if($nbSegment > 0){
+				if ($nbSegment > 0) {
 					//get the module list
 					$modules = Module::getModuleList();
 					//first check if no module
-					if(! $modules){
+					if (!$modules) {
 						$this->logger->info('No module was loaded will skip the module checking');
 						//the application don't use module
 						//controller
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->controller = $segment[0];
 							array_shift($segment);
 						}
 						//method
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->method = $segment[0];
 							array_shift($segment);
 						}
 						//args
 						$this->args = $segment;
 					}
-					else{
+					else {
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
-						if(in_array($segment[0], $modules)){
+						if (in_array($segment[0], $modules)) {
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
 							$this->module = $segment[0];
 							array_shift($segment);
 							//check if the second arg is the controller from module
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								//check if the request use the same module name and controller
 								$path = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-								if(! $path){
+								if (!$path) {
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
 								}
-								else{
+								else {
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
 							}
 							//check for method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
 							//the remaining is for args
 							$this->args = $segment;
 						}
-						else{
+						else {
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								array_shift($segment);
 							}
 							//method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
@@ -344,18 +344,18 @@ 
 					}
 				}
 			}
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After using the request URI the module name is set but the controller is not set so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//did we set the controller, so set the controller path
-			if($this->getController() && ! $this->getControllerPath()){
+			if ($this->getController() && !$this->getControllerPath()) {
 				$this->logger->debug('Setting the file path for the controller [' . $this->getController() . ']');
 				//if it is the module controller
-				if($this->getModule()){
+				if ($this->getModule()) {
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
 				}
-				else{
+				else {
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -365,20 +365,20 @@ 
 			$this->logger->debug('Loading controller [' . $controller . '], the file path is [' . $classFilePath . ']...');
 			$benchmark->mark('ROUTING_PROCESS_END');
 			$e404 = false;
-			if(file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(! class_exists($controller, false)){
+				if (!class_exists($controller, false)) {
 					$e404 = true;
-					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
+					$this->logger->info('The controller file [' . $classFilePath . '] exists but does not contain the class [' . $controller . ']');
 				}
-				else{
+				else {
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
-					if(! method_exists($controllerInstance, $controllerMethod)){
+					if (!method_exists($controllerInstance, $controllerMethod)) {
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
 					}
-					else{
+					else {
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -388,12 +388,12 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}
-			if($e404){
-				$response =& class_loader('Response', 'classes');
+			if ($e404) {
+				$response = & class_loader('Response', 'classes');
 				$response->send404();
 			}
 		}

Braces +12 added lines, -24 removed lines

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

core/classes/Lang.php

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 			if($cookieLang && $this->isValid($cookieLang)){
 				$this->current = $cookieLang;
 				$this->logger->info('Language from cookie [' .$cfgKey. '] is valid so we will set the language using the cookie value [' .$cookieLang. ']');
-			}
-			else{
+			} else{
 				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
 				$this->current = $this->getDefault();
 			}
@@ -171,8 +170,7 @@ 
 			}
 			if($this->isValid($name)){
 				$this->availables[$name] = $description;
-			}
-			else{
+			} else{
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 * For application languages management
@@ -68,8 +68,8 @@ 
 		 * Construct new Lang instance
 		 */
 		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Lang');
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
 			$this->logger->debug('Setting the supported languages');

Spacing +26 added lines, -26 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * For application languages management
 	 */
-	class Lang{
+	class Lang {
 		
 		/**
 		 * The supported available language for this application.
@@ -67,8 +67,8 @@ 
 		/**
 		 * Construct new Lang instance
 		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+	        $this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
@@ -76,8 +76,8 @@ 
 			
 			//add the supported languages ('key', 'display name')
 			$languages = get_config('languages', null);
-			if(! empty($languages)){
-				foreach($languages as $key => $displayName){
+			if (!empty($languages)) {
+				foreach ($languages as $key => $displayName) {
 					$this->addLang($key, $displayName);
 				}
 			}
@@ -85,15 +85,15 @@ 
 
 			//if the language exists in cookie use it
 			$cfgKey = get_config('language_cookie_name');
-			$this->logger->debug('Getting current language from cookie [' .$cfgKey. ']');
+			$this->logger->debug('Getting current language from cookie [' . $cfgKey . ']');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang && $this->isValid($cookieLang)){
+			if ($cookieLang && $this->isValid($cookieLang)) {
 				$this->current = $cookieLang;
-				$this->logger->info('Language from cookie [' .$cfgKey. '] is valid so we will set the language using the cookie value [' .$cookieLang. ']');
+				$this->logger->info('Language from cookie [' . $cfgKey . '] is valid so we will set the language using the cookie value [' . $cookieLang . ']');
 			}
-			else{
-				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
+			else {
+				$this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']');
 				$this->current = $this->getDefault();
 			}
 		}
@@ -103,7 +103,7 @@ 
 		 *
 		 * @return array the language message list
 		 */
-		public function getAll(){
+		public function getAll() {
 			return $this->languages;
 		}
 
@@ -113,7 +113,7 @@ 
 		 * @param string $key the language key to identify
 		 * @param string $value the language message value
 		 */
-		public function set($key, $value){
+		public function set($key, $value) {
 			$this->languages[$key] = $value;
 		}
 
@@ -125,11 +125,11 @@ 
 		 *
 		 * @return string the language message value
 		 */
-		public function get($key, $default = 'LANGUAGE_ERROR'){
-			if(isset($this->languages[$key])){
+		public function get($key, $default = 'LANGUAGE_ERROR') {
+			if (isset($this->languages[$key])) {
 				return $this->languages[$key];
 			}
-			$this->logger->warning('Language key  [' .$key. '] does not exist use the default value [' .$default. ']');
+			$this->logger->warning('Language key  [' . $key . '] does not exist use the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -140,10 +140,10 @@ 
 		 *
 		 * @return boolean true if the language directory exists, false or not
 		 */
-		public function isValid($language){
+		public function isValid($language) {
 			$searchDir = array(CORE_LANG_PATH, APP_LANG_PATH);
-			foreach($searchDir as $dir){
-				if(file_exists($dir . $language) && is_dir($dir . $language)){
+			foreach ($searchDir as $dir) {
+				if (file_exists($dir . $language) && is_dir($dir . $language)) {
 					return true;
 				}
 			}
@@ -155,7 +155,7 @@ 
 		 *
 		 * @return string the default language
 		 */
-		public function getDefault(){
+		public function getDefault() {
 			return $this->default;
 		}
 
@@ -164,7 +164,7 @@ 
 		 *
 		 * @return string the current language
 		 */
-		public function getCurrent(){
+		public function getCurrent() {
 			return $this->current;
 		}
 
@@ -174,14 +174,14 @@ 
 		 * @param string $name the short language name like "en", "fr".
 		 * @param string $description the human readable description of this language
 		 */
-		public function addLang($name, $description){
-			if(isset($this->availables[$name])){
+		public function addLang($name, $description) {
+			if (isset($this->availables[$name])) {
 				return; //already added cost in performance
 			}
-			if($this->isValid($name)){
+			if ($this->isValid($name)) {
 				$this->availables[$name] = $description;
 			}
-			else{
+			else {
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}
@@ -191,7 +191,7 @@ 
 		 *
 		 * @return array the list of the application language
 		 */
-		public function getSupported(){
+		public function getSupported() {
 			return $this->availables;
 		}
 
@@ -200,7 +200,7 @@ 
 		 *
 		 * @param array $langs the languages array of the messages to be added
 		 */
-		public function addLangMessages(array $langs){
+		public function addLangMessages(array $langs) {
 			foreach ($langs as $key => $value) {
 				$this->set($key, $value);
 			}

core/classes/Security.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Security{
 		

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
 			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. ']');
@@ -87,8 +86,7 @@ 
 			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
@@ -97,8 +95,7 @@ 
 				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{
+				} else{
 					$logger->info('The CSRF data [' .$token. '] is valide the form data is safe continue');
 					//remove the token from session
 					Session::clear($key);
@@ -127,8 +124,7 @@ 
 						$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*")
@@ -153,8 +149,7 @@ 
 						show_error('Access to this application is not allowed');
 					}
 				}
-			}
-			else{
+			} else{
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }

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/EventDispatcher.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 * This class represent the event dispatcher management, permit to record the listener and 

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;
 			}
 		}

Braces +8 added lines, -16 removed lines

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

core/classes/Loader.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	class Loader{
 		
 		/**

Braces +17 added lines, -34 removed lines

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

Spacing +107 added lines, -107 removed lines

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

core/classes/Request.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Request{
 		

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 			$this->header = array();
 			if(function_exists('apache_request_headers')){
 				$this->header = apache_request_headers();
-			}
-			else if(function_exists('getallheaders')){
+			} else if(function_exists('getallheaders')){
 				$this->header = getallheaders();
 			}
 		}

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;