Ysurac / FlightAirMap

require/class.Language.php

Braces +6 added lines, -2 removed lines

@@ -86,7 +86,9 @@ 
 			return $result;
 		}
 		$handle = @opendir(dirname(__FILE__).'/../locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = dirname(__FILE__).'/../locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -113,7 +115,9 @@ 
 		$allAvailableLanguages = array();
 		$currentLocal = setlocale(LC_ALL, 0);
 		foreach ($available as $lang) {
-			if (isset($this->all_languages[$lang]) && (setlocale(LC_ALL,$this->getLocale($lang)) || $lang = 'en_GB')) $allAvailableLanguages[$lang] = $this->all_languages[$lang];
+			if (isset($this->all_languages[$lang]) && (setlocale(LC_ALL,$this->getLocale($lang)) || $lang = 'en_GB')) {
+				$allAvailableLanguages[$lang] = $this->all_languages[$lang];
+			}
 		}
 		setlocale(LC_ALL,$currentLocal);
 		return $allAvailableLanguages;

archive-geojson.php

Braces +229 added lines, -142 removed lines

@@ -25,12 +25,10 @@ 
 if ($tracker) {
 	require_once('require/class.Tracker.php');
 	require_once('require/class.TrackerArchive.php');
-}
-elseif ($marine) {
+} elseif ($marine) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineArchive.php');
-}
-else {
+} else {
 	require_once('require/class.Spotter.php');
 	require_once('require/class.SpotterArchive.php');
 }
@@ -38,12 +36,10 @@ 
 if ($tracker) {
 	$Tracker = new Tracker();
 	$TrackerArchive = new TrackerArchive();
-}
-elseif ($marine) {
+} elseif ($marine) {
 	$Marine = new Marine();
 	$MarineArchive = new MarineArchive();
-}
-else {
+} else {
 	$Spotter = new Spotter();
 	$SpotterArchive = new SpotterArchive();
 }
@@ -56,66 +52,92 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
-} else $min = false;
+} else {
+	$min = false;
+}
 
 if (isset($_GET['ident'])) {
 	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	if ($tracker) {
 		$spotter_array = $TrackerArchive->getLastArchiveTrackerDataByIdent($ident);
-	}
-	elseif ($marine) {
+	} elseif ($marine) {
 		$spotter_array = $MarineArchive->getLastArchiveMarineDataByIdent($ident);
-	}
-	else {
+	} else {
 		$spotter_array = $SpotterArchive->getLastArchiveSpotterDataByIdent($ident);
 	}
 	$allhistory = true;
-}
-elseif (isset($_GET['flightaware_id'])) {
+} elseif (isset($_GET['flightaware_id'])) {
 	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	if ($tracker) {
 		$spotter_array = $TrackerArchive->getLastArchiveTrackerDataById($flightaware_id);
-	}
-	elseif ($marine) {
+	} elseif ($marine) {
 		$spotter_array = $MarineArchive->getLastArchiveMarineDataById($flightaware_id);
-	}
-	else {
+	} else {
 		$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
 	}
 	$allhistory = true;
-}
-elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
+} elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
 	$from_archive = true;
 	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	if (isset($globalAircraftMaxUpdate)) $begindate = $begindate - $globalAircraftMaxUpdate;
-	else $begindate = $begindate - 3000;
+	if (isset($globalAircraftMaxUpdate)) {
+		$begindate = $begindate - $globalAircraftMaxUpdate;
+	} else {
+		$begindate = $begindate - 3000;
+	}
 	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
 	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
 	$part = filter_input(INPUT_GET,'part',FILTER_SANITIZE_NUMBER_INT);
-	if ($part == '') $part = 0;
+	if ($part == '') {
+		$part = 0;
+	}
 	
 	if ($begindate != '' && $enddate != '') {
 		$begindate = date('Y-m-d H:i:s',$begindate);
@@ -123,11 +145,9 @@ 
 		//$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
 		if ($tracker) {
 			$spotter_array = $TrackerArchive->getMinLiveTrackerData($begindate,$enddate,$filter);
-		}
-		elseif ($marine) {
+		} elseif ($marine) {
 			$spotter_array = $MarineArchive->getMinLiveMarineData($begindate,$enddate,$filter);
-		}
-		else {
+		} else {
 			$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter,$part);
 		}
 	}
@@ -136,8 +156,12 @@ 
 if (!empty($spotter_array)) {
 	//$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
 	$flightcnt = 0;
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -147,8 +171,11 @@ 
 $aircrafts_shadow = array();
 $output = '{';
 $output .= '"type": "FeatureCollection",';
-if ($min) $output .= '"minimal": "true",';
-else $output .= '"minimal": "false",';
+if ($min) {
+	$output .= '"minimal": "true",';
+} else {
+	$output .= '"minimal": "false",';
+}
 $output .= '"fc": "'.$flightcnt.'",';
 $output .= '"sqt": "'.$sqltime.'",';
 $begin = true;
@@ -161,15 +188,17 @@ 
 			if ($pfi != $spotter_item['famtrackid']) {
 				$pfi = $spotter_item['famtrackid'];
 				$begin = true;
-			} else $spotter_history_array = 0;
-		}
-		elseif ($marine) {
+			} else {
+				$spotter_history_array = 0;
+			}
+		} elseif ($marine) {
 			if ($pfi != $spotter_item['fammarine_d']) {
 				$pfi = $spotter_item['fammarine_id'];
 				$begin = true;
-			} else $spotter_history_array = 0;
-		}
-		else {
+			} else {
+				$spotter_history_array = 0;
+			}
+		} else {
 			if ($pfi != $spotter_item['flightaware_id']) {
 				$pfi = $spotter_item['flightaware_id'];
 				$begin = true;
@@ -206,7 +235,9 @@ 
 			$output_history .= '['.$spotter_item['longitude'].', '.$spotter_item['latitude'].'],';
 			$output_time .= (strtotime($spotter_item['date'])*1000).',';
 			$previousts = strtotime($spotter_item['date']);
-			if ($k > 1 && (strtotime($spotter_item['date'])*1000 > $enddate)) $end = true;
+			if ($k > 1 && (strtotime($spotter_item['date'])*1000 > $enddate)) {
+				$end = true;
+			}
 		}
 
 		if ($begin) {
@@ -216,7 +247,9 @@ 
 			$output .= '"type": "Feature",';
 			$output .= '"properties": {';
 			$output .= '"fi": "'.$pfi.'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
 				$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
 				//"
@@ -224,14 +257,20 @@ 
 				$output .= '"c": "NA",';
 			}
 			if (!isset($spotter_item['aircraft_shadow']) && !$tracker && !$marine) {
-				if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-				else {
+				if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+					$spotter_item['aircraft_shadow'] = '';
+				} else {
 					$aircraft_icao = $spotter_item['aircraft_icao'];
 					$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-					if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-					elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
-					elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
-					else $spotter_item['aircraft_shadow'] = '';
+					if (count($aircraft_info) > 0) {
+						$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+					} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
+						$spotter_item['aircraft_shadow'] = 'PA18.png';
+					} elseif ($aircraft_icao == 'PARAGLIDER') {
+						$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
+					} else {
+						$spotter_item['aircraft_shadow'] = '';
+					}
 					$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
 				}
 			}
@@ -239,93 +278,139 @@ 
 			if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
 				if ($tracker) {
 					if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
-						if ($compress) $output .= '"as": "ambulance.png",';
-						else $output .= '"aircraft_shadow": "ambulance.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
-						if ($compress) $output .= '"as": "police.png",';
-						else $output .= '"aircraft_shadow": "police.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
-						if ($compress) $output .= '"as": "ship.png",';
-						else $output .= '"aircraft_shadow": "ship.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
-						if ($compress) $output .= '"as": "ship.png",';
-						else $output .= '"aircraft_shadow": "ship.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
-						if ($compress) $output .= '"as": "ship.png",';
-						else $output .= '"aircraft_shadow": "ship.png",';
+						if ($compress) {
+							$output .= '"as": "ambulance.png",';
+						} else {
+							$output .= '"aircraft_shadow": "ambulance.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
+						if ($compress) {
+							$output .= '"as": "police.png",';
+						} else {
+							$output .= '"aircraft_shadow": "police.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
+						if ($compress) {
+							$output .= '"as": "ship.png",';
+						} else {
+							$output .= '"aircraft_shadow": "ship.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
+						if ($compress) {
+							$output .= '"as": "ship.png",';
+						} else {
+							$output .= '"aircraft_shadow": "ship.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
+						if ($compress) {
+							$output .= '"as": "ship.png",';
+						} else {
+							$output .= '"aircraft_shadow": "ship.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
+						if ($compress) {
+							$output .= '"as": "truck.png",';
+						} else {
+							$output .= '"aircraft_shadow": "truck.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
+						if ($compress) {
+							$output .= '"as": "truck.png",';
+						} else {
+							$output .= '"aircraft_shadow": "truck.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
+						if ($compress) {
+							$output .= '"as": "aircraft.png",';
+						} else {
+							$output .= '"aircraft_shadow": "aircraft.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
+						if ($compress) {
+							$output .= '"as": "aircraft.png",';
+						} else {
+							$output .= '"aircraft_shadow": "aircraft.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
+						if ($compress) {
+							$output .= '"as": "helico.png",';
+						} else {
+							$output .= '"aircraft_shadow": "helico.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
+						if ($compress) {
+							$output .= '"as": "rail.png",';
+						} else {
+							$output .= '"aircraft_shadow": "rail.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
+						if ($compress) {
+							$output .= '"as": "firetruck.png",';
+						} else {
+							$output .= '"aircraft_shadow": "firetruck.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
+						if ($compress) {
+							$output .= '"as": "bus.png",';
+						} else {
+							$output .= '"aircraft_shadow": "bus.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
+						if ($compress) {
+							$output .= '"as": "phone.png",';
+						} else {
+							$output .= '"aircraft_shadow": "phone.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
+						if ($compress) {
+							$output .= '"as": "jogger.png",';
+						} else {
+							$output .= '"aircraft_shadow": "jogger.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
+						if ($compress) {
+							$output .= '"as": "bike.png",';
+						} else {
+							$output .= '"aircraft_shadow": "bike.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
+						if ($compress) {
+							$output .= '"as": "motorcycle.png",';
+						} else {
+							$output .= '"aircraft_shadow": "motorcycle.png",';
+						}
+					} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
+						if ($compress) {
+							$output .= '"as": "balloon.png",';
+						} else {
+							$output .= '"aircraft_shadow": "balloon.png",';
+						}
+					} else {
+						if ($compress) {
+							$output .= '"as": "car.png",';
+						} else {
+							$output .= '"aircraft_shadow": "car.png",';
+						}
 					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
-						if ($compress) $output .= '"as": "truck.png",';
-						else $output .= '"aircraft_shadow": "truck.png",';
+				} elseif ($marine) {
+					if ($compress) {
+						$output .= '"as": "ship.png",';
+					} else {
+						$output .= '"aircraft_shadow": "ship.png",';
 					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
-						if ($compress) $output .= '"as": "truck.png",';
-						else $output .= '"aircraft_shadow": "truck.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
-						if ($compress) $output .= '"as": "aircraft.png",';
-						else $output .= '"aircraft_shadow": "aircraft.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
-						if ($compress) $output .= '"as": "aircraft.png",';
-						else $output .= '"aircraft_shadow": "aircraft.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
-						if ($compress) $output .= '"as": "helico.png",';
-						else $output .= '"aircraft_shadow": "helico.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
-						if ($compress) $output .= '"as": "rail.png",';
-						else $output .= '"aircraft_shadow": "rail.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
-						if ($compress) $output .= '"as": "firetruck.png",';
-						else $output .= '"aircraft_shadow": "firetruck.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
-						if ($compress) $output .= '"as": "bus.png",';
-						else $output .= '"aircraft_shadow": "bus.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
-						if ($compress) $output .= '"as": "phone.png",';
-						else $output .= '"aircraft_shadow": "phone.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
-						if ($compress) $output .= '"as": "jogger.png",';
-						else $output .= '"aircraft_shadow": "jogger.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
-						if ($compress) $output .= '"as": "bike.png",';
-						else $output .= '"aircraft_shadow": "bike.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
-						if ($compress) $output .= '"as": "motorcycle.png",';
-						else $output .= '"aircraft_shadow": "motorcycle.png",';
-					}
-					elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
-						if ($compress) $output .= '"as": "balloon.png",';
-						else $output .= '"aircraft_shadow": "balloon.png",';
-					}
-					else {
-						if ($compress) $output .= '"as": "car.png",';
-						else $output .= '"aircraft_shadow": "car.png",';
+				} else {
+					if ($compress) {
+						$output .= '"as": "default.png",';
+					} else {
+						$output .= '"aircraft_shadow": "default.png",';
 					}
 				}
-				elseif ($marine) {
-					if ($compress) $output .= '"as": "ship.png",';
-					else $output .= '"aircraft_shadow": "ship.png",';
-				}
-				else {
-					if ($compress) $output .= '"as": "default.png",';
-					else $output .= '"aircraft_shadow": "default.png",';
-				}
 			} else {
-				if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-				else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+				if ($compress) {
+					$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+				} else {
+					$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+				}
 			}
 
 			if (isset($spotter_item['date_iso_8601'])) {
@@ -373,7 +458,9 @@ 
 	$output .= ']';
 	$output .= ',"initial_sqltime": "'.$sqltime.'",';
 	$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-	if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+	if (isset($begindate)) {
+		$output .= '"archive_date": "'.$begindate.'",';
+	}
 	$output .= '"fc": "'.$flightcnt.'"';
 } else {
 	$output .= '"features": ';

ident-detailed.php

Braces +25 added lines, -9 removed lines

@@ -123,15 +123,21 @@ 
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
 		$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 && $type == 'aircraft') {
 			// Requirement for altitude graph
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (is_array($all_data) && count($all_data) > 1) {
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -205,18 +211,28 @@ 
 		print '<br/><br/><br/>';
 		print '<h1>'.$spotter_array[0]['ident'].'</h1>';
 		print '<div><span class="label">'._("Ident").'</span>'.$spotter_array[0]['ident'].'</div>';
-		if (isset($spotter_array[0]['blocked']) && $spotter_array[0]['blocked'] === true) print '<div>'._("Callsign is in blocked FAA list").'</div>';
+		if (isset($spotter_array[0]['blocked']) && $spotter_array[0]['blocked'] === true) {
+			print '<div>'._("Callsign is in blocked FAA list").'</div>';
+		}
 		if (isset($spotter_array[0]['airline_icao'])) {
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>'; 
 		}
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		if ($type == 'aircraft') {
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		}
 		print '</div>';
 	
-		if ($type == 'aircraft') include('ident-sub-menu.php');
+		if ($type == 'aircraft') {
+			include('ident-sub-menu.php');
+		}
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'marine') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'tracker') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		}
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

aircraft-data.php

Braces +52 added lines, -19 removed lines

@@ -58,7 +58,9 @@ 
 	{
 		if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 			$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-		} else $image = $spotter_item['image_thumbnail'];
+		} else {
+			$image = $spotter_item['image_thumbnail'];
+		}
 	}
 	/* else {
 		$image = "images/placeholder_thumb.png";
@@ -75,10 +77,14 @@ 
 	print '<div class="callsign-details">';
 	if ($spotter_item['ident'] != 'Not Available') {
 		print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a>';
-		if (isset($spotter_item['blocked']) && $spotter_item['blocked'] === true) print '<img src="'.$globalURL.'/images/forbidden.png" title="'._("Callsign is in blocked FAA list").'" class="blocked" />';
+		if (isset($spotter_item['blocked']) && $spotter_item['blocked'] === true) {
+			print '<img src="'.$globalURL.'/images/forbidden.png" title="'._("Callsign is in blocked FAA list").'" class="blocked" />';
+		}
 		print '</div>';
 	}
-	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
+		print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+	}
 	print '</div>';
 	if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
 		print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
@@ -110,15 +116,25 @@ 
 	print '</div>';
 	print '<div id="aircraft">';
 	print '<span>'._("Aircraft").'</span>';
-	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+	if (isset($spotter_item['aircraft_wiki'])) {
+		print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+	}
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
 		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
-		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
-	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
-	else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+		if (count($aircraft_names) == 1) {
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+		} else {
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
+		}
+	} elseif (isset($spotter_item['aircraft_type'])) {
+		print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
+	} else {
+		print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+	}
 	print '</div>';
-	if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+	if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
+		print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+	}
 
 	print '<div id="altitude"><span>'._("Altitude").'</span>';
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
@@ -131,11 +147,17 @@ 
 
 	print '<span class="altitude">';
 	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
-		else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+			print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
+		} else {
+			print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
+		}
 	} else {
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
-		else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+			print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
+		} else {
+			print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
+		}
 	}
 	print '</span>';
 
@@ -200,8 +222,11 @@ 
 	}
 	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
 		print '<div id="pilot"><span>'._("Pilot").'</span>';
-		if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
-		else print $spotter_item['pilot_name'];
+		if (isset($spotter_item['pilot_id'])) {
+			print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+		} else {
+			print $spotter_item['pilot_name'];
+		}
 		print '</div>';
 	}
 	if (isset($spotter_item['aircraft_owner']) && $spotter_item['aircraft_owner'] != '') {
@@ -227,10 +252,18 @@ 
 	}
 	print '</div>';
 	print '</div>';
-	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
-	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
-	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
+		print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
+	}
+	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
+		print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
+	}
+	if (isset($spotter_item['acars']['message'])) {
+		print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+	}
+	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
+		print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+	}
 	print '</div>';
 }
 ?>

require/class.METAR.php

Braces +130 added lines, -51 removed lines

@@ -73,8 +73,11 @@ 
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/*
@@ -104,29 +107,48 @@ 
 		//$pieces = explode(' ',$data);
 		$pieces = preg_split('/\s/',$data);
 		$pos = 0;
-		if ($pieces[0] == 'METAR') $pos++;
-		elseif ($pieces[0] == 'SPECI') $pos++;
-		if (strlen($pieces[$pos]) != 4) $pos++;
+		if ($pieces[0] == 'METAR') {
+			$pos++;
+		} elseif ($pieces[0] == 'SPECI') {
+			$pos++;
+		}
+		if (strlen($pieces[$pos]) != 4) {
+			$pos++;
+		}
 		$result = array();
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['location'] = $pieces[$pos];
 		$pos++;
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['dayofmonth'] = substr($pieces[$pos],0,2);
 		$result['time'] = substr($pieces[$pos],2,4);
 		$c = count($pieces);
 		for($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
-			if ($piece == 'RMK') break;
-			if ($piece == 'AUTO') $result['auto'] = true;
-			if ($piece == 'COR') $result['correction'] = true;
+			if ($piece == 'RMK') {
+				break;
+			}
+			if ($piece == 'AUTO') {
+				$result['auto'] = true;
+			}
+			if ($piece == 'COR') {
+				$result['correction'] = true;
+			}
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
 				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+				if ($result['wind']['unit'] == 'KT') {
+					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+				} elseif ($result['wind']['unit'] == 'KPH') {
+					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+				} elseif ($result['wind']['unit'] == 'MPS') {
+					$result['wind']['speed'] = round(((float)$matches[2]),2);
+				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -210,27 +232,49 @@ 
 				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
 				$type = $matches[1];
 				$cloud = array();
-				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+				if ($type == 'SKC') {
+					$cloud['type'] = 'No cloud/Sky clear';
+				} elseif ($type == 'CLR') {
+					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+				} elseif ($type == 'NSC') {
+					$cloud['type'] = 'No significant cloud';
+				} elseif ($type == 'FEW') {
+					$cloud['type'] = 'Few';
+				} elseif ($type == 'SCT') {
+					$cloud['type'] = 'Scattered';
+				} elseif ($type == 'BKN') {
+					$cloud['type'] = 'Broken';
+				} elseif ($type == 'OVC') {
+					$cloud['type'] = 'Overcast/Full cloud coverage';
+				} elseif ($type == 'VV') {
+					$cloud['type'] = 'Vertical visibility';
+				}
 				$cloud['type_code'] = $type;
 				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-				if (isset($matches[3])) $significant = $matches[3];
-				else $significant = '';
-				if ($significant == 'CB') $cloud['significant'] = 'Cumulonimbus';
-				elseif ($significant == 'AC') $cloud['significant'] = 'Altocumulus';
-				elseif ($significant == 'CBS') $cloud['significant'] = 'Cumulonimbus';
-				elseif ($significant == 'CC') $cloud['significant'] = 'Cirrocumulus';
-				elseif ($significant == 'CU') $cloud['significant'] = 'Cumulus';
-				elseif ($significant == 'CI') $cloud['significant'] = 'Cirrus';
-				elseif ($significant == 'CS') $cloud['significant'] = 'Cirrostratus';
-				elseif ($significant == 'TCU') $cloud['significant'] = 'Towering Cumulus';
-				else $cloud['significant'] = $significant;
+				if (isset($matches[3])) {
+					$significant = $matches[3];
+				} else {
+					$significant = '';
+				}
+				if ($significant == 'CB') {
+					$cloud['significant'] = 'Cumulonimbus';
+				} elseif ($significant == 'AC') {
+					$cloud['significant'] = 'Altocumulus';
+				} elseif ($significant == 'CBS') {
+					$cloud['significant'] = 'Cumulonimbus';
+				} elseif ($significant == 'CC') {
+					$cloud['significant'] = 'Cirrocumulus';
+				} elseif ($significant == 'CU') {
+					$cloud['significant'] = 'Cumulus';
+				} elseif ($significant == 'CI') {
+					$cloud['significant'] = 'Cirrus';
+				} elseif ($significant == 'CS') {
+					$cloud['significant'] = 'Cirrostratus';
+				} elseif ($significant == 'TCU') {
+					$cloud['significant'] = 'Towering Cumulus';
+				} else {
+					$cloud['significant'] = $significant;
+				}
 				//$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
 				$result['cloud'][] = $cloud;
 			}
@@ -254,8 +298,11 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) {
+					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				} else {
+					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -288,8 +335,11 @@ 
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
 			}
 		}
 		return $result;
@@ -305,8 +355,11 @@ 
 		if (isset($globalMETARcycle) && $globalMETARcycle) {
 			$query = "SELECT * FROM metar WHERE metar_location = :icao";
 		} else {
-			if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-			else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+			} else {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			}
 		}
 		$query_values = array(':icao' => $icao);
 		try {
@@ -378,7 +431,9 @@ 
 	*/
 	public function addMETARCycle() {
 		global $globalDebug, $globalIVAO, $globalTransaction;
-		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Downloading METAR cycle...";
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
@@ -389,28 +444,42 @@ 
 			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
 		}
 		if ($handle) {
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			if (isset($globalDebug) && $globalDebug) {
+				echo "Done - Updating DB...";
+			}
 			$date = '';
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			while(($line = fgets($handle,4096)) !== false) {
 				$line = str_replace(array("\r\n","\r", "\n"), '', $line);
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
 				} elseif (trim($line) != '') {
-					if ($date == '') $date = date('Y/m/d H:m');
+					if ($date == '') {
+						$date = date('Y/m/d H:m');
+					}
 					$pos = 0;
 					$pieces = preg_split('/\s/',$line);
-					if ($pieces[0] == 'METAR') $pos++;
-					if (strlen($pieces[$pos]) != 4) $pos++;
+					if ($pieces[0] == 'METAR') {
+						$pos++;
+					}
+					if (strlen($pieces[$pos]) != 4) {
+						$pos++;
+					}
 					$location = $pieces[$pos];
 					//if ($location == 'LFLL') echo 'location: '.$location.' - date: '.$date.' - data: '.$line."\n";
 					echo $this->addMETAR($location,$line,$date);
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $this->db->commit();
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
+		}
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Done\n";
 		}
-		if (isset($globalDebug) && $globalDebug) echo "Done\n";
 	}
 
 	/*
@@ -420,7 +489,9 @@ 
 	*/
 	public function downloadMETAR($icao) {
 		global $globalMETARurl;
-		if ($globalMETARurl == '') return array();
+		if ($globalMETARurl == '') {
+			return array();
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -432,16 +503,24 @@ 
 				$date = $line;
 			} 
 			if (trim($line) != '') {
-				if ($date == '') $date = date('Y/m/d H:m');
+				if ($date == '') {
+					$date = date('Y/m/d H:m');
+				}
 				$pos = 0;
 				$pieces = preg_split('/\s/',$line);
-				if ($pieces[0] == 'METAR') $pos++;
-				if (strlen($pieces[$pos]) != 4) $pos++;
+				if ($pieces[0] == 'METAR') {
+					$pos++;
+				}
+				if (strlen($pieces[$pos]) != 4) {
+					$pos++;
+				}
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
 					$this->addMETAR($location,$line,$date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		}
 		return array();

race.php

Braces +11 added lines, -4 removed lines

@@ -33,7 +33,9 @@ 
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != "'") $previous = $firstLetter;
+		if ($firstLetter != "'") {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -48,10 +50,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['race_id']) && $value['race_id'] != '') print '<a href="'.$globalURL.'/marine/race/'.$value['race_id'].'">'.$value['race_name'].' ('.$value['race_id'].')';
-			else print '<a href="'.$globalURL.'/race/'.$value['race_name'].'">'.$value['race_name'];
+			if (isset($value['race_id']) && $value['race_id'] != '') {
+				print '<a href="'.$globalURL.'/marine/race/'.$value['race_id'].'">'.$value['race_name'].' ('.$value['race_id'].')';
+			} else {
+				print '<a href="'.$globalURL.'/race/'.$value['race_name'].'">'.$value['race_name'];
+			}
 			print '</a>';
 			print '</div>';
 		}

captain-detailed.php

Braces +18 added lines, -6 removed lines

@@ -38,8 +38,12 @@ 
 	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 	$filter = array();
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
+	if ($year != '') {
+		$filter = array_merge($filter,array('year' => $year));
+	}
+	if ($month != '') {
+		$filter = array_merge($filter,array('month' => $month));
+	}
 	if ($sort != '') 
 	{
 		$spotter_array = $Marine->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference, $sort,$filter);
@@ -57,8 +61,12 @@ 
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['captain_name']);
 		$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) {
@@ -111,7 +119,9 @@ 
 		*/
 		print '<div class="info column">';
 		print '<h1>'.$spotter_array[0]['captain_name'].'</h1>';
-		if (isset($spotter_array[0]['captain_id']) && $spotter_array[0]['captain_id'] != '') print '<div><span class="label">'._("Captain ID").'</span>'.$spotter_array[0]['captain_id'].'</div>';
+		if (isset($spotter_array[0]['captain_id']) && $spotter_array[0]['captain_id'] != '') {
+			print '<div><span class="label">'._("Captain ID").'</span>'.$spotter_array[0]['captain_id'].'</div>';
+		}
 		/*
 		if ($year == '' && $month == '') {
 			$Stats = new Stats();
@@ -130,7 +140,9 @@ 
 		//$airlines = count($Marine->countAllAirlinesByCaptain($captain,$filter));
 		//print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
 		$duration = $Marine->getRaceDurationByCaptain($captain,$filter);
-		if ($duration != '0') print '<div><span class="label">'._("Total races spotted duration").'</span>'.$duration.'</div>';
+		if ($duration != '0') {
+			print '<div><span class="label">'._("Total races spotted duration").'</span>'.$duration.'</div>';
+		}
 		print '</div>';
 	
 		//include('captain-sub-menu.php');

header.php

Braces +95 added lines, -22 removed lines

@@ -6,12 +6,19 @@ 
 //gets the page file and stores it in a variable
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
-if ($globalTimezone == '') $globalTimezone = 'UTC';
+if ($globalTimezone == '') {
+	$globalTimezone = 'UTC';
+}
 date_default_timezone_set($globalTimezone);
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
-else $MapType = $globalMapProvider;
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
+	$MapType = $_COOKIE['MapType'];
+} else {
+	$MapType = $globalMapProvider;
+}
 
-if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
+if (isset($globalMapOffline) && $globalMapOffline) {
+	$MapType = 'offline';
+}
 
 if (isset($_GET['3d'])) {
 	setcookie('MapFormat','3d');
@@ -209,7 +216,10 @@ 
 <?php
 		} else {
 ?>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) print '&tsk='.$tsk; ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) {
+	print '&tsk='.$tsk;
+}
+?>"></script>
 <?php
 		}
 		if (!isset($globalAircraft) || $globalAircraft) {
@@ -249,7 +259,13 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (!isset($type) || $type == 'aircraft') {
 ?>
@@ -322,7 +338,13 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -403,7 +425,12 @@ 
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle search"><i class="fa fa-search"></i></a>
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
+	print '/';
+} else {
+	print $globalURL;
+}
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
     </div>
     <div class="collapse navbar-collapse">
 
@@ -458,7 +485,10 @@ 
 	}
 ?>
 
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li>
 <?php
@@ -529,8 +559,14 @@ 
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+        <li class="dropdown<?php if ($sub) {
+	echo '-submenu';
+}
+?>">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
@@ -574,7 +610,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 <?php
 	if (isset($globalVM) && $globalVM) {
@@ -624,7 +663,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -667,7 +709,10 @@ 
 ?>
 
 <!--
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -725,9 +770,14 @@ 
   		    <?php
   		        foreach ($alllang as $key => $lang) {
   		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            if ($lang[0] == 'Deutsch') print '>'.$lang[0].' (&beta;eta)</option>';
-  		            else print '>'.$lang[0].'</option>';
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
+  		            	print ' selected ';
+  		            }
+  		            if ($lang[0] == 'Deutsch') {
+  		            	print '>'.$lang[0].' (&beta;eta)</option>';
+  		            } else {
+  		            	print '>'.$lang[0].'</option>';
+  		            }
   		        }
   		    ?>
   		</select>
@@ -875,9 +925,24 @@ 
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
@@ -892,7 +957,12 @@ 
         maxZoom: 5,
         tms : true,
         zindex : 3,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: 'Natural Earth'
     }).addTo(map);
 <?php
@@ -915,4 +985,7 @@ 
 
 ?>
 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
+	print 'index ';
+}
+?>clear">

captain.php

Braces +11 added lines, -4 removed lines

@@ -33,7 +33,9 @@ 
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != "'") $previous = $firstLetter;
+		if ($firstLetter != "'") {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -48,10 +50,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['captain_id']) && $value['captain_id'] != '') print '<a href="'.$globalURL.'/marine/captain/'.$value['captain_id'].'">'.$value['captain_name'].' ('.$value['captain_id'].')';
-			else print '<a href="'.$globalURL.'/captain/'.$value['captain_name'].'">'.$value['captain_name'];
+			if (isset($value['captain_id']) && $value['captain_id'] != '') {
+				print '<a href="'.$globalURL.'/marine/captain/'.$value['captain_id'].'">'.$value['captain_name'].' ('.$value['captain_id'].')';
+			} else {
+				print '<a href="'.$globalURL.'/captain/'.$value['captain_name'].'">'.$value['captain_name'];
+			}
 			print '</a>';
 			print '</div>';
 		}