tnhfw / tnh-fw

core/classes/Response.php

Braces +6 added lines, -12 removed lines

@@ -158,8 +158,7 @@ 
 			if(! headers_sent()){
 				header('Location: '.$url);
 				exit;
-			}
-			else{
+			} else{
 				echo '<script>
 						location.href = "'.$url.'";
 					</script>';
@@ -208,12 +207,10 @@ 
 					if($moduleViewPath){
 						$path = $moduleViewPath;
 						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
-					}
-					else{
+					} else{
 						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
 					}
-				}
-				else{
+				} else{
 					$logger->info('The current request does not use module using the default location.');
 				}
 			}
@@ -358,8 +355,7 @@ 
 					echo $content;
 					ob_end_flush();
 					return;
-				}
-				else{
+				} else{
 					$logger->info('The page cache content for the URL [' . $url . '] is not valid may be already expired');
 					$cache->delete($pageCacheKey);
 				}
@@ -407,8 +403,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(404);
 				echo $output;
-			}
-			else{
+			} else{
 				show_error('The 404 view [' .$path. '] does not exist');
 			}
 		}
@@ -431,8 +426,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(503);
 				echo $output;
-			}
-			else{
+			} else{
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';

core/libraries/Pagination.php

Braces +12 added lines, -24 removed lines

@@ -48,8 +48,7 @@ 
                 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{
 					if (! empty($overwriteConfig)){
 						$config = array_merge($config, $overwriteConfig);
 					}
@@ -58,8 +57,7 @@ 
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
+            } else{
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -119,18 +117,15 @@ 
             $query = '';
              if ($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
-            }
-            else{
+            } else{
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
                 if ($nb == 1){
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
-                }
-                else{
+                } else{
                     if ($tab[0] == ''){
                         $query = '?' . $pageQueryName . '=';
-                    }
-                    else{
+                    } else{
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -175,20 +170,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;
             }
@@ -204,8 +196,7 @@ 
             ///////////
             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'];
@@ -225,8 +216,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'];
                 }
             }
@@ -248,8 +238,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 +260,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'];
                 }
             }