Ysurac / FlightAirMap

search-json.php

Indentation +81 added lines, -81 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);
@@ -89,52 +89,52 @@ 
        
 $output = '{';
   $output .= '"flightairmap": {';
-    $output .= '"title": "FlightAirMap JSON Feed",';
-    $output .= '"link": "http://www.flightairmap.fr",';
-    $output .= '"aircraft": [';
+	$output .= '"title": "FlightAirMap JSON Feed",';
+	$output .= '"link": "http://www.flightairmap.fr",';
+	$output .= '"aircraft": [';
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				$output .= '{';    	
-		            $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 .= '"waypoints": "'.$spotter_item['waypoints'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+					$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 .= '"waypoints": "'.$spotter_item['waypoints'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
 				$output .= '},';
-	    }
+		}
 	   }
 	   $output  = substr($output, 0, -1);
 		 $output .= ']';

scripts/cron.php

Indentation +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@
 //checks to see if FlightAware import is set
 if ($globalFlightAware == TRUE)
 {
-    $SpotterLive = new SpotterLive();
-    $Spotter = new Spotter();
-    //deletes the spotter LIVE data
-    $SpotterLive->deleteLiveSpotterData();
+	$SpotterLive = new SpotterLive();
+	$Spotter = new Spotter();
+	//deletes the spotter LIVE data
+	$SpotterLive->deleteLiveSpotterData();
     
-    //imports the new data from FlightAware
-    $Spotter->importFromFlightAware();
+	//imports the new data from FlightAware
+	$Spotter->importFromFlightAware();
 }
 ?>
\ No newline at end of file

scripts/check_data.php

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 */
 require_once(dirname(__FILE__).'/../require/settings.php');
 if ($globalInstalled) {
-    echo '$globalInstalled must be set to FALSE in require/settings.php';
-    exit;
+	echo '$globalInstalled must be set to FALSE in require/settings.php';
+	exit;
 }
 
 require_once('../require/class.Connection.php');

scripts/daemon-acars.php

Indentation +20 added lines, -20 removed lines

@@ -11,8 +11,8 @@ 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 $schema = new Connection();
 if ($schema->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 
 $debug = true;
@@ -21,11 +21,11 @@ 
 date_default_timezone_set('UTC');
 // signal handler - playing nice with sockets and dump1090
 pcntl_signal(SIGINT,  function($signo) {
-    global $sock;
-    echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-    socket_shutdown($sock, 0);
-    socket_close($sock);
-    die("Bye!\n");
+	global $sock;
+	echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+	socket_shutdown($sock, 0);
+	socket_close($sock);
+	die("Bye!\n");
 });
 pcntl_signal_dispatch();
 
@@ -38,24 +38,24 @@ 
 // Bind the source address
 if( !socket_bind($sock, $globalACARSHost , $globalACARSPort) )
 {
-    $errorcode = socket_last_error();
-    $errormsg = socket_strerror($errorcode);
+	$errorcode = socket_last_error();
+	$errormsg = socket_strerror($errorcode);
      
-    die("Could not bind socket : [$errorcode] $errormsg \n");
+	die("Could not bind socket : [$errorcode] $errormsg \n");
 }
 
 echo "LISTEN UDP MODE \n\n";
 while(1) {
-    $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
-
-    // lets play nice and handle signals such as ctrl-c/kill properly
-    pcntl_signal_dispatch();
-    $dataFound = false;
-    //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
-    echo $buffer."\n";
-    $ACARS->add(trim($buffer));
-    socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-    $ACARS->deleteLiveAcarsData();
+	$r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
+
+	// lets play nice and handle signals such as ctrl-c/kill properly
+	pcntl_signal_dispatch();
+	$dataFound = false;
+	//  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
+	echo $buffer."\n";
+	$ACARS->add(trim($buffer));
+	socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+	$ACARS->deleteLiveAcarsData();
 }
 pcntl_exec($_,$argv);
 ?>

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

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

search-yaml.php

Indentation +104 added lines, -104 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);
@@ -94,70 +94,70 @@ 
   foreach($spotter_array as $spotter_item)
   {
 	   	
-    $output .= ' - id: '.$spotter_item['spotter_id'];
-    $output .= "\n";
-    $output .= ' - ident: '.$spotter_item['ident'];
-    $output .= "\n";
-    $output .= ' - registration: '.$spotter_item['registration'];
-    $output .= "\n";
-    $output .= ' - aircraft_icao: '.$spotter_item['aircraft_type'];
-    $output .= "\n";
-    $output .= ' - aircraft_name: '.$spotter_item['aircraft_name'];
-    $output .= "\n";
-    $output .= ' - aircraft_manufacturer: '.$spotter_item['aircraft_manufacturer'];
-    $output .= "\n";
-    $output .= ' - airline_name: '.$spotter_item['airline_name'];
-    $output .= "\n";
-    $output .= ' - airline_icao: '.$spotter_item['airline_icao'];
-    $output .= "\n";
-    $output .= ' - airline_iata: '.$spotter_item['airline_iata'];
-    $output .= "\n";
-    $output .= ' - airline_country: '.$spotter_item['airline_country'];
-    $output .= "\n";
-    $output .= ' - airline_callsign: '.$spotter_item['airline_callsign'];
-    $output .= "\n";
-    $output .= ' - airline_type: '.$spotter_item['airline_type'];
-    $output .= "\n";
-    $output .= ' - departure_airport_city: '.$spotter_item['departure_airport_city'];
-    $output .= "\n";
-    $output .= ' - departure_airport_country: '.$spotter_item['departure_airport_country'];
-    $output .= "\n";
-    $output .= ' - departure_airport_iata: '.$spotter_item['departure_airport_iata'];
-    $output .= "\n";
-    $output .= ' - departure_airport_icao: '.$spotter_item['departure_airport_icao'];
-    $output .= "\n";
-    $output .= ' - departure_airport_latitude: '.$spotter_item['departure_airport_latitude'];
-    $output .= "\n";
-    $output .= ' - departure_airport_altitude: '.$spotter_item['departure_airport_altitude'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_city: '.$spotter_item['arrival_airport_city'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_country: '.$spotter_item['arrival_airport_country'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_iata: '.$spotter_item['arrival_airport_iata'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_icao: '.$spotter_item['arrival_airport_icao'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_latitude: '.$spotter_item['arrival_airport_latitude'];
-    $output .= "\n";
-    $output .= ' - arrival_airport_altitude: '.$spotter_item['arrival_airport_altitude'];
-    $output .= "\n";    
-    $output .= ' - latitude: '.$spotter_item['latitude'];
-    $output .= "\n";
-    $output .= ' - longitude: '.$spotter_item['longitude'];
-    $output .= "\n";
-    $output .= ' - altitude: '.$spotter_item['altitude'];
-    $output .= "\n";
-    $output .= ' - ground_speed: '.$spotter_item['ground_speed'];
-    $output .= "\n";
-    $output .= ' - heading: '.$spotter_item['heading'];
-    $output .= "\n";
-    $output .= ' - heading_name: '.$spotter_item['heading_name'];
-    $output .= "\n";
-    $output .= ' - waypoints: '.$spotter_item['waypoints'];
-    $output .= "\n";
-    $output .= ' - date: '.date("c", strtotime($spotter_item['date_iso_8601']));
-    $output .= "\n\n";
+	$output .= ' - id: '.$spotter_item['spotter_id'];
+	$output .= "\n";
+	$output .= ' - ident: '.$spotter_item['ident'];
+	$output .= "\n";
+	$output .= ' - registration: '.$spotter_item['registration'];
+	$output .= "\n";
+	$output .= ' - aircraft_icao: '.$spotter_item['aircraft_type'];
+	$output .= "\n";
+	$output .= ' - aircraft_name: '.$spotter_item['aircraft_name'];
+	$output .= "\n";
+	$output .= ' - aircraft_manufacturer: '.$spotter_item['aircraft_manufacturer'];
+	$output .= "\n";
+	$output .= ' - airline_name: '.$spotter_item['airline_name'];
+	$output .= "\n";
+	$output .= ' - airline_icao: '.$spotter_item['airline_icao'];
+	$output .= "\n";
+	$output .= ' - airline_iata: '.$spotter_item['airline_iata'];
+	$output .= "\n";
+	$output .= ' - airline_country: '.$spotter_item['airline_country'];
+	$output .= "\n";
+	$output .= ' - airline_callsign: '.$spotter_item['airline_callsign'];
+	$output .= "\n";
+	$output .= ' - airline_type: '.$spotter_item['airline_type'];
+	$output .= "\n";
+	$output .= ' - departure_airport_city: '.$spotter_item['departure_airport_city'];
+	$output .= "\n";
+	$output .= ' - departure_airport_country: '.$spotter_item['departure_airport_country'];
+	$output .= "\n";
+	$output .= ' - departure_airport_iata: '.$spotter_item['departure_airport_iata'];
+	$output .= "\n";
+	$output .= ' - departure_airport_icao: '.$spotter_item['departure_airport_icao'];
+	$output .= "\n";
+	$output .= ' - departure_airport_latitude: '.$spotter_item['departure_airport_latitude'];
+	$output .= "\n";
+	$output .= ' - departure_airport_altitude: '.$spotter_item['departure_airport_altitude'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_city: '.$spotter_item['arrival_airport_city'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_country: '.$spotter_item['arrival_airport_country'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_iata: '.$spotter_item['arrival_airport_iata'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_icao: '.$spotter_item['arrival_airport_icao'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_latitude: '.$spotter_item['arrival_airport_latitude'];
+	$output .= "\n";
+	$output .= ' - arrival_airport_altitude: '.$spotter_item['arrival_airport_altitude'];
+	$output .= "\n";    
+	$output .= ' - latitude: '.$spotter_item['latitude'];
+	$output .= "\n";
+	$output .= ' - longitude: '.$spotter_item['longitude'];
+	$output .= "\n";
+	$output .= ' - altitude: '.$spotter_item['altitude'];
+	$output .= "\n";
+	$output .= ' - ground_speed: '.$spotter_item['ground_speed'];
+	$output .= "\n";
+	$output .= ' - heading: '.$spotter_item['heading'];
+	$output .= "\n";
+	$output .= ' - heading_name: '.$spotter_item['heading_name'];
+	$output .= "\n";
+	$output .= ' - waypoints: '.$spotter_item['waypoints'];
+	$output .= "\n";
+	$output .= ' - date: '.date("c", strtotime($spotter_item['date_iso_8601']));
+	$output .= "\n\n";
   }
  }