tnhfw / tnh-fw

core/libraries/Cookie.php

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
 				$logger->info('Delete cookie item ['.$item.']');
 				unset($_COOKIE[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
 				return false;
 			}

core/libraries/Upload.php

Braces +2 added lines, -4 removed lines

@@ -487,8 +487,7 @@ 
                             }
                             chdir($destination_directory);
                         }
-                    }
-                    else{
+                    } else{
                         $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
                     }
                 }
@@ -640,8 +639,7 @@ 
                     // set original filename if not have a new name
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
-                    }
-                    else{
+                    } else{
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu

core/libraries/FormValidation.php

Braces +4 added lines, -8 removed lines

@@ -223,8 +223,7 @@ 
                     if(! Security::validateCSRF()){
                         show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
                     }
-                }
-                else{
+                } else{
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -234,8 +233,7 @@ 
             foreach ($this->getData() as $inputName => $inputVal) {
     			if(is_array($this->data[$inputName])){
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
-    			}
-    			else{
+    			} else{
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -604,8 +602,7 @@ 
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
-            } 
-			else if($inputVal == '') {
+            } else if($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -664,8 +661,7 @@ 
                         $this->_setError($inputName, $ruleName . ',post:key', array($this->_getLabel($inputName), $this->_getLabel(str_replace('post:', '', $doNotEqual))));
                         continue;
                     }
-                } 
-				else{
+                } else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;

core/libraries/Html.php

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
-			}
-			else{
+			} else{
 				//no need check for footer
 				$use_footer = false;
 			}

core/libraries/Pagination.php

Braces +13 added lines, -26 removed lines

@@ -41,8 +41,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);
 					}
@@ -50,8 +49,7 @@ 
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
+            } else{
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -83,18 +81,15 @@ 
             $currentUrl = Url::current();
             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 . '=';
                     }
                 }
@@ -113,20 +108,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;
             }
@@ -138,32 +130,27 @@ 
                 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'];
                     }
                 }
                 $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
-            }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            } else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 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'];
                     }
                 }
                 $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
-            }
-            else if($currentPageNumber == $numberOfPage){
+            } else if($currentPageNumber == $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 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'];
                     }
                 }

core/libraries/Browser.php

Braces +5 added lines, -10 removed lines

@@ -921,20 +921,15 @@
                     if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
                         if($aresult[1] == '3.1'){
                             $this->setVersion('7.0');
-                        }
-                        else if($aresult[1] == '4.0'){
+                        } else if($aresult[1] == '4.0'){
                             $this->setVersion('8.0');
-                        }
-                        else if($aresult[1] == '5.0'){
+                        } else if($aresult[1] == '5.0'){
                             $this->setVersion('9.0');
-                        }
-                        else if($aresult[1] == '6.0'){
+                        } else if($aresult[1] == '6.0'){
                             $this->setVersion('10.0');
-                        }
-                        else if($aresult[1] == '7.0'){
+                        } else if($aresult[1] == '7.0'){
                             $this->setVersion('11.0');
-                        }
-                        else if($aresult[1] == '8.0'){
+                        } else if($aresult[1] == '8.0'){
                             $this->setVersion('11.0');
                         }
                     }

core/functions/function_user_agent.php

Braces +4 added lines, -8 removed lines

@@ -55,17 +55,13 @@
 
 			if (isset($_SERVER["HTTP_CLIENT_IP"])) {
 				$ip = $_SERVER["HTTP_CLIENT_IP"];
-			}
-			else if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
+			} else if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
 				$ip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-			} 
-			else if (isset($_SERVER["HTTP_X_FORWARDED"])) {
+			} else if (isset($_SERVER["HTTP_X_FORWARDED"])) {
 				$ip = $_SERVER["HTTP_X_FORWARDED"];
-			} 
-			else if (isset($_SERVER["HTTP_FORWARDED_FOR"])) {
+			} else if (isset($_SERVER["HTTP_FORWARDED_FOR"])) {
 				$ip = $_SERVER["HTTP_FORWARDED_FOR"];
-			} 
-			else if (isset($_SERVER["HTTP_FORWARDED"])) {
+			} else if (isset($_SERVER["HTTP_FORWARDED"])) {
 				$ip = $_SERVER["HTTP_FORWARDED"];
 			} 
 

tests/include/autoloader.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 		if(isset($classesMap[$class])){
 			if(file_exists($classesMap[$class])){
 				include_once $classesMap[$class];
-			}
-			else{
+			} else{
 				echo 'File for class ' . $class . ' not found';
 			}
 		}

tests/include/common.php

Braces +2 added lines, -4 removed lines

@@ -178,15 +178,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;