Ysurac / FlightAirMap

statistics-airline-country.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 require_once('require/class.Language.php');
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Airline by Country");
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 require_once('header.php');
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);

statistics-airline.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Airline");
 require_once('header.php');
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 include('statistics-sub-menu.php'); 

pilot.php

Braces +11 added lines, -4 removed lines

@@ -31,7 +31,9 @@ 
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != "'") $previous = $firstLetter;
+		if ($firstLetter != "'") {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -46,10 +48,15 @@ 
 				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
-			if ($firstLetter != "'") $previous = $firstLetter;
+			if ($firstLetter != "'") {
+				$previous = $firstLetter;
+			}
 			print '<div class="alphabet-item">';
-			if (isset($value['pilot_id']) && $value['pilot_id'] != '') print '<a href="'.$globalURL.'/pilot/'.$value['pilot_id'].'">'.$value['pilot_name'].' ('.$value['pilot_id'].')';
-			else print '<a href="'.$globalURL.'/pilot/'.$value['pilot_name'].'">'.$value['pilot_name'];
+			if (isset($value['pilot_id']) && $value['pilot_id'] != '') {
+				print '<a href="'.$globalURL.'/pilot/'.$value['pilot_id'].'">'.$value['pilot_name'].' ('.$value['pilot_id'].')';
+			} else {
+				print '<a href="'.$globalURL.'/pilot/'.$value['pilot_name'].'">'.$value['pilot_name'];
+			}
 			print '</a>';
 			print '</div>';
 		}

owner-detailed.php

Braces +6 added lines, -2 removed lines

@@ -53,8 +53,12 @@
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']);
 		//$ident = $spotter_array[0]['ident'];
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
+		if (isset($spotter_array[0]['latitude'])) {
+			$latitude = $spotter_array[0]['latitude'];
+		}
+		if (isset($spotter_array[0]['longitude'])) {
+			$longitude = $spotter_array[0]['longitude'];
+		}
 		require_once('header.php');
 		/*
 		if (isset($globalArchive) && $globalArchive) {

owner.php

Braces +6 added lines, -2 removed lines

@@ -33,7 +33,9 @@ 
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != "'" && $firstLetter != '"') $previous = $firstLetter;
+		if ($firstLetter != "'" && $firstLetter != '"') {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -48,7 +50,9 @@ 
 				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
-			if ($firstLetter != "'" && $firstLetter != '"') $previous = $firstLetter;
+			if ($firstLetter != "'" && $firstLetter != '"') {
+				$previous = $firstLetter;
+			}
 			print '<div class="alphabet-item">';
 			print '<a href="'.$globalURL.'/owner/'.$value['owner_name'].'">';
 			print $value['owner_name'];

require/class.Common.php

Braces +60 added lines, -25 removed lines

@@ -27,8 +27,11 @@ 
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -74,8 +77,9 @@ 
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		//global $cookies;
 		$cookies = array();
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 
@@ -86,11 +90,15 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
-		if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch);
+		if (curl_errno($ch) && $globalDebug) {
+			echo 'Download error: '.curl_error($ch);
+		}
 		curl_close($ch);
 		fclose($fp);
 	}
@@ -101,10 +109,16 @@ 
 	* @return Array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -139,7 +153,9 @@ 
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -160,7 +176,9 @@ 
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -184,10 +202,16 @@ 
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -247,7 +271,9 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -275,8 +301,11 @@ 
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -312,7 +341,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -379,8 +410,9 @@ 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
 			if ($fp_in = fopen($source,'rb')) { 
-				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+				while (!feof($fp_in)) {
+									gzwrite($fp_out, fread($fp_in, 1024 * 512));
+				}
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -389,14 +421,17 @@ 
 		} else {
 			$error = true; 
 		}
-		if ($error)
-			return false; 
-		else
-			return $dest; 
+		if ($error) {
+					return false;
+		} else {
+					return $dest;
+		}
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+		}
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',

require/class.Connection.php

Braces +77 added lines, -30 removed lines

@@ -64,8 +64,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $globalDBuser;
 				$globalDBSpass = $globalDBpass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			} else {
 				$DBname = 'default';
 				$globalDBSdriver = $globalDBdriver;
@@ -73,8 +76,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $user;
 				$globalDBSpass = $pass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			}
 		} else {
 			$globalDBSdriver = $globalDB[$DBname]['driver'];
@@ -82,11 +88,16 @@ 
 			$globalDBSname = $globalDB[$DBname]['name'];
 			$globalDBSuser = $globalDB[$DBname]['user'];
 			$globalDBSpass = $globalDB[$DBname]['pass'];
-			if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
-			else $globalDBSport = 3306;
+			if (isset($globalDB[$DBname]['port'])) {
+				$globalDBSport = $globalDB[$DBname]['port'];
+			} else {
+				$globalDBSport = 3306;
+			}
 		}
 		// Set number of try to connect to DB
-		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5;
+		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) {
+			$globalDBretry = 5;
+		}
 		$i = 0;
 		while (true) {
 			try {
@@ -95,10 +106,16 @@ 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -112,23 +129,35 @@ 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
 			} catch(PDOException $e) {
 				$i++;
-				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				if (isset($globalDebug) && $globalDebug) {
+					echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				}
 				//exit;
-				if ($i > $globalDBretry) return false;
+				if ($i > $globalDBretry) {
+					return false;
+				}
 				//return false;
 			}
 		}
-		if ($DBname === 'default') $this->db = $this->dbs['default'];
+		if ($DBname === 'default') {
+			$this->db = $this->dbs['default'];
+		}
 		return true;
 	}
 
@@ -140,7 +169,9 @@ 
 		} else {
 			$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
 		}
-		if ($this->db == NULL) return false;
+		if ($this->db == NULL) {
+			return false;
+		}
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
@@ -149,21 +180,28 @@ 
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	public function connectionExists()
 	{
 		global $globalDBdriver, $globalDBCheckConnection;
-		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
+		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
+			return true;
+		}
 		$query = "SELECT 1 + 1";
-		if ($this->db === null) return false;
+		if ($this->db === null) {
+			return false;
+		}
 		try {
 			$sum = @$this->db->query($query);
 			if ($sum instanceof \PDOStatement) {
 				$sum = $sum->fetchColumn(0);
-			} else $sum = 0;
+			} else {
+				$sum = 0;
+			}
 			if (intval($sum) !== 2) {
 			     return false;
 			}
@@ -198,8 +236,9 @@ 
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
 		if($nb[0]['nb'] > 0) {
 			return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/*
@@ -243,9 +282,12 @@ 
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
-			if ($result['nb'] > 0) return true;
-			else return false;
-/*		} else {
+			if ($result['nb'] > 0) {
+				return true;
+			} else {
+				return false;
+			}
+			/*		} else {
 			$query = "SELECT * FROM ".$table." LIMIT 0";
 			try {
 				$results = $this->db->query($query);
@@ -284,7 +326,9 @@ 
 				$sth->closeCursor();
 				return $result['value'];
 			}
-		} else return $version;
+		} else {
+			return $version;
+		}
 	}
 	
 	/*
@@ -292,8 +336,11 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+	    if ($this->check_schema_version() == $this->latest_schema) {
+	    	return true;
+	    } else {
+	    	return false;
+	    }
 	}
 
 }

statistics-fatalities-month.php

Braces +5 added lines, -2 removed lines

@@ -71,8 +71,11 @@
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
 		print '<td>';
-		if ($date_item['month'] < 10) $month = '0'.$date_item['month'];
-		else $month = $date_item['month'];
+		if ($date_item['month'] < 10) {
+			$month = '0'.$date_item['month'];
+		} else {
+			$month = $date_item['month'];
+		}
 		print '<a href="'.$globalURL.'/accident/'.$date_item['year'].'-'.$month.'">'.date('F, Y',strtotime($date_item['year'].'-'.$date_item['month'].'-01')).'</a>';
 		print '</td>';
 		print '<td>';

statistics-registration.php

Braces +7 added lines, -3 removed lines

@@ -5,11 +5,15 @@
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Aircraft Registrations");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/');
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);