Ysurac / FlightAirMap

airline-statistics-arrival-airport.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
@@ -72,7 +72,7 @@ 
     
         var data = google.visualization.arrayToDataTable([ 
         	["'._("Airport").'", "'._("# of times").'"],';
-        $airport_data = '';
+		$airport_data = '';
 	foreach($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';

airline-statistics-departure-airport.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
@@ -61,7 +61,7 @@ 
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
 	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByAirline($airline);
-    	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+		print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
     	google.load("visualization", "1", {packages:["geochart"]});
     	google.setOnLoadCallback(drawCharts);

table-output.php

Indentation +25 added lines, -25 removed lines

@@ -361,17 +361,17 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (isset($spotter_item['airline_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
-                        } else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+						} else {
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -387,7 +387,7 @@ 
 	}
 	if(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
-		    $spotter_item['squawk'] = '-';
+			$spotter_item['squawk'] = '-';
 		}
 		if ($spotter_item['image_thumbnail'] != "")
 		{
@@ -398,7 +398,7 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -410,9 +410,9 @@ 
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
 			} else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -426,7 +426,7 @@ 
 			print '</td>'."\n";
 		} else {
 			print '<td class="aircraft_thumbnail">'."\n";
-       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
+	   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 	//}
 			if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
 				print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";
@@ -523,13 +523,13 @@ 
 		}
 		$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
 		if ($distance != '') {
-		    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-			    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
-		    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-			    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
-		    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-			    echo '<br/><i>'.$distance.' km</i>';
-		    }
+			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+				echo '<br/><i>'.round($distance*0.539957).' nm</i>';
+			} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+				echo '<br/><i>'.round($distance*0.621371).' mi</i>';
+			} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+				echo '<br/><i>'.$distance.' km</i>';
+			}
 		}
 	}
 	print '</td>'."\n";
@@ -588,13 +588,13 @@ 
 		}
 		$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
 		if ($distance != '') {
-		    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-			    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
-		    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-			    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
-		    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-			    echo '<br/><i>'.$distance.' km</i>';
-		    }
+			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+				echo '<br/><i>'.round($distance*0.539957).' nm</i>';
+			} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+				echo '<br/><i>'.round($distance*0.621371).' mi</i>';
+			} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+				echo '<br/><i>'.$distance.' km</i>';
+			}
 		}
 	}
 	print '</td>'."\n";

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

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

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
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 

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']))
 						)
 			); 	

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();

manufacturer-statistics-airline-country.php

Indentation +2 added lines, -2 removed lines

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