tnhfw / tnh-fw

core/classes/Request.php

Spacing +4 added lines, -4 removed lines

@@ -90,20 +90,20 @@
 		/**
 		 * 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();
 			}
 		}

core/classes/BaseClass.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
 
-    class BaseClass{
+    class BaseClass {
         /**
          * The logger instance
          * @var object
@@ -34,7 +34,7 @@ 
         /**
          * Class constructor
          */
-        public function __construct(){
+        public function __construct() {
             //Set Log instance to use
                 $this->setLoggerFromParamOrCreate(null);
         }
@@ -49,12 +49,12 @@ 
          *
          * @return object this current instance
          */
-        protected function setDependencyInstanceFromParamOrCreate($name, $instance = null, $loadClassName = null, $loadClassePath = 'classes'){
-            if ($instance !== null){
+        protected function setDependencyInstanceFromParamOrCreate($name, $instance = null, $loadClassName = null, $loadClassePath = 'classes') {
+            if ($instance !== null) {
             $this->{$name} = $instance;
             return $this;
             }
-            $this->{$name} =& class_loader($loadClassName, $loadClassePath);
+            $this->{$name} = & class_loader($loadClassName, $loadClassePath);
             return $this;
         }
 
@@ -62,7 +62,7 @@ 
          * Return the Log instance
          * @return object
          */
-        public function getLogger(){
+        public function getLogger() {
             return $this->logger;
         }
 
@@ -71,7 +71,7 @@ 
          * @param object $logger the log object
          * @return object Database
          */
-        public function setLogger($logger){
+        public function setLogger($logger) {
             $this->logger = $logger;
             return $this;
         }
@@ -82,9 +82,9 @@ 
          *
          * @return object this current instance
          */
-        protected function setLoggerFromParamOrCreate(Log $logger = null){
+        protected function setLoggerFromParamOrCreate(Log $logger = null) {
             $this->setDependencyInstanceFromParamOrCreate('logger', $logger, 'Log', 'classes');
-            if ($logger === null){
+            if ($logger === null) {
             $this->logger->setLogger('Class::' . get_class($this));
             }
             return $this;

core/classes/cache/ApcCache.php

Spacing +34 added lines, -34 removed lines

@@ -24,13 +24,13 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
 	
-    class ApcCache extends BaseClass implements CacheInterface{
+    class ApcCache extends BaseClass implements CacheInterface {
 
 		
 		
-        public function __construct(){
+        public function __construct() {
             parent::__construct();
-            if(! $this->isSupported()){
+            if (!$this->isSupported()) {
                 show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
             }
         }
@@ -40,21 +40,21 @@ 
          * @param  string $key the key to identify the cache data
          * @return mixed      the cache data if exists else return false
          */
-        public function get($key){
-            $this->logger->debug('Getting cache data for key ['. $key .']');
+        public function get($key) {
+            $this->logger->debug('Getting cache data for key [' . $key . ']');
             $success = false;
             $data = apc_fetch($key, $success);
-            if($success === false){
-                $this->logger->info('No cache found for the key ['. $key .'], return false');
+            if ($success === false) {
+                $this->logger->info('No cache found for the key [' . $key . '], return false');
                 return false;
             }
-            else{
+            else {
                 $cacheInfo = $this->_getCacheInfo($key);
                 $expire = time();
-                if($cacheInfo){
+                if ($cacheInfo) {
                     $expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
                 }
-                $this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+                $this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
                 return $data;
             }
         }
@@ -67,16 +67,16 @@ 
          * @param integer $ttl  the cache life time
          * @return boolean true if success otherwise will return false
          */
-        public function set($key, $data, $ttl = 0){
+        public function set($key, $data, $ttl = 0) {
             $expire = time() + $ttl;
-            $this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+            $this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
             $result = apc_store($key, $data, $ttl);
-            if($result === false){
-                $this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+            if ($result === false) {
+                $this->logger->error('Can not write cache data for the key [' . $key . '], return false');
                 return false;
             }
-            else{
-                $this->logger->info('Cache data saved for the key ['. $key .']');
+            else {
+                $this->logger->info('Cache data saved for the key [' . $key . ']');
                 return true;
             }
         }
@@ -88,15 +88,15 @@ 
          * @return boolean      true if the cache is deleted, false if can't delete 
          * the cache or the cache with the given key not exist
          */
-        public function delete($key){
-            $this->logger->debug('Deleting of cache data for key [' .$key. ']');
+        public function delete($key) {
+            $this->logger->debug('Deleting of cache data for key [' . $key . ']');
             $cacheInfo = $this->_getCacheInfo($key);
-            if($cacheInfo === false){
+            if ($cacheInfo === false) {
                 $this->logger->info('This cache data does not exists skipping');
                 return false;
             }
-            else{
-                $this->logger->info('Found cache data for the key [' .$key. '] remove it');
+            else {
+                $this->logger->info('Found cache data for the key [' . $key . '] remove it');
                     return apc_delete($key) === true;
             }
         }
@@ -109,10 +109,10 @@ 
          * 'expire' => expiration time of the cache (Unix timestamp),
          * 'ttl' => the time to live of the cache in second
          */
-        public function getInfo($key){
-            $this->logger->debug('Getting of cache info for key [' .$key. ']');
+        public function getInfo($key) {
+            $this->logger->debug('Getting of cache info for key [' . $key . ']');
             $cacheInfos = $this->_getCacheInfo($key);
-            if($cacheInfos){
+            if ($cacheInfos) {
                 $data = array(
                             'mtime' => $cacheInfos['creation_time'],
                             'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -120,7 +120,7 @@ 
                             );
                 return $data;
             }
-            else{
+            else {
                 $this->logger->info('This cache does not exists skipping');
                 return false;
             }
@@ -130,7 +130,7 @@ 
         /**
          * Used to delete expired cache data
          */
-        public function deleteExpiredCache(){
+        public function deleteExpiredCache() {
             //for APC[u] is done automatically
             return true;
         }
@@ -138,14 +138,14 @@ 
         /**
          * Remove all cache data
          */
-        public function clean(){
+        public function clean() {
             $this->logger->debug('Deleting of all cache data');
             $cacheInfos = apc_cache_info('user');
-            if(empty($cacheInfos['cache_list'])){
+            if (empty($cacheInfos['cache_list'])) {
                 $this->logger->info('No cache data were found skipping');
                 return false;
             }
-            else{
+            else {
                 $this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
                 return apc_clear_cache('user');
             }
@@ -157,7 +157,7 @@ 
          *
          * @return bool
          */
-        public function isSupported(){
+        public function isSupported() {
             return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
         }
 		
@@ -167,12 +167,12 @@ 
          * @param string $key the cache key to get the cache information 
          * @return boolean|array
          */
-        private function _getCacheInfo($key){
+        private function _getCacheInfo($key) {
             $caches = apc_cache_info('user');
-            if(! empty($caches['cache_list'])){
+            if (!empty($caches['cache_list'])) {
                 $cacheLists = $caches['cache_list'];
-                foreach ($cacheLists as $c){
-                    if(isset($c['info']) && $c['info'] === $key){
+                foreach ($cacheLists as $c) {
+                    if (isset($c['info']) && $c['info'] === $key) {
                         return $c;
                     }
                 }

core/classes/cache/FileCache.php

Spacing +54 added lines, -54 removed lines

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

core/classes/Router.php

Spacing +71 added lines, -71 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
 
-    class Router extends BaseClass{
+    class Router extends BaseClass {
         /**
          * @var array $pattern: The list of URIs to validate against
          */
@@ -90,13 +90,13 @@ 
         /**
          * Construct the new Router instance
          */
-        public function __construct(){
+        public function __construct() {
             parent::__construct();
 			
             //loading routes for module
             $moduleRouteList = array();
             $modulesRoutes = Module::getModulesRoutesConfig();
-            if($modulesRoutes && is_array($modulesRoutes)){
+            if ($modulesRoutes && is_array($modulesRoutes)) {
                 $moduleRouteList = $modulesRoutes;
                 unset($modulesRoutes);
             }
@@ -111,7 +111,7 @@ 
          * Get the route patterns
          * @return array
          */
-        public function getPattern(){
+        public function getPattern() {
             return $this->pattern;
         }
 
@@ -119,7 +119,7 @@ 
          * Get the route callbacks
          * @return array
          */
-        public function getCallback(){
+        public function getCallback() {
             return $this->callback;
         }
 
@@ -127,7 +127,7 @@ 
          * Get the module name
          * @return string
          */
-        public function getModule(){
+        public function getModule() {
             return $this->module;
         }
 		
@@ -135,7 +135,7 @@ 
          * Get the controller name
          * @return string
          */
-        public function getController(){
+        public function getController() {
             return $this->controller;
         }
 
@@ -143,7 +143,7 @@ 
          * Get the controller file path
          * @return string
          */
-        public function getControllerPath(){
+        public function getControllerPath() {
             return $this->controllerPath;
         }
 
@@ -151,7 +151,7 @@ 
          * Get the controller method
          * @return string
          */
-        public function getMethod(){
+        public function getMethod() {
             return $this->method;
         }
 
@@ -159,7 +159,7 @@ 
          * Get the request arguments
          * @return array
          */
-        public function getArgs(){
+        public function getArgs() {
             return $this->args;
         }
 
@@ -167,7 +167,7 @@ 
          * Get the URL segments array
          * @return array
          */
-        public function getSegments(){
+        public function getSegments() {
             return $this->segments;
         }
 
@@ -175,7 +175,7 @@ 
          * Get the route URI
          * @return string
          */
-        public function getRouteUri(){
+        public function getRouteUri() {
             return $this->uri;
         }
 
@@ -189,7 +189,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;
@@ -205,8 +205,8 @@ 
          * @return object the current instance
          */
         public function removeRoute($uri) {
-            $index  = array_search($uri, $this->pattern, true);
-            if($index !== false){
+            $index = array_search($uri, $this->pattern, true);
+            if ($index !== false) {
                 $this->logger->info('Remove route for uri [' . $uri . '] from the configuration');
                 unset($this->pattern[$index]);
                 unset($this->callback[$index]);
@@ -234,26 +234,26 @@ 
          * @param string $uri the route URI, if is empty will determine automatically
          * @return object
          */
-        public function setRouteUri($uri = ''){
+        public function setRouteUri($uri = '') {
             $routeUri = '';
-            if(! empty($uri)){
+            if (!empty($uri)) {
                 $routeUri = $uri;
             }
             //if the application is running in CLI mode use the first argument
-            else if(IS_CLI && isset($_SERVER['argv'][1])){
+            else if (IS_CLI && isset($_SERVER['argv'][1])) {
                 $routeUri = $_SERVER['argv'][1];
             }
-            else if(isset($_SERVER['REQUEST_URI'])){
+            else if (isset($_SERVER['REQUEST_URI'])) {
                 $routeUri = $_SERVER['REQUEST_URI'];
             }
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
             $suffix = get_config('url_suffix');
             if ($suffix) {
-                $this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
+                $this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']');
                 $routeUri = str_ireplace($suffix, '', $routeUri);
             } 
-            if (strpos($routeUri, '?') !== false){
+            if (strpos($routeUri, '?') !== false) {
                 $routeUri = substr($routeUri, 0, strpos($routeUri, '?'));
             }
             $this->uri = trim($routeUri, $this->uriTrim);
@@ -266,8 +266,8 @@ 
              * 
              * @return object
              */
-        public function setRouteSegments(array $segments = array()){
-            if(! empty($segments)){
+        public function setRouteSegments(array $segments = array()) {
+            if (!empty($segments)) {
                 $this->segments = $segments;
             } else if (!empty($this->uri)) {
                 $this->segments = explode('/', $this->uri);
@@ -275,12 +275,12 @@ 
             $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;
@@ -300,7 +300,7 @@ 
 			
             //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->controller){
+            if (!$this->controller) {
                 $this->logger->info('Cannot determine the routing information using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the REQUEST_URI param
                 $this->determineRouteParamsFromRequestUri();
@@ -316,14 +316,14 @@ 
              * Routing the request to the correspondant module/controller/method if exists
              * otherwise send 404 error.
              */
-        public function processRequest(){
+        public function processRequest() {
             //Setting the route URI
             $this->setRouteUri();
 
             //setting route segments
             $this->setRouteSegments();
 
-            $this->logger->info('The final Request URI is [' . implode('/', $this->segments) . ']' );
+            $this->logger->info('The final Request URI is [' . implode('/', $this->segments) . ']');
 
             //determine the route parameters information
             $this->determineRouteParamsInformation();
@@ -334,20 +334,20 @@ 
             $this->logger->info('The routing information are: module [' . $this->module . '], controller [' . $controller . '], method [' . $this->method . '], args [' . stringfy_vars($this->args) . ']');
             $this->logger->debug('Loading controller [' . $controller . '], the file path is [' . $classFilePath . ']...');
 	    	
-            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->warning('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
+                    $this->logger->warning('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->warning('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->args);
                         //render the final page to user
@@ -356,16 +356,16 @@ 
                     }
                 }
             }
-            else{
+            else {
                 $this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
                 $e404 = true;
             }
-            if($e404){
-                if(IS_CLI){
+            if ($e404) {
+                if (IS_CLI) {
                     set_http_status_header(404);
                     echo 'Error 404: page not found.';
                 } else {
-                    $response =& class_loader('Response', 'classes');
+                    $response = & class_loader('Response', 'classes');
                     $response->send404();
                 }
             }
@@ -378,15 +378,15 @@ 
          * @param boolean $useConfigFile whether to use route configuration file
          * @return object
          */
-        public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+        public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
-            if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')){
+            if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
                 require_once CONFIG_PATH . 'routes.php';
             }
             $route = array_merge($route, $overwriteConfig);
             $this->routes = $route;
             //if route is empty remove all configuration
-            if(empty($route)){
+            if (empty($route)) {
                 $this->removeAllRoute();
             }
             return $this;
@@ -396,7 +396,7 @@ 
              * Get the route configuration
              * @return array
              */
-        public function getRouteConfiguration(){
+        public function getRouteConfiguration() {
             return $this->routes;
         }
 
@@ -408,19 +408,19 @@ 
          *
          * @return object the current instance
          */
-        public function setControllerFilePath($path = null){
-            if($path !== null){
+        public function setControllerFilePath($path = null) {
+            if ($path !== null) {
                 $this->controllerPath = $path;
                 return $this;
             }
             //did we set the controller, so set the controller path
-            if($this->controller && ! $this->controllerPath){
+            if ($this->controller && !$this->controllerPath) {
                 $this->logger->debug('Setting the file path for the controller [' . $this->controller . ']');
                 $controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->controller) . '.php';
                 //if the controller is in module
-                if($this->module){
+                if ($this->module) {
                     $path = Module::findControllerFullPath(ucfirst($this->controller), $this->module);
-                    if($path !== false){
+                    if ($path !== false) {
                         $controllerPath = $path;
                     }
                 }
@@ -433,7 +433,7 @@ 
          * Determine the route parameters from route configuration
          * @return void
          */
-        protected function determineRouteParamsFromConfig(){
+        protected function determineRouteParamsFromConfig() {
             $uri = implode('/', $this->segments);
             /*
 	   		* Generics routes patterns
@@ -458,20 +458,20 @@ 
                     array_shift($args);
                     //check if this contains an module
                     $moduleControllerMethod = explode('#', $this->callback[$index]);
-                    if(is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2){
+                    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;
@@ -482,7 +482,7 @@ 
             }
 
             //first if the controller is not set and the module is set use the module name as the controller
-            if(! $this->controller && $this->module){
+            if (!$this->controller && $this->module) {
                 $this->logger->info(
                                     'After loop in predefined routes configuration, 
 									the module name is set but the controller is not set, 
@@ -496,67 +496,67 @@ 
          * Determine the route parameters using the server variable "REQUEST_URI"
          * @return void
          */
-        protected function determineRouteParamsFromRequestUri(){
+        protected function determineRouteParamsFromRequestUri() {
             $segment = $this->segments;
             $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(empty($modules)){
+                if (empty($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->controller), $this->module);
-                            if(! $path){
+                            if (!$path) {
                                 $this->logger->info('The controller [' . $this->controller . '] not found in the module, may be will use the module [' . $this->module . '] as controller');
                                 $this->controller = $this->module;
                             }
-                            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);
                         }
@@ -564,7 +564,7 @@ 
                         $this->args = $segment;
                     }
                 }
-                if(! $this->controller && $this->module){
+                if (!$this->controller && $this->module) {
                     $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->module;
                 }
@@ -576,9 +576,9 @@ 
          *
          * @return object the current instance
          */
-        protected function setRouteConfigurationInfos(){
+        protected function setRouteConfigurationInfos() {
             //adding route
-            foreach($this->routes as $pattern => $callback){
+            foreach ($this->routes as $pattern => $callback) {
                 $this->add($pattern, $callback);
             }
             return $this;

core/classes/EventDispatcher.php

Spacing +35 added lines, -35 removed lines

@@ -47,12 +47,12 @@ 
 		 * @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;
@@ -63,17 +63,17 @@ 
 		 * @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');
 			}
 		}
@@ -83,12 +83,12 @@ 
 		 * 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();
 			}
@@ -108,20 +108,20 @@ 
 		 * @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);
 			}
@@ -132,35 +132,35 @@ 
 		 * @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/Log.php

Spacing +30 added lines, -30 removed lines

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

core/classes/Loader.php

Spacing +53 added lines, -53 removed lines

@@ -74,25 +74,25 @@ 
 			$class  = $moduleInfo['class'];
 			
 			$moduleModelFilePath = Module::findModelFullPath($class, $module);
-			if ($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+			if ($moduleModelFilePath) {
+				$logger->info('Found model [' . $class . '] from module [' . $module . '], the file path is [' . $moduleModelFilePath . '] we will used it');
 				$classFilePath = $moduleModelFilePath;
-			} else{
+			} else {
 				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
 			}
 			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
-			if (file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if (class_exists($class)){
+				if (class_exists($class)) {
 					$c = new $class();
 					$obj = & get_instance();
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				} else{
-					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
+				} else {
+					show_error('The file ' . $classFilePath . ' exists but does not contain the class [' . $class . ']');
 				}
-			} else{
+			} else {
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -131,17 +131,17 @@ 
 			}
 			$libraryFilePath = null;
 			$logger->debug('Check if this is a system library ...');
-			if (file_exists(CORE_LIBRARY_PATH . $file)){
+			if (file_exists(CORE_LIBRARY_PATH . $file)) {
 				$libraryFilePath = CORE_LIBRARY_PATH . $file;
 				$class = ucfirst($class);
 				$logger->info('This library is a system library');
-			} else{
+			} else {
 				$logger->info('This library is not a system library');	
 				//first check if this library is in the module
 				$libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
 				//***************
 			}
-			if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
+			if (!$libraryFilePath && file_exists(LIBRARY_PATH . $file)) {
 				$libraryFilePath = LIBRARY_PATH . $file;
 			}
 			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
@@ -173,21 +173,21 @@ 
 			$moduleInfo = self::getModuleInfoForFunction($function);
 			$module    = $moduleInfo['module'];
 			$function  = $moduleInfo['function'];
-			if(! empty($moduleInfo['file'])){
+			if (!empty($moduleInfo['file'])) {
 				$file = $moduleInfo['file'];
 			}
 			$moduleFunctionPath = Module::findFunctionFullPath($function, $module);
-			if ($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+			if ($moduleFunctionPath) {
+				$logger->info('Found helper [' . $function . '] from module [' . $module . '], the file path is [' . $moduleFunctionPath . '] we will used it');
 				$functionFilePath = $moduleFunctionPath;
-			} else{
+			} else {
 				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
 			}
-			if (! $functionFilePath){
+			if (!$functionFilePath) {
 				$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $file;
-					if (file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$functionFilePath = $filePath;
 						//is already found not to continue
 						break;
@@ -195,11 +195,11 @@ 
 				}
 			}
 			$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 . ']');
 			}
 		}
@@ -229,25 +229,25 @@ 
 			$module    = $moduleInfo['module'];
 			$filename  = $moduleInfo['filename'];
 			$moduleConfigPath = Module::findConfigFullPath($filename, $module);
-			if ($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
+			if ($moduleConfigPath) {
+				$logger->info('Found config [' . $filename . '] from module [' . $module . '], the file path is [' . $moduleConfigPath . '] we will used it');
 				$configFilePath = $moduleConfigPath;
-			} else{
+			} else {
 				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
 			}
 			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
 			$config = array();
-			if (file_exists($configFilePath)){
+			if (file_exists($configFilePath)) {
 				require_once $configFilePath;
-				if (! empty($config) && is_array($config)){
+				if (!empty($config) && is_array($config)) {
 					Config::setAll($config);
 					static::$loaded['config_' . $filename] = $configFilePath;
 					$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
 					$logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
 					unset($config);
 				}
-			} else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
+			} else {
+				show_error('Unable to find config file [' . $configFilePath . ']');
 			}
 		}
 
@@ -278,21 +278,21 @@ 
 			$moduleInfo = self::getModuleInfoForLanguage($language);
 			$module    = $moduleInfo['module'];
 			$language  = $moduleInfo['language'];
-			if(! empty($moduleInfo['file'])){
+			if (!empty($moduleInfo['file'])) {
 				$file = $moduleInfo['file'];
 			}
 			$moduleLanguagePath = Module::findLanguageFullPath($language, $appLang, $module);
-			if ($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+			if ($moduleLanguagePath) {
+				$logger->info('Found language [' . $language . '] from module [' . $module . '], the file path is [' . $moduleLanguagePath . '] we will used it');
 				$languageFilePath = $moduleLanguagePath;
-			} else{
+			} else {
 				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
 			}
-			if (! $languageFilePath){
+			if (!$languageFilePath) {
 				$searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
-				foreach($searchDir as $dir){
+				foreach ($searchDir as $dir) {
 					$filePath = $dir . $appLang . DS . $file;
-					if (file_exists($filePath)){
+					if (file_exists($filePath)) {
 						$languageFilePath = $filePath;
 						//already found no need continue
 						break;
@@ -329,19 +329,19 @@ 
 		 * 	'class' => 'class_name'
 		 * )
 		 */
-		protected static function getModuleInfoForModelLibrary($class){
+		protected static function getModuleInfoForModelLibrary($class) {
 			$module = null;
 			$obj = & get_instance();
-			if (strpos($class, '/') !== false){
+			if (strpos($class, '/') !== false) {
 				$path = explode('/', $class);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
 					$module = $path[0];
 					$class = ucfirst($path[1]);
 				}
-			} else{
+			} else {
 				$class = ucfirst($class);
 			}
-			if (! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -451,15 +451,15 @@ 
 		 * @param  string $class the class name to determine the instance
 		 * @return string        the instance name
 		 */
-		protected static function getModelLibraryInstanceName($class){
+		protected static function getModelLibraryInstanceName($class) {
 			//for module
 			$instance = null;
-			if (strpos($class, '/') !== false){
+			if (strpos($class, '/') !== false) {
 				$path = explode('/', $class);
-				if (isset($path[1])){
+				if (isset($path[1])) {
 					$instance = strtolower($path[1]);
 				}
-			} else{
+			} else {
 				$instance = strtolower($class);
 			}
 			return $instance;
@@ -478,10 +478,10 @@ 
 			$module = $moduleInfo['module'];
 			$class  = $moduleInfo['class'];
 			$moduleLibraryPath = Module::findLibraryFullPath($class, $module);
-			if ($moduleLibraryPath){
-				$logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+			if ($moduleLibraryPath) {
+				$logger->info('Found library [' . $class . '] from module [' . $module . '], the file path is [' . $moduleLibraryPath . '] we will used it');
 				$libraryFilePath = $moduleLibraryPath;
-			} else{
+			} else {
 				$logger->info('Cannot find library [' . $class . '] from modules using the default location');
 			}
 			return $libraryFilePath;
@@ -495,20 +495,20 @@ 
 		 * @param  array  $params          the parameter to use
 		 * @return void
 		 */
-		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
-			if ($libraryFilePath){
+		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()) {
+			if ($libraryFilePath) {
 				$logger = static::getLogger();
 				require_once $libraryFilePath;
-				if (class_exists($class)){
+				if (class_exists($class)) {
 					$c = $params ? new $class($params) : new $class();
 					$obj = & get_instance();
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				} else{
-					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
+				} else {
+					show_error('The file ' . $libraryFilePath . ' exists but does not contain the class ' . $class);
 				}
-			} else{
+			} else {
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -534,7 +534,7 @@ 
 				}
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			} else{
+			} else {
 				show_error('Unable to find language [' . $language . ']');
 			}
 		}

core/classes/Controller.php

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
 
-    class Controller extends BaseClass{
+    class Controller extends BaseClass {
 		
         /**
          * The name of the module if this controller belong to an module
@@ -42,7 +42,7 @@ 
         /**
          * Class constructor
          */
-        public function __construct(){
+        public function __construct() {
             parent::__construct();
 			
             //instance of the super object
@@ -50,8 +50,8 @@ 
 
             //Load the resources loaded during the application bootstrap
             $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);
             }
 			
             //set module using the router
@@ -83,9 +83,9 @@ 
         /**
          * This method is used to set the module name
          */
-        protected function setModuleNameFromRouter(){
+        protected function setModuleNameFromRouter() {
             //set the module using the router instance
-            if(isset($this->router) && $this->router->getModule()){
+            if (isset($this->router) && $this->router->getModule()) {
                 $this->moduleName = $this->router->getModule();
             }
         }
@@ -94,13 +94,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,15 +112,15 @@ 
          * This method is used to load the required resources for framework to work
          * @return void 
          */
-        private function loadRequiredResources(){
+        private function loadRequiredResources() {
             $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');
         }
 
     }