Ysurac / FlightAirMap

statistics-aircraft.php

Braces +13 added lines, -6 removed lines

@@ -5,11 +5,15 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Aircraft");
 
-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];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 
@@ -28,9 +32,12 @@ 
 $aircraft_data = '';
 foreach($aircraft_array as $aircraft_item)
 {
-	if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-	else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-}
+	if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') {
+		$aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+	} else {
+		$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+	}
+	}
 $aircraft_data = substr($aircraft_data, 0, -1);
 print 'var series = ['.$aircraft_data.'];';
 print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';

atc-data.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
+	if (!isset($atc_data[0])) {
+		$atc_data = $ATC->getByIdent($atcident);
+	}
  ?>
 <div class="alldetails">
 <button type="button" class="close">&times;</button>

require/class.Elevation.php

Braces +18 added lines, -6 removed lines

@@ -28,7 +28,9 @@ 
 	private $openedFiles = [];
 
 	public function __construct($htgFilesDestination = '', $resolution = 3) {
-		if ($htgFilesDestination == '') $htgFilesDestination = dirname(__FILE__).'/../data/';
+		if ($htgFilesDestination == '') {
+			$htgFilesDestination = dirname(__FILE__).'/../data/';
+		}
 		$this->htgFilesDestination = $htgFilesDestination;
 		$this->resolution          = $resolution;
 		switch ($resolution) {
@@ -171,16 +173,26 @@ 
 		$fileName  = "N{$N}E{$E}.hgt";
 		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
 			$Common = new Common();
-			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
+			if ($debug) {
+				echo 'Downloading '.$fileName.'.gz ...';
+			}
 			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
-				if ($debug) echo "File '{$fileName}.gz' not exists.";
+				if ($debug) {
+					echo "File '{$fileName}.gz' not exists.";
+				}
 				return false;
 			}
-			if ($debug) echo 'Done'."\n";
-			if ($debug) echo 'Decompress '.$fileName.' ....';
+			if ($debug) {
+				echo 'Done'."\n";
+			}
+			if ($debug) {
+				echo 'Decompress '.$fileName.' ....';
+			}
 			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
-			if ($debug) echo 'Done'."\n";
+			if ($debug) {
+				echo 'Done'."\n";
+			}
 			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 		}
 		return true;

import/callback.php

Braces +39 added lines, -13 removed lines

@@ -27,15 +27,21 @@ 
 		}
 	}
 }
-if ($authorize === false) die;
+if ($authorize === false) {
+	die;
+}
 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
 	require_once(dirname(__FILE__).'/../require/class.AIS.php');
 	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -45,10 +51,16 @@ 
 }
 
 if (isset($globalServer) && $globalServer) {
-	if ($globalDebug) echo "Using Server Mode\n";
+	if ($globalDebug) {
+		echo "Using Server Mode\n";
+	}
 	$SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
 	$AIS = new AIS();
 	$MI = new MarineImport($Connection->db);
@@ -57,7 +69,9 @@ 
 date_default_timezone_set('UTC');
 
 $buffer = '';
-if (isset($_POST)) $buffer = $_POST;
+if (isset($_POST)) {
+	$buffer = $_POST;
+}
 $data = array();
 if (isset($buffer['type_event']) && isset($buffer['lat']) && isset($buffer['lon'])) {
 	$data['ident'] = $buffer['device_id'];
@@ -68,15 +82,27 @@ 
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
 	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
 	$data['comment'] = '';
-	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	if (isset($buffer['battery']) && $buffer['battery'] != '') {
+		$data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	}
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';
-	if (isset($buffer['temp']) && $buffer['temp'] != '') $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
-	if (isset($buffer['press']) && $buffer['press'] != '') $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	if (isset($buffer['temp']) && $buffer['temp'] != '') {
+		$data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
+	}
+	if (isset($buffer['press']) && $buffer['press'] != '') {
+		$data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	}
 	$TI->add($data);
 	unset($data);
 }
-if (isset($SI)) $SI->checkAll();
-if (isset($MI)) $MI->checkAll();
-if (isset($TI)) $TI->checkAll();
+if (isset($SI)) {
+	$SI->checkAll();
+}
+if (isset($MI)) {
+	$MI->checkAll();
+}
+if (isset($TI)) {
+	$TI->checkAll();
+}
 
 ?>

flightid-overview.php

Braces +10 added lines, -4 removed lines

@@ -48,7 +48,9 @@ 
 		$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 '<br/>';
@@ -327,9 +329,13 @@ 
 			print '<div>';
 			if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "")
 			{
-				if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				if ($spotter_item['format_source'] == 'whazzup') {
+					print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} elseif ($spotter_item['format_source'] == 'vatsimtxt') {
+					print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} else {
+					print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				}
 			} else {
 				if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "")
 				{

ident-detailed.php

Braces +22 added lines, -8 removed lines

@@ -118,8 +118,12 @@ 
 	{
 		$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
@@ -127,7 +131,9 @@ 
 			$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>';
@@ -204,14 +210,22 @@ 
 		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">';

require/class.Translation.php

Braces +20 added lines, -7 removed lines

@@ -28,16 +28,25 @@ 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
 				//$airline_icao = substr($ident, 0, 3);
 				return $ident;
-			} else return $ident;
-		} else return $ident;
+			} else {
+				return $ident;
+			}
+		} else {
+			return $ident;
+		}
 		if ($airline_icao == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -55,7 +64,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['operator_correct'];
-		} else return $ident;
+		} else {
+			return $ident;
+		}
 	}
 
 	public function addOperator($ident,$correct_ident,$source) {
@@ -84,7 +95,9 @@ 
 		global $globalTranslationSources, $globalTranslationFetch;
 		//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
 		$globalTranslationSources = array();
-		if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+		if (!isset($globalTranslationFetch)) {
+			$globalTranslationFetch = TRUE;
+		}
 		//echo "Check Translation for ".$ident."...";
 		$correct = $this->getOperator($ident);
 		if ($correct != '' && $correct != $ident) {

require/class.SpotterServer.php

Braces +72 added lines, -25 removed lines

@@ -36,79 +36,126 @@
 					$data['hex'] = trim($line['hex']);
 					if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 						$data['datetime'] = $line['datetime'];
-					} else $data['datetime'] = date('Y-m-d H:i:s');
+					} else {
+						$data['datetime'] = date('Y-m-d H:i:s');
+					}
 					if (!isset($line['aircraft_icao'])) {
 						$Spotter = new Spotter();
 						$aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
 						$Spotter->db = null;
 						if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-							if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-							elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-							elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-							elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+							if ($line['aircraft_type'] == 'PARA_GLIDER') {
+								$aircraft_icao = 'GLID';
+							} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+								$aircraft_icao = 'UHEL';
+							} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+								$aircraft_icao = 'TOWPLANE';
+							} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+								$aircraft_icao = 'POWAIRC';
+							}
 						}
 						$data['aircraft_icao'] = $aircraft_icao;
-					} else $data['aircraft_icao'] = $line['aircraft_icao'];
+					} else {
+						$data['aircraft_icao'] = $line['aircraft_icao'];
+					}
 					//if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 				}
 				if (isset($line['registration']) && $line['registration'] != '') {
 					$data['registration'] = $line['registration'];
-				} else $data['registration'] = null;
+				} else {
+					$data['registration'] = null;
+				}
 				if (isset($line['waypoints']) && $line['waypoints'] != '') {
 					$data['waypoints'] = $line['waypoints'];
-				} else $data['waypoints'] = null;
+				} else {
+					$data['waypoints'] = null;
+				}
 				if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
 					$data['ident'] = trim($line['ident']);
-				} else $data['ident'] = null;
+				} else {
+					$data['ident'] = null;
+				}
 				if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
 					if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 						$data['latitude'] = $line['latitude'];
-					} else $data['latitude'] = null;
+					} else {
+						$data['latitude'] = null;
+					}
 					if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-						if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+						if ($line['longitude'] > 180) {
+							$line['longitude'] = $line['longitude'] - 360;
+						}
 						$data['longitude'] = $line['longitude'];
-					} else $data['longitude'] = null;
+					} else {
+						$data['longitude'] = null;
+					}
 				} else {
 					$data['latitude'] = null;
 					$data['longitude'] = null;
 				}
 				if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
 					$data['verticalrate'] = $line['verticalrate'];
-				} else $data['verticalrate'] = null;
+				} else {
+					$data['verticalrate'] = null;
+				}
 				if (isset($line['emergency']) && $line['emergency'] != '') {
 					$data['emergency'] = $line['emergency'];
-				} else $data['emergency'] = null;
+				} else {
+					$data['emergency'] = null;
+				}
 				if (isset($line['ground']) && $line['ground'] != '') {
 					$data['ground'] = $line['ground'];
-				} else $data['ground'] = null;
+				} else {
+					$data['ground'] = null;
+				}
 				if (isset($line['speed']) && $line['speed'] != '') {
 					$data['speed'] = round($line['speed']);
-				} else $data['speed'] = null;
+				} else {
+					$data['speed'] = null;
+				}
 				if (isset($line['squawk']) && $line['squawk'] != '') {
 					$data['squawk'] = $line['squawk'];
-				} else $data['squawk'] = null;
+				} else {
+					$data['squawk'] = null;
+				}
 				if (isset($line['altitude']) && $line['altitude'] != '') {
 					$data['altitude'] = round($line['altitude']);
-		  		} else $data['altitude'] = null;
+		  		} else {
+		  			$data['altitude'] = null;
+		  		}
 				if (isset($line['heading']) && $line['heading'] != '') {
 					$data['heading'] = round($line['heading']);
-		 		} else $data['heading'] = null;
+		 		} else {
+		 			$data['heading'] = null;
+		 		}
 				if (isset($line['source_name']) && $line['source_name'] != '') {
 					$data['source_name'] = $line['source_name'];
-				} else $data['source_name'] = null;
+				} else {
+					$data['source_name'] = null;
+				}
 				if (isset($line['over_country']) && $line['over_country'] != '') {
 					$data['over_country'] = $line['over_country'];
-		 		} else $data['over_country'] = null;
+		 		} else {
+		 			$data['over_country'] = null;
+		 		}
 				if (isset($line['noarchive']) && $line['noarchive']) {
 					$data['noarchive'] = true;
-				} else $data['noarchive'] = false;
+				} else {
+					$data['noarchive'] = false;
+				}
 				$data['format_source'] = $line['format_source'];
-				if (isset($line['id_source'])) $id_source = $line['id_source'];
+				if (isset($line['id_source'])) {
+					$id_source = $line['id_source'];
+				}
 				if (isset($data['hex'])) {
 					echo '.';
 					$id_user = $globalServerUserID;
-					if ($id_user == NULL) $id_user = 1;
-					if (!isset($id_source)) $id_source = 1;
+					if ($id_user == NULL) {
+						$id_user = 1;
+					}
+					if (!isset($id_source)) {
+						$id_source = 1;
+					}
 					$query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
 					$query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
 					try {

search-json.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 
 header('Content-Type: application/json');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);