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

core/classes/DBSessionHandler.php

Braces +4 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->setLogger($logger);
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
@@ -197,8 +196,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -237,8 +235,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -264,8 +261,7 @@ 
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
-			}
-			else{
+			} else{
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}

core/classes/cache/ApcCache.php

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,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){
@@ -89,8 +87,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;
 		    }
@@ -109,8 +106,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;
 			}
@@ -134,8 +130,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -159,8 +154,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 +12 added lines, -24 removed lines

@@ -48,8 +48,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
@@ -95,8 +94,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'];
 		     }
@@ -133,8 +131,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);
@@ -156,8 +153,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;
@@ -179,16 +175,14 @@ 
 			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. '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
-				}
-				else{
+				} else{
 					$this->logger->info('This cache data is OK check for expire');
 					if(isset($data['expire']) && $data['expire'] > time()){
 						$this->logger->info('This cache not yet expired return cache informations');
@@ -198,8 +192,7 @@ 
 							'ttl' => $data['ttl']
 							);
 						return $info;
-					}
-					else{
+					} else{
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -216,8 +209,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 . ']');
@@ -225,12 +217,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');
 		      		}
 				}
@@ -245,8 +235,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 . ']');
@@ -273,8 +262,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;