Ysurac / FlightAirMap

search-geojson.php

Indentation +126 added lines, -126 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter=new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } 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 = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} 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 = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -90,69 +90,69 @@ 
       
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-    $output .= '"features": [';
+	$output .= '"features": [';
             
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				
 				//waypoint plotting
 				$output .= '{';  
 					$output .= '"type": "Feature",';
-	      		$output .= '"properties": {';
-	          	    $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
-	          $output .= '}';
-	          if ($spotter_item['waypoints'] != '') {
-	          $output .= ',"geometry": {';
-	          	$output .= '"type": "LineString",';
-	            	$output .= '"coordinates": [';
-		            	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
+		  		$output .= '"properties": {';
+			  		$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+			  $output .= '}';
+			  if ($spotter_item['waypoints'] != '') {
+			  $output .= ',"geometry": {';
+			  	$output .= '"type": "LineString",';
+					$output .= '"coordinates": [';
+						$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 									$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 									    
 									foreach ($waypoint_pieces as $waypoint_coordinate)
 									{
 										$output .= '[';
-									        $output .=  $waypoint_coordinate[1].', ';	
-									        $output .=  $waypoint_coordinate[0];
+											$output .=  $waypoint_coordinate[1].', ';	
+											$output .=  $waypoint_coordinate[0];
 									  $output .= '],';
 									
 									}
-		            	$output = substr($output, 0, -1);
+						$output = substr($output, 0, -1);
 								$output .= ']';
 							$output .= '}';
 		}
@@ -161,50 +161,50 @@ 
 				//location of aircraft
 				$output .= '{';  
 					$output .= '"type": "Feature",';
-	      		$output .= '"properties": {';
-	          	    $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
-	          $output .= '},';
-	          $output .= '"geometry": {';
-	          	$output .= '"type": "Point",';
-	            	$output .= '"coordinates": [';
+		  		$output .= '"properties": {';
+			  		$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+			  $output .= '},';
+			  $output .= '"geometry": {';
+			  	$output .= '"type": "Point",';
+					$output .= '"coordinates": [';
 										$output .=  $spotter_item['longitude'].', ';	
 									  $output .=  $spotter_item['latitude'];
 								$output .= ']';
 							$output .= '}';
 				$output .= '},';
-	    }
+		}
 	   }
 	   $output  = substr($output, 0, -1);
 	   

Spacing +32 added lines, -32 removed lines

@@ -2,17 +2,17 @@ 
 require_once('require/class.Connection.php');
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
-$Spotter=new Spotter();
+$Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
         //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } 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 = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
         } else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
         if (!isset($_GET['number_results']))
         {
@@ -42,14 +42,14 @@ 
                 $limit_end = 25;
                 $absolute_difference = 25;
         } else {
-                if ($_GET['number_results'] > 1000){
+                if ($_GET['number_results'] > 1000) {
                         $_GET['number_results'] = 1000;
                 }
                 $limit_start = 0;
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,23 +69,23 @@ 
 
 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);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$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);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
        
       
 $output = '{';
@@ -95,7 +95,7 @@ 
     
     if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				
@@ -147,8 +147,8 @@ 
 									foreach ($waypoint_pieces as $waypoint_coordinate)
 									{
 										$output .= '[';
-									        $output .=  $waypoint_coordinate[1].', ';	
-									        $output .=  $waypoint_coordinate[0];
+									        $output .= $waypoint_coordinate[1].', ';	
+									        $output .= $waypoint_coordinate[0];
 									  $output .= '],';
 									
 									}
@@ -199,8 +199,8 @@ 
 	          $output .= '"geometry": {';
 	          	$output .= '"type": "Point",';
 	            	$output .= '"coordinates": [';
-										$output .=  $spotter_item['longitude'].', ';	
-									  $output .=  $spotter_item['latitude'];
+										$output .= $spotter_item['longitude'].', ';	
+									  $output .= $spotter_item['latitude'];
 								$output .= ']';
 							$output .= '}';
 				$output .= '},';

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 = $_GET['lowest_altitude'].",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']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header("Content-type: text/yaml");
 
-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);

statistics-airline-country.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 $country_data = '';
-foreach($airline_array as $airline_item)
+foreach ($airline_array as $airline_item)
 {
 	$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
 }
@@ -57,7 +57,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

tools-metar.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 $page_url = $globalURL.'/tools-metar';
 
-$message = filter_input(INPUT_POST,'metar_message',FILTER_SANITIZE_STRING);
+$message = filter_input(INPUT_POST, 'metar_message', FILTER_SANITIZE_STRING);
 
 print '<div class="info column">';
 print '<h1>'._("Parse METAR messages").'</h1>';
@@ -71,7 +71,7 @@ 
 			print '<b>'._("Dew point:").'</b> '.$metar_parse['dew'].' °C'." ";
 		}
 		if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
-			$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
+			$humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1);
 			print '<b>'._("Humidity:").'</b> '.$humidity.'%'." ";
 		}
 		if (isset($metar_parse['QNH'])) {

Braces +6 added lines, -2 removed lines

@@ -23,7 +23,9 @@ 
 print '<fieldset class="form-group">';
 print '<label for="metar_message">'._("METAR Message").'</label>';
 print '<textarea class="form-control" name="metar_message" id="metar_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';
@@ -59,7 +61,9 @@ 
 		if (isset($metar_parse['cloud'])) {
 			print '<b>'._("Cloud:").'</b> ';
 			foreach ($metar_parse['cloud'] as $key => $cloud) {
-				if ($key > 0) print ' / ';
+				if ($key > 0) {
+					print ' / ';
+				}
 				print $cloud['type'].' at '.$cloud['level'].' m';
 			}
 			print " ";

search-georss.php

Indentation +51 added lines, -51 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } 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 = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} 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 = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -98,8 +98,8 @@ 
 	print '<subtitle>The latest airplanes</subtitle>';
 	print '<updated>'.$date.'</updated>';
 	print '<author>';
-    	print '<name>FlightAirMap</name>';
-    	print '<email>no@no.com</email>';
+		print '<name>FlightAirMap</name>';
+		print '<email>no@no.com</email>';
 	print '</author>';
 	print '<id>FlightAirMap</id>';
 	
@@ -110,14 +110,14 @@ 
 	
 	      
 		  print '<entry>';
-		    print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
-		    print '<link href="http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'"/>';
-		    print '<id>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</id>';
-		    print '<content>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</content>';
-		    print '<updated>'.$date.'</updated>';
-		    if ($spotter_item['waypoints'] != "")
-		    {
-			    print '<georss:where>';
+			print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
+			print '<link href="http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'"/>';
+			print '<id>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</id>';
+			print '<content>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</content>';
+			print '<updated>'.$date.'</updated>';
+			if ($spotter_item['waypoints'] != "")
+			{
+				print '<georss:where>';
 					print '<gml:LineString>';
 						print '<gml:posList>';
 							$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
@@ -125,7 +125,7 @@ 
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        print $waypoint_coordinate[0].' '.$waypoint_coordinate[1].' ';
+									print $waypoint_coordinate[0].' '.$waypoint_coordinate[1].' ';
 							
 							}
 						print '</gml:posList>';

Spacing +27 added lines, -27 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
         //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } 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 = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
         } else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
         if (!isset($_GET['number_results']))
         {
@@ -42,14 +42,14 @@ 
                 $limit_end = 25;
                 $absolute_difference = 25;
         } else {
-                if ($_GET['number_results'] > 1000){
+                if ($_GET['number_results'] > 1000) {
                         $_GET['number_results'] = 1000;
                 }
                 $limit_start = 0;
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -72,23 +72,23 @@ 
 
 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);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$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);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
  
 print '<?xml version="1.0" encoding="UTF-8" ?>';
 print '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">';
@@ -105,7 +105,7 @@ 
 	
 	if (!empty($spotter_array))
 	{
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 	
 	      

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 = $_GET['lowest_altitude'].",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']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header("Content-type: text/yaml");
 
-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);

js/map.js.php

Indentation +32 added lines, -32 removed lines

@@ -332,7 +332,7 @@ 
 	    <?php
 		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
 		else $getZoom = '7';
-	    ?>
+		?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
 			if (map.hasLayer(airportsLayer) == true) {
@@ -485,7 +485,7 @@ 
 	update_locationsLayer();
 	
 <?php
-	    if (!isset($ident) && !isset($flightaware_id)) {
+		if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 	
 	var info = L.control();
@@ -506,11 +506,11 @@ 
 
 
 	<?php
-	    }
+		}
 	?>
 
 	<?php
-	    if (isset($_GET['archive'])) {
+		if (isset($_GET['archive'])) {
 	?>
 	var archive = L.control();
 	archive.onAdd = function (map) {
@@ -529,12 +529,12 @@ 
 	};
 	archive.addTo(map);
 	<?php
-	    }
+		}
 	?>
 
 
 	<?php
-	    //if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
+		//if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
 	?>
 	var showdetails = L.control();
 	showdetails.onAdd = function (map) {
@@ -1016,15 +1016,15 @@ 
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 1
@@ -1034,15 +1034,15 @@ 
 			} else {
 			    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 1
@@ -1054,15 +1054,15 @@ 
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 0.6
@@ -1072,15 +1072,15 @@ 
 			} else {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
                     		"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 0.6
@@ -1090,21 +1090,21 @@ 
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
                     	    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
                     	    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 3,
                     	    "opacity": 0.6
                 	};
@@ -1114,15 +1114,15 @@ 
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
 			    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
 			    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 2,
                     	    "opacity": 0.6
                 	};
@@ -1130,7 +1130,7 @@ 
                 	layer_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -1190,10 +1190,10 @@ 
 
 
 <?php
-    // Add support for custom json via $globalMapJson
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
+	// Add support for custom json via $globalMapJson
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
 	foreach ($globalMapJson as $json) {
-	    if (isset($json['url'])) {
+		if (isset($json['url'])) {
 ?>
 update_genLayer('<?php print $json['url']; ?>');
 <?php
@@ -1202,9 +1202,9 @@ 
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
 <?php
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 

Braces +128 added lines, -33 removed lines

@@ -5,8 +5,11 @@ 
 $_COOKIE['MapFormat'] = '2d';
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 ?>
 <?php
 	if (isset($_GET['archive'])) {
@@ -18,8 +21,11 @@ 
 		//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 		//$lastupd = 20;
 		$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-		if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-		else $enddate = time();
+		if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+			$enddate = $_GET['enddate'];
+		} else {
+			$enddate = time();
+		}
 		setcookie("archive_begin",$begindate);
 		setcookie("archive_end",$enddate);
 		setcookie("archive_update",$lastupd);
@@ -109,7 +115,17 @@ 
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 ?>
@@ -122,9 +138,19 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom-1;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -149,16 +175,27 @@ 
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -170,7 +207,12 @@ 
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -216,20 +258,26 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -277,7 +325,12 @@ 
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,
@@ -336,8 +389,11 @@ 
 
 	function update_airportsLayer() {
 	    <?php
-		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-		else $getZoom = '7';
+		if (isset($_COOKIE['AirportZoom'])) {
+			$getZoom = $_COOKIE['AirportZoom'];
+		} else {
+			$getZoom = '7';
+		}
 	    ?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
@@ -660,9 +716,13 @@ 
 		    if (callsign != ""){ markerLabel += callsign; }
 		    if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
 <?php
-	if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-	elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['IconColor'])) {
+		$IconColor = $_COOKIE['IconColor'];
+	} elseif (isset($globalAircraftIconColor)) {
+		$IconColor = $globalAircraftIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 		    info_update(feature.properties.fc);
@@ -710,7 +770,12 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -755,7 +820,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -799,7 +869,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -1141,19 +1216,34 @@ 
 	if (isset($_GET['archive'])) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
-reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 
 <?php
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -1168,7 +1258,12 @@ 
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) ) {
 ?>
 update_atcLayer();
-setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

Spacing +28 added lines, -28 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 //$_COOKIE['MapFormat'] = '2d';
 
 // Compressed GeoJson is used if true
@@ -21,10 +21,10 @@ 
 		$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 		if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 		else $enddate = time();
-		setcookie("archive_begin",$begindate);
-		setcookie("archive_end",$enddate);
-		setcookie("archive_update",$lastupd);
-		setcookie("archive_speed",$archivespeed);
+		setcookie("archive_begin", $begindate);
+		setcookie("archive_end", $enddate);
+		setcookie("archive_update", $lastupd);
+		setcookie("archive_speed", $archivespeed);
 ?>
 
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -95,16 +95,16 @@ 
 <?php
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['flightaware_id'])) {
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -139,7 +139,7 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
 	}
@@ -233,19 +233,19 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
@@ -535,10 +535,10 @@ 
 	};
 	archive.update = function (props) {
 		if (typeof props != 'undefined') {
-			//this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
+			//this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
 		} else {
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
 		}
 
 	};
@@ -738,7 +738,7 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -753,7 +753,7 @@ 
 			    iconAnchor: [<?php print $globalAircraftSize/2; ?>, <?php print $globalAircraftSize; ?>],
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			})
 		    })
 <?php
@@ -785,7 +785,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -831,7 +831,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -1420,12 +1420,12 @@ 
 	    airs.push(air.value);
 	}
     }
-    document.cookie =  'Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function airlinestype(selectObj) {
     var idx = selectObj.selectedIndex;
     var airtype = selectObj.options[idx].value;
-    document.cookie =  'airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function sources(selectObj) {
     var sources = [], source;
@@ -1436,7 +1436,7 @@ 
 	}
     }
     //document.cookie =  'Sources='+sources.join()+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 
 function show3D() {
@@ -1459,23 +1459,23 @@ 
 
 function clickVATSIM(cb) {
     //document.cookie =  'ShowVATSIM='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickIVAO(cb) {
     //document.cookie =  'ShowIVAO='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickphpVMS(cb) {
     //document.cookie =  'ShowVMS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickSBS1(cb) {
     //document.cookie =  'ShowSBS1='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickAPRS(cb) {
     //document.cookie =  'ShowAPRS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickFlightPopup(cb) {
     document.cookie =  'flightpopup='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'

search-php.php

Indentation +69 added lines, -69 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } 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 = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} 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 = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -95,39 +95,39 @@ 
   {
 	  
 	array_push($flights, array(
-                            "id" => $spotter_item['spotter_id'], 
+							"id" => $spotter_item['spotter_id'], 
 							"ident" => $spotter_item['ident'], 
 							"registration" => $spotter_item['registration'], 
 							"aircraft_icao" => $spotter_item['aircraft_type'], 
-                            "aircraft_name" => $spotter_item['aircraft_name'], 
-                            "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'],
+							"aircraft_name" => $spotter_item['aircraft_name'], 
+							"aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'],
 							"airline_name" => $spotter_item['airline_name'], 
-                            "airline_icao" => $spotter_item['airline_icao'], 
-                            "airline_iata" => $spotter_item['airline_iata'], 
-                            "airline_country" => $spotter_item['airline_country'], 
-                            "airline_callsign" => $spotter_item['airline_callsign'], 
-                            "airline_type" => $spotter_item['airline_type'],
-                            "departure_airport_city" => $spotter_item['departure_airport_city'], 
-                            "departure_airport_country" => $spotter_item['departure_airport_country'], 
-                            "departure_airport_iata" => $spotter_item['departure_airport_iata'], 
-                            "departure_airport_icao" => $spotter_item['departure_airport_icao'], 
-                            "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], 
-                            "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], 
-                            "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], 
-                            "arrival_airport_city" => $spotter_item['arrival_airport_city'], 
-                            "arrival_airport_country" => $spotter_item['arrival_airport_country'], 
-                            "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], 
-                            "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], 
-                            "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], 
-                            "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], 
-                            "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'],
-                            "latitude" => $spotter_item['latitude'], 
-                            "longitude" => $spotter_item['longitude'], 
-                            "altitude" => $spotter_item['altitude'], 
-                            "ground_speed" => $spotter_item['ground_speed'], 
-                            "heading" => $spotter_item['heading'], 
-                            "heading_name" => $spotter_item['heading_name'], 
-                            "waypoints" => $spotter_item['waypoints'],
+							"airline_icao" => $spotter_item['airline_icao'], 
+							"airline_iata" => $spotter_item['airline_iata'], 
+							"airline_country" => $spotter_item['airline_country'], 
+							"airline_callsign" => $spotter_item['airline_callsign'], 
+							"airline_type" => $spotter_item['airline_type'],
+							"departure_airport_city" => $spotter_item['departure_airport_city'], 
+							"departure_airport_country" => $spotter_item['departure_airport_country'], 
+							"departure_airport_iata" => $spotter_item['departure_airport_iata'], 
+							"departure_airport_icao" => $spotter_item['departure_airport_icao'], 
+							"departure_airport_latitude" => $spotter_item['departure_airport_latitude'], 
+							"departure_airport_longitude" => $spotter_item['departure_airport_longitude'], 
+							"departure_airport_altitude" => $spotter_item['departure_airport_altitude'], 
+							"arrival_airport_city" => $spotter_item['arrival_airport_city'], 
+							"arrival_airport_country" => $spotter_item['arrival_airport_country'], 
+							"arrival_airport_iata" => $spotter_item['arrival_airport_iata'], 
+							"arrival_airport_icao" => $spotter_item['arrival_airport_icao'], 
+							"arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], 
+							"arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], 
+							"arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'],
+							"latitude" => $spotter_item['latitude'], 
+							"longitude" => $spotter_item['longitude'], 
+							"altitude" => $spotter_item['altitude'], 
+							"ground_speed" => $spotter_item['ground_speed'], 
+							"heading" => $spotter_item['heading'], 
+							"heading_name" => $spotter_item['heading_name'], 
+							"waypoints" => $spotter_item['waypoints'],
 							"date" => date("c", strtotime($spotter_item['date_iso_8601']))
 						)
 			); 	

Spacing +27 added lines, -27 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
         //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } 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 = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
         } else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
         if (!isset($_GET['number_results']))
         {
@@ -42,14 +42,14 @@ 
                 $limit_end = 25;
                 $absolute_difference = 25;
         } else {
-                if ($_GET['number_results'] > 1000){
+                if ($_GET['number_results'] > 1000) {
                         $_GET['number_results'] = 1000;
                 }
                 $limit_start = 0;
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,29 +69,29 @@ 
 
 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);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$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);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
        
 $output = "-flights:\n";
 
 if (!empty($spotter_array))
 {
-  foreach($spotter_array as $spotter_item)
+  foreach ($spotter_array as $spotter_item)
   {
 	   	
     $output .= ' - id: '.$spotter_item['spotter_id'];

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 = $_GET['lowest_altitude'].",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']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header("Content-type: text/yaml");
 
-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);

route-statistics-manufacturer.php

Spacing +4 added lines, -4 removed lines

@@ -9,14 +9,14 @@ 
 require_once('require/class.Language.php');
 
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
 } else $spotter_array = array();  
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
+	$title = sprintf(_("Most Common Aircraft Manufacturer between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
@@ -27,7 +27,7 @@ 
 	include('route-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
  
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
 	if (!empty($manufacturers_array))
@@ -42,7 +42,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
-} else $spotter_array = array();  
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

route-statistics-registration.php

Spacing +4 added lines, -4 removed lines

@@ -9,14 +9,14 @@ 
 require_once('require/class.Language.php');
 
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
 } else $spotter_array = array();
   
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by Registration between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
+	$title = sprintf(_("Most Common Aircraft by Registration between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
@@ -27,7 +27,7 @@ 
 	include('route-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
   
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
 	if (!empty($aircraft_array))
@@ -44,7 +44,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

aircraft-statistics-airline.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Language.php');
 
 if (!isset($_GET['aircraft_type'])) {
-        header('Location: '.$globalURL.'/aircraft');
-        die();
+		header('Location: '.$globalURL.'/aircraft');
+		die();
 }
 $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

Spacing +7 added lines, -7 removed lines

@@ -7,23 +7,23 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Airlines from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -49,7 +49,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByAircraft($aircraft_type);
 
@@ -67,7 +67,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';