tnhfw / tnh-fw

index.php

Braces +1 added lines, -2 removed lines

@@ -249,8 +249,7 @@
 			ini_set('display_errors', 0);
 			if (version_compare(PHP_VERSION, '5.3', '>=')) {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-			}
-			else {
+			} else {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 			}
 		break;

core/classes/cache/ApcCache.php

Braces +5 added lines, -10 removed lines

@@ -47,8 +47,7 @@ 
             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){
@@ -74,8 +73,7 @@ 
             if($result === false){
                 $this->logger->error('Can not write cache data for the key ['. $key .'], return false');
                 return false;
-            }
-            else{
+            } else{
                 $this->logger->info('Cache data saved for the key ['. $key .']');
                 return true;
             }
@@ -94,8 +92,7 @@ 
             if($cacheInfo === false){
                 $this->logger->info('This cache data does not exists skipping');
                 return false;
-            }
-            else{
+            } else{
                 $this->logger->info('Found cache data for the key [' .$key. '] remove it');
                     return apc_delete($key) === true;
             }
@@ -119,8 +116,7 @@ 
                             'ttl' => $cacheInfos['ttl']
                             );
                 return $data;
-            }
-            else{
+            } else{
                 $this->logger->info('This cache does not exists skipping');
                 return false;
             }
@@ -144,8 +140,7 @@ 
             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');
             }

core/classes/cache/FileCache.php

Braces +8 added lines, -16 removed lines

@@ -82,8 +82,7 @@ 
                 // Unlinking when the file was expired
                 unlink($filePath);
                 return false;
-                }
-                else{
+                } 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'];
                 }
@@ -120,8 +119,7 @@ 
                 $this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
                 fclose($handle);
                 return false;
-            }
-            else{
+            } else{
                 $this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
                 fclose($handle);
                 chmod($filePath, 0640);
@@ -143,8 +141,7 @@ 
             if(! file_exists($filePath)){
                 $this->logger->info('This cache file does not exists skipping');
                 return false;
-            }
-            else{
+            } else{
                 $this->logger->info('Found cache file [' .$filePath. '] remove it');
                     unlink($filePath);
                 return true;
@@ -197,8 +194,7 @@ 
             $list = glob(CACHE_PATH . '*.cache');
             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 . ']');
@@ -206,12 +202,10 @@ 
                         $data = @unserialize($this->compressCacheData ? gzinflate($data) : $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');
                         }
                 }
@@ -226,8 +220,7 @@ 
             $list = glob(CACHE_PATH . '*.cache');
             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 . ']');
@@ -254,8 +247,7 @@ 
 				
                 $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;

core/classes/Router.php

Braces +8 added lines, -16 removed lines

@@ -242,8 +242,7 @@ 
             //if the application is running in CLI mode use the first argument
             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');
@@ -339,15 +338,13 @@ 
                 if(! class_exists($controller, false)){
                     $e404 = true;
                     $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)){
                         $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
@@ -355,8 +352,7 @@ 
                         get_instance()->response->renderFinalPage();
                     }
                 }
-            }
-            else{
+            } else{
                 $this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
                 $e404 = true;
             }
@@ -462,8 +458,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]);
                     }
@@ -519,8 +514,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] . ']');
@@ -534,8 +528,7 @@ 
                             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);
                             }
@@ -547,8 +540,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])){

core/classes/model/Model.php

Braces +18 added lines, -36 removed lines

@@ -264,8 +264,7 @@ 
                 $this->trigger('after_create', $insert_id);
                 //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
                 return ! $insert_id ? true : $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -342,8 +341,7 @@ 
                 if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
-            }
-            else if (count($args) == 3) {
+            } else if (count($args) == 3) {
                 if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
@@ -384,8 +382,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
                 $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
                 $result = $this->_database->delete();
@@ -408,8 +405,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
                 $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
                 $result = $this->_database->delete();
@@ -430,8 +426,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
                 $result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
                 $result = $this->_database->delete();
@@ -704,8 +699,7 @@ 
                     if (isset($row->$attr)){
                         unset($row->$attr);
                     }
-                }
-                else
+                } else
                 {
                     if (isset($row[$attr])){
                         unset($row[$attr]);
@@ -846,15 +840,13 @@ 
                 {
                     if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else {
+                    } else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -884,15 +876,13 @@ 
                 {
                     if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else {
+                    } else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -960,14 +950,12 @@ 
                 if (is_array($filter))
                 {
                     $this->getQueryBuilder()->in($field, $filter);
-                }
-                else
+                } else
                 {
                     if (is_int($field))
                     {
                         $this->getQueryBuilder()->where($filter);
-                    }
-                    else
+                    } else
                     {
                         $this->getQueryBuilder()->where($field, $filter);
                     }
@@ -984,33 +972,27 @@ 
             if (count($params) == 1 && is_array($params[0]))
             {
                 $this->_set_where_array($params[0]);
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->getQueryBuilder()->where($params[0]);
-            }
-            else if (count($params) == 2)
+            } else if (count($params) == 2)
             {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }
-            }
-            else if (count($params) == 3)
+            } else if (count($params) == 3)
             {
                 $this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-            }
-            else
+            } else
             {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }

core/libraries/Pagination.php

Braces +10 added lines, -20 removed lines

@@ -48,16 +48,14 @@ 
                 require_once CONFIG_PATH . 'config_pagination.php';
                 if (empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
-                }
-                else{
+                } else{
                     $config = array_merge($config, $overwriteConfig);
                     $this->config = $config;
                     //put it gobally
                     Config::setAll($config);
                     unset($config);
                 }
-            }
-            else {
+            } else {
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -177,11 +175,9 @@ 
             $navbar = null;
             if ($currentPageNumber == 1){
                 $navbar .= $this->buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber);
-            }
-            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            } else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
-            }
-            else if ($currentPageNumber == $numberOfPage){
+            } else if ($currentPageNumber == $numberOfPage){
                 $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
@@ -202,20 +198,17 @@ 
             if ($numberOfLink % 2 == 0) {
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end   = $currentPageNumber + ($numberOfLink / 2);
-            }
-            else {
+            } else {
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end   = $currentPageNumber + floor($numberOfLink / 2);
             }
             if ($start <= 1) {
                 $begin = 1;
                 $end   = $numberOfLink;
-            }
-            else if ($start > 1 && $end < $numberOfPage) {
+            } else if ($start > 1 && $end < $numberOfPage) {
                 $begin = $start;
                 $end = $end;
-            }
-            else {
+            } else {
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end   = $numberOfPage;
             }
@@ -242,8 +235,7 @@ 
             for ($i = $begin; $i <= $end; $i++) {
                 if ($i == $currentPageNumber) {
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                }
-                else {
+                } else {
                     $navbar .= $this->config['digit_open'] 
                             . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                             . $this->config['digit_close'];
@@ -271,8 +263,7 @@ 
             for ($i = $begin; $i <= $end; $i++) {
                 if ($i == $currentPageNumber) {
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                }
-                else {
+                } else {
                     $navbar .= $this->config['digit_open'] 
                                     . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                                     . $this->config['digit_close'];
@@ -300,8 +291,7 @@ 
                     $navbar .= $this->config['active_link_open'] 
                                 . $currentPageNumber 
                                 . $this->config['active_link_close'];
-                }
-                else {
+                } else {
                     $navbar .= $this->config['digit_open'] 
                                 . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                                 . $this->config['digit_close'];

core/common.php

Braces +7 added lines, -14 removed lines

@@ -222,16 +222,14 @@ 
                             );
             if (isset($http_status[$code])){
                 $text = $http_status[$code];
-            }
-            else{
+            } else{
                 show_error('No HTTP status text found for your code please check it.');
             }
         }
 		
         if (strpos(php_sapi_name(), 'cgi') === 0){
             header('Status: ' . $code . ' ' . $text, TRUE);
-        }
-        else{
+        } else{
             $proto = 'HTTP/1.1';
             if(isset($_SERVER['SERVER_PROTOCOL'])){
                 $proto = $_SERVER['SERVER_PROTOCOL'];
@@ -323,8 +321,7 @@ 
     function php_exception_handler($ex){
         if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
             show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
-        }
-        else{
+        } else{
             save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
         }
         return true;
@@ -440,15 +437,13 @@ 
     function clean_input($str){
         if (is_array($str)){
             $str = array_map('clean_input', $str);
-        }
-        else if (is_object($str)){
+        } else if (is_object($str)){
             $obj = $str;
             foreach ($str as $var => $value) {
                 $obj->$var = clean_input($value);
             }
             $str = $obj;
-        }
-        else{
+        } else{
             $str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
         }
         return $str;
@@ -521,8 +516,7 @@ 
                     session_save_path($sessionSavePath);
                     $logger->info('Session save path: ' . $sessionSavePath);
                 }
-            }
-            else if ($sessionHandler == 'database'){
+            } else if ($sessionHandler == 'database'){
                 //load database session handle library
                 //Database Session handler Model
                 require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
@@ -530,8 +524,7 @@ 
                 $DBS =& class_loader('DBSessionHandler', 'classes');
                 session_set_save_handler($DBS, true);
                 $logger->info('session save path: ' . get_config('session_save_path'));
-            }
-            else{
+            } else{
                 show_error('Invalid session handler configuration');
             }
             $lifetime = get_config('session_cookie_lifetime', 0);