Completed
Push — master ( 8d660b...f1b687 )
by Yannick
08:48
created
country-statistics-time.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@  discard block
 block discarded – undo
3 3
 require_once('require/class.Spotter.php');
4 4
 require_once('require/class.Language.php');
5 5
 if (!isset($_GET['country'])) {
6
-        header('Location: '.$globalURL.'/country');
7
-        die();
6
+		header('Location: '.$globalURL.'/country');
7
+		die();
8 8
 }
9 9
 $Spotter = new Spotter();
10 10
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
           function drawChart() {
62 62
             var data = google.visualization.arrayToDataTable([
63 63
             	["'._("Hour").'", "'._("# of Flights").'"], ';
64
-            	$hour_data = '';
64
+				$hour_data = '';
65 65
 	foreach($hour_array as $hour_item)
66 66
 	{
67 67
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
Please login to merge, or discard this patch.
country-statistics-departure-airport.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 require_once('require/class.Spotter.php');
4 4
 require_once('require/class.Language.php');
5 5
 if (!isset($_GET['country'])) {
6
-        header('Location: '.$globalURL.'/country');
7
-        die();
6
+		header('Location: '.$globalURL.'/country');
7
+		die();
8 8
 }
9 9
 $Spotter = new Spotter();
10 10
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
Please login to merge, or discard this patch.
flightid-overview.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
                       function drawChart6() {
63 63
                         var data = google.visualization.arrayToDataTable([
64 64
                             ["Hour","Altitude","Speed"], ';
65
-                            $altitude_data = '';
65
+							$altitude_data = '';
66 66
 			foreach($all_data as $data)
67 67
 			{
68 68
 				$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
Please login to merge, or discard this patch.
ident-detailed.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
                       function drawChart6() {
90 90
                         var data = google.visualization.arrayToDataTable([
91 91
                             ["Hour","'._("Altitude").'","'._("Speed").'"], ';
92
-                            $altitude_data = '';
92
+							$altitude_data = '';
93 93
 				foreach($all_data as $data)
94 94
 				{
95 95
 					$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
Please login to merge, or discard this patch.
about.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 <div class="info column">
12 12
     <h1>About <?php print $globalName; ?></h1>
13 13
 <?php
14
-    if ($globalName == 'FlightAirMap') {
14
+	if ($globalName == 'FlightAirMap') {
15 15
 ?>
16 16
     <p>This is an open source project displaying <u>most</u> (mostly <a href="http://en.wikipedia.org/wiki/Instrument_flight_rules" target="_blank">IFR</a>) flights that have flown near this site area.
17 17
     <?php if ($globalADSBHUB) { ?> Some ADS-B sources come from <a href="http://www.adsbhub.net">ADSBHUB.net</a>.<?php } ?>
@@ -27,18 +27,18 @@  discard block
 block discarded – undo
27 27
 
28 28
     <br /><br />
29 29
 <?php
30
-    } else {
30
+	} else {
31 31
 ?>
32 32
      <p>This project use <a href="http://www.flightairmap.fr/">FlightAirMap</a> (<a href="https://github.com/Ysurac/FlightAirMap/">source</a>) by Ycarus from <a href="http://www.zugaina.com/">Zugaina</a>.</p>
33 33
 <?php
34
-    }
34
+	}
35 35
 ?>
36 36
     <a name="source"></a>
37 37
     <h3>Source &amp; Credits</h3>
38 38
 
39 39
     <?php
40 40
 	if ($globalFlightAware) { 
41
-    ?>
41
+	?>
42 42
     <p>The data from FlightAware is coming from multiple sources. Not every aircraft is tracked on FlightAware, especially not older aircrafts as well as government aircrafts, however most modern airliners will work. You can learn more about how it works on <a href="http://flightaware.com/adsb/" target="_blank">FlightAware's ADS-B</a> page. Also, not every aircraft is shown to have flown exactly at that minute as seen on this site (aka real-time). There is a 5 minute delay on some of the sources.</p>
43 43
     <?php } ?>
44 44
     <p>None of this project would have been possible without the help and contributions of these organizations and people:</p>
Please login to merge, or discard this patch.
search-csv.php 1 patch
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -5,55 +5,55 @@  discard block
 block discarded – undo
5 5
 $Spotter = new Spotter();
6 6
 
7 7
 if (isset($_GET['start_date'])) {
8
-        //for the date manipulation into the query
9
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
10
-                $start_date = $_GET['start_date'].":00";
11
-                $end_date = $_GET['end_date'].":00";
12
-                $sql_date = $start_date.",".$end_date;
13
-        } else if($_GET['start_date'] != ""){
14
-                $start_date = $_GET['start_date'].":00";
15
-                $sql_date = $start_date;
16
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
17
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
18
-                $sql_date = $end_date;
19
-        } else $sql_date = '';
8
+		//for the date manipulation into the query
9
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
10
+				$start_date = $_GET['start_date'].":00";
11
+				$end_date = $_GET['end_date'].":00";
12
+				$sql_date = $start_date.",".$end_date;
13
+		} else if($_GET['start_date'] != ""){
14
+				$start_date = $_GET['start_date'].":00";
15
+				$sql_date = $start_date;
16
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
17
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
18
+				$sql_date = $end_date;
19
+		} else $sql_date = '';
20 20
 } else $sql_date = '';
21 21
 
22 22
 if (isset($_GET['highest_altitude'])) {
23
-        //for altitude manipulation
24
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
25
-                $end_altitude = $_GET['highest_altitude'];
26
-                $start_altitude = $_GET['lowest_altitude'];
27
-                $sql_altitude = $start_altitude.",".$end_altitude;
28
-        } else if($_GET['highest_altitude'] != ""){
29
-                $end_altitude = $_GET['highest_altitude'];
30
-                $sql_altitude = $end_altitude;
31
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
32
-                $start_altitude = $_GET['lowest_altitude'].",60000";
33
-                $sql_altitude = $start_altitude;
34
-        } else $sql_altitude = '';
23
+		//for altitude manipulation
24
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
25
+				$end_altitude = $_GET['highest_altitude'];
26
+				$start_altitude = $_GET['lowest_altitude'];
27
+				$sql_altitude = $start_altitude.",".$end_altitude;
28
+		} else if($_GET['highest_altitude'] != ""){
29
+				$end_altitude = $_GET['highest_altitude'];
30
+				$sql_altitude = $end_altitude;
31
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
32
+				$start_altitude = $_GET['lowest_altitude'].",60000";
33
+				$sql_altitude = $start_altitude;
34
+		} else $sql_altitude = '';
35 35
 } else $sql_altitude = '';
36 36
 
37 37
 //calculuation for the pagination
38 38
 if(!isset($_GET['limit']))
39 39
 {
40
-        if (!isset($_GET['number_results']))
41
-        {
42
-                $limit_start = 0;
43
-                $limit_end = 25;
44
-                $absolute_difference = 25;
45
-        } else {
46
-                if ($_GET['number_results'] > 1000){
47
-                        $_GET['number_results'] = 1000;
48
-                }
49
-                $limit_start = 0;
50
-                $limit_end = $_GET['number_results'];
51
-                $absolute_difference = $_GET['number_results'];
52
-        }
40
+		if (!isset($_GET['number_results']))
41
+		{
42
+				$limit_start = 0;
43
+				$limit_end = 25;
44
+				$absolute_difference = 25;
45
+		} else {
46
+				if ($_GET['number_results'] > 1000){
47
+						$_GET['number_results'] = 1000;
48
+				}
49
+				$limit_start = 0;
50
+				$limit_end = $_GET['number_results'];
51
+				$absolute_difference = $_GET['number_results'];
52
+		}
53 53
 }  else {
54
-        $limit_explode = explode(",", $_GET['limit']);
55
-        $limit_start = $limit_explode[0];
56
-        $limit_end = $limit_explode[1];
54
+		$limit_explode = explode(",", $_GET['limit']);
55
+		$limit_start = $limit_explode[0];
56
+		$limit_end = $limit_explode[1];
57 57
 }
58 58
 $absolute_difference = abs($limit_start - $limit_end);
59 59
 $limit_next = $limit_end + $absolute_difference;
@@ -96,41 +96,41 @@  discard block
 block discarded – undo
96 96
   foreach($spotter_array as $spotter_item)
97 97
   {
98 98
        	
99
-    $output .= $spotter_item['spotter_id'].',';
100
-    $output .= $spotter_item['ident'].',';
101
-    $output .= $spotter_item['registration'].',';
102
-    $output .= $spotter_item['aircraft_type'].',';
103
-    $output .= $spotter_item['aircraft_name'].',';
104
-    $output .= $spotter_item['aircraft_manufacturer'].',';
105
-    $output .= $spotter_item['airline_name'].',';
106
-    $output .= $spotter_item['airline_icao'].',';
107
-    $output .= $spotter_item['airline_iata'].',';
108
-    $output .= $spotter_item['airline_country'].',';
109
-    $output .= $spotter_item['airline_callsign'].',';
110
-    $output .= $spotter_item['airline_type'].',';
111
-    $output .= $spotter_item['departure_airport_city'].',';
112
-    $output .= $spotter_item['departure_airport_country'].',';
113
-    $output .= $spotter_item['departure_airport_iata'].',';
114
-    $output .= $spotter_item['departure_airport_icao'].',';
115
-    $output .= $spotter_item['departure_airport_latitude'].',';
116
-    $output .= $spotter_item['departure_airport_longitude'].',';
117
-    $output .= $spotter_item['departure_airport_altitude'].',';
118
-    $output .= $spotter_item['arrival_airport_city'].',';
119
-    $output .= $spotter_item['arrival_airport_country'].',';
120
-    $output .= $spotter_item['arrival_airport_iata'].',';
121
-    $output .= $spotter_item['arrival_airport_icao'].',';
122
-    $output .= $spotter_item['arrival_airport_latitude'].',';
123
-    $output .= $spotter_item['arrival_airport_longitude'].',';
124
-    $output .= $spotter_item['arrival_airport_altitude'].',';
125
-    $output .= $spotter_item['latitude'].',';
126
-    $output .= $spotter_item['longitude'].',';
127
-    $output .= $spotter_item['altitude'].',';
128
-    $output .= $spotter_item['ground_speed'].',';
129
-    $output .= $spotter_item['heading'].',';
130
-    $output .= $spotter_item['heading_name'].',';
131
-    $output .= $spotter_item['waypoints'].',';
132
-    $output .= date("c", strtotime($spotter_item['date_iso_8601']));
133
-    $output .= "\n";
99
+	$output .= $spotter_item['spotter_id'].',';
100
+	$output .= $spotter_item['ident'].',';
101
+	$output .= $spotter_item['registration'].',';
102
+	$output .= $spotter_item['aircraft_type'].',';
103
+	$output .= $spotter_item['aircraft_name'].',';
104
+	$output .= $spotter_item['aircraft_manufacturer'].',';
105
+	$output .= $spotter_item['airline_name'].',';
106
+	$output .= $spotter_item['airline_icao'].',';
107
+	$output .= $spotter_item['airline_iata'].',';
108
+	$output .= $spotter_item['airline_country'].',';
109
+	$output .= $spotter_item['airline_callsign'].',';
110
+	$output .= $spotter_item['airline_type'].',';
111
+	$output .= $spotter_item['departure_airport_city'].',';
112
+	$output .= $spotter_item['departure_airport_country'].',';
113
+	$output .= $spotter_item['departure_airport_iata'].',';
114
+	$output .= $spotter_item['departure_airport_icao'].',';
115
+	$output .= $spotter_item['departure_airport_latitude'].',';
116
+	$output .= $spotter_item['departure_airport_longitude'].',';
117
+	$output .= $spotter_item['departure_airport_altitude'].',';
118
+	$output .= $spotter_item['arrival_airport_city'].',';
119
+	$output .= $spotter_item['arrival_airport_country'].',';
120
+	$output .= $spotter_item['arrival_airport_iata'].',';
121
+	$output .= $spotter_item['arrival_airport_icao'].',';
122
+	$output .= $spotter_item['arrival_airport_latitude'].',';
123
+	$output .= $spotter_item['arrival_airport_longitude'].',';
124
+	$output .= $spotter_item['arrival_airport_altitude'].',';
125
+	$output .= $spotter_item['latitude'].',';
126
+	$output .= $spotter_item['longitude'].',';
127
+	$output .= $spotter_item['altitude'].',';
128
+	$output .= $spotter_item['ground_speed'].',';
129
+	$output .= $spotter_item['heading'].',';
130
+	$output .= $spotter_item['heading_name'].',';
131
+	$output .= $spotter_item['waypoints'].',';
132
+	$output .= date("c", strtotime($spotter_item['date_iso_8601']));
133
+	$output .= "\n";
134 134
   }
135 135
  }
136 136
 
Please login to merge, or discard this patch.
search-kml.php 1 patch
Indentation   +167 added lines, -167 removed lines patch added patch discarded remove patch
@@ -4,55 +4,55 @@  discard block
 block discarded – undo
4 4
 require_once('require/class.Language.php');
5 5
 $Spotter = new Spotter();
6 6
 if (isset($_GET['start_date'])) {
7
-        //for the date manipulation into the query
8
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9
-                $start_date = $_GET['start_date'].":00";
10
-                $end_date = $_GET['end_date'].":00";
11
-                $sql_date = $start_date.",".$end_date;
12
-        } else if($_GET['start_date'] != ""){
13
-                $start_date = $_GET['start_date'].":00";
14
-                $sql_date = $start_date;
15
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17
-                $sql_date = $end_date;
18
-        } else $sql_date = '';
7
+		//for the date manipulation into the query
8
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9
+				$start_date = $_GET['start_date'].":00";
10
+				$end_date = $_GET['end_date'].":00";
11
+				$sql_date = $start_date.",".$end_date;
12
+		} else if($_GET['start_date'] != ""){
13
+				$start_date = $_GET['start_date'].":00";
14
+				$sql_date = $start_date;
15
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17
+				$sql_date = $end_date;
18
+		} else $sql_date = '';
19 19
 } else $sql_date = '';
20 20
 
21 21
 if (isset($_GET['highest_altitude'])) {
22
-        //for altitude manipulation
23
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24
-                $end_altitude = $_GET['highest_altitude'];
25
-                $start_altitude = $_GET['lowest_altitude'];
26
-                $sql_altitude = $start_altitude.",".$end_altitude;
27
-        } else if($_GET['highest_altitude'] != ""){
28
-                $end_altitude = $_GET['highest_altitude'];
29
-                $sql_altitude = $end_altitude;
30
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31
-                $start_altitude = $_GET['lowest_altitude'].",60000";
32
-                $sql_altitude = $start_altitude;
33
-        } else $sql_altitude = '';
22
+		//for altitude manipulation
23
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24
+				$end_altitude = $_GET['highest_altitude'];
25
+				$start_altitude = $_GET['lowest_altitude'];
26
+				$sql_altitude = $start_altitude.",".$end_altitude;
27
+		} else if($_GET['highest_altitude'] != ""){
28
+				$end_altitude = $_GET['highest_altitude'];
29
+				$sql_altitude = $end_altitude;
30
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31
+				$start_altitude = $_GET['lowest_altitude'].",60000";
32
+				$sql_altitude = $start_altitude;
33
+		} else $sql_altitude = '';
34 34
 } else $sql_altitude = '';
35 35
 
36 36
 //calculuation for the pagination
37 37
 if(!isset($_GET['limit']))
38 38
 {
39
-        if (!isset($_GET['number_results']))
40
-        {
41
-                $limit_start = 0;
42
-                $limit_end = 25;
43
-                $absolute_difference = 25;
44
-        } else {
45
-                if ($_GET['number_results'] > 1000){
46
-                        $_GET['number_results'] = 1000;
47
-                }
48
-                $limit_start = 0;
49
-                $limit_end = $_GET['number_results'];
50
-                $absolute_difference = $_GET['number_results'];
51
-        }
39
+		if (!isset($_GET['number_results']))
40
+		{
41
+				$limit_start = 0;
42
+				$limit_end = 25;
43
+				$absolute_difference = 25;
44
+		} else {
45
+				if ($_GET['number_results'] > 1000){
46
+						$_GET['number_results'] = 1000;
47
+				}
48
+				$limit_start = 0;
49
+				$limit_end = $_GET['number_results'];
50
+				$absolute_difference = $_GET['number_results'];
51
+		}
52 52
 }  else {
53
-        $limit_explode = explode(",", $_GET['limit']);
54
-        $limit_start = $limit_explode[0];
55
-        $limit_end = $limit_explode[1];
53
+		$limit_explode = explode(",", $_GET['limit']);
54
+		$limit_start = $limit_explode[0];
55
+		$limit_end = $limit_explode[1];
56 56
 }
57 57
 
58 58
 $absolute_difference = abs($limit_start - $limit_end);
@@ -90,22 +90,22 @@  discard block
 block discarded – undo
90 90
       
91 91
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
92 92
 	$output .= '<kml xmlns="http://www.opengis.net/kml/2.2">';
93
-    $output .= '<Document>';
94
-	    $output .= '<Style id="departureAirport">';
95
-	    	$output .= '<IconStyle>';
96
-	      	$output .= '<Icon>';
97
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
98
-	         $output .= '</Icon>';
99
-	        $output .= '</IconStyle>';
100
-	    $output .= '</Style>';
101
-	    $output .= '<Style id="arrivalAirport">';
102
-	    	$output .= '<IconStyle>';
103
-	      	$output .= '<Icon>';
104
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
105
-	         $output .= '</Icon>';
106
-	        $output .= '</IconStyle>';
107
-	    $output .= '</Style>';
108
-	    $output .= '<Style id="route">';
93
+	$output .= '<Document>';
94
+		$output .= '<Style id="departureAirport">';
95
+			$output .= '<IconStyle>';
96
+		  	$output .= '<Icon>';
97
+				$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
98
+			 $output .= '</Icon>';
99
+			$output .= '</IconStyle>';
100
+		$output .= '</Style>';
101
+		$output .= '<Style id="arrivalAirport">';
102
+			$output .= '<IconStyle>';
103
+		  	$output .= '<Icon>';
104
+				$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
105
+			 $output .= '</Icon>';
106
+			$output .= '</IconStyle>';
107
+		$output .= '</Style>';
108
+		$output .= '<Style id="route">';
109 109
 				$output .= '<LineStyle>';  
110 110
 					$output .= '<color>7f0000ff</color>';
111 111
 					$output .= '<width>2</width>';
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
113 113
 				$output .= '</LineStyle>';
114 114
 			$output .= '</Style>';
115 115
             
116
-    if (!empty($spotter_array))
116
+	if (!empty($spotter_array))
117 117
 	  {	  
118
-	    foreach($spotter_array as $spotter_item)
119
-	    {
118
+		foreach($spotter_array as $spotter_item)
119
+		{
120 120
 				
121 121
 				
122 122
 				$altitude = $spotter_item['altitude'].'00';
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
 					$output .= '<styleUrl>#route</styleUrl>';
128 128
 					$output .= '<LineString>';
129 129
 						$output .= '<coordinates>';
130
-            	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
130
+				$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
131 131
 							$waypoint_pieces = array_chunk($waypoint_pieces, 2);
132 132
 							    
133 133
 							foreach ($waypoint_pieces as $waypoint_coordinate)
134 134
 							{
135
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
135
+									$output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
136 136
 							
137 137
 							}
138 138
 						$output .= '</coordinates>';
@@ -144,38 +144,38 @@  discard block
 block discarded – undo
144 144
 				//departure airport 
145 145
 				$output .= '<Placemark>';  
146 146
 					$output .= '<name>'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</name>';
147
-                    $output .= '<description><![CDATA[ ';
148
-                        $output .= '<div class="ge-balloon">';
149
-                            $output .= '<div class="ge-row">';
150
-                                $output .= '<span>Name</span>';
151
-                                $output .= $spotter_item['departure_airport_name'];
152
-                            $output .= '</div>';
153
-                            $output .= '<div class="ge-row">';
154
-                                $output .= '<span>City</span>';
155
-                                $output .= $spotter_item['departure_airport_city'];
156
-                            $output .= '</div>';
157
-                            $output .= '<div class="ge-row">';
158
-                                $output .= '<span>Country</span>';
159
-                                $output .= $spotter_item['departure_airport_country'];
160
-                            $output .= '</div>';
161
-                            $output .= '<div class="ge-row">';
162
-                                $output .= '<span>ICAO</span>';
163
-                                $output .= $spotter_item['departure_airport_icao'];
164
-                            $output .= '</div>';
165
-                            $output .= '<div class="ge-row">';
166
-                                $output .= '<span>IATA</span>';
167
-                                $output .= $spotter_item['departure_airport_iata'];
168
-                            $output .= '</div>';
169
-                            $output .= '<div class="ge-row">';
170
-                                $output .= '<span>Coordinates</span>';
171
-                                $output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
172
-                            $output .= '</div>';
173
-                            $output .= '<div class="ge-row">';
174
-                                $output .= '<span>Altitude</span>';
175
-                                $output .= $spotter_item['departure_airport_altitude'];
176
-                            $output .= '</div>';
177
-                         $output .= '</div>';
178
-                    $output .= ' ]]></description>';
147
+					$output .= '<description><![CDATA[ ';
148
+						$output .= '<div class="ge-balloon">';
149
+							$output .= '<div class="ge-row">';
150
+								$output .= '<span>Name</span>';
151
+								$output .= $spotter_item['departure_airport_name'];
152
+							$output .= '</div>';
153
+							$output .= '<div class="ge-row">';
154
+								$output .= '<span>City</span>';
155
+								$output .= $spotter_item['departure_airport_city'];
156
+							$output .= '</div>';
157
+							$output .= '<div class="ge-row">';
158
+								$output .= '<span>Country</span>';
159
+								$output .= $spotter_item['departure_airport_country'];
160
+							$output .= '</div>';
161
+							$output .= '<div class="ge-row">';
162
+								$output .= '<span>ICAO</span>';
163
+								$output .= $spotter_item['departure_airport_icao'];
164
+							$output .= '</div>';
165
+							$output .= '<div class="ge-row">';
166
+								$output .= '<span>IATA</span>';
167
+								$output .= $spotter_item['departure_airport_iata'];
168
+							$output .= '</div>';
169
+							$output .= '<div class="ge-row">';
170
+								$output .= '<span>Coordinates</span>';
171
+								$output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
172
+							$output .= '</div>';
173
+							$output .= '<div class="ge-row">';
174
+								$output .= '<span>Altitude</span>';
175
+								$output .= $spotter_item['departure_airport_altitude'];
176
+							$output .= '</div>';
177
+						 $output .= '</div>';
178
+					$output .= ' ]]></description>';
179 179
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
180 180
 					$output .= '<Point>';
181 181
 						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
@@ -186,38 +186,38 @@  discard block
 block discarded – undo
186 186
 				//arrival airport 
187 187
 				$output .= '<Placemark>';  
188 188
 					$output .= '<name>'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</name>';
189
-                    $output .= '<description><![CDATA[ ';
190
-                        $output .= '<div class="ge-balloon">';
191
-                            $output .= '<div class="ge-row">';
192
-                                $output .= '<span>Name</span>';
193
-                                $output .= $spotter_item['arrival_airport_name'];
194
-                            $output .= '</div>';
195
-                            $output .= '<div class="ge-row">';
196
-                                $output .= '<span>City</span>';
197
-                                $output .= $spotter_item['arrival_airport_city'];
198
-                            $output .= '</div>';
199
-                            $output .= '<div class="ge-row">';
200
-                                $output .= '<span>Country</span>';
201
-                                $output .= $spotter_item['arrival_airport_country'];
202
-                            $output .= '</div>';
203
-                            $output .= '<div class="ge-row">';
204
-                                $output .= '<span>ICAO</span>';
205
-                                $output .= $spotter_item['arrival_airport_icao'];
206
-                            $output .= '</div>';
207
-                            $output .= '<div class="ge-row">';
208
-                                $output .= '<span>IATA</span>';
209
-                                $output .= $spotter_item['arrival_airport_iata'];
210
-                            $output .= '</div>';
211
-                            $output .= '<div class="ge-row">';
212
-                                $output .= '<span>Coordinates</span>';
213
-                                $output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
214
-                            $output .= '</div>';
215
-                            $output .= '<div class="ge-row">';
216
-                                $output .= '<span>Altitude</span>';
217
-                                $output .= $spotter_item['arrival_airport_altitude'];
218
-                            $output .= '</div>';
219
-                         $output .= '</div>';
220
-                    $output .= ' ]]></description>';
189
+					$output .= '<description><![CDATA[ ';
190
+						$output .= '<div class="ge-balloon">';
191
+							$output .= '<div class="ge-row">';
192
+								$output .= '<span>Name</span>';
193
+								$output .= $spotter_item['arrival_airport_name'];
194
+							$output .= '</div>';
195
+							$output .= '<div class="ge-row">';
196
+								$output .= '<span>City</span>';
197
+								$output .= $spotter_item['arrival_airport_city'];
198
+							$output .= '</div>';
199
+							$output .= '<div class="ge-row">';
200
+								$output .= '<span>Country</span>';
201
+								$output .= $spotter_item['arrival_airport_country'];
202
+							$output .= '</div>';
203
+							$output .= '<div class="ge-row">';
204
+								$output .= '<span>ICAO</span>';
205
+								$output .= $spotter_item['arrival_airport_icao'];
206
+							$output .= '</div>';
207
+							$output .= '<div class="ge-row">';
208
+								$output .= '<span>IATA</span>';
209
+								$output .= $spotter_item['arrival_airport_iata'];
210
+							$output .= '</div>';
211
+							$output .= '<div class="ge-row">';
212
+								$output .= '<span>Coordinates</span>';
213
+								$output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
214
+							$output .= '</div>';
215
+							$output .= '<div class="ge-row">';
216
+								$output .= '<span>Altitude</span>';
217
+								$output .= $spotter_item['arrival_airport_altitude'];
218
+							$output .= '</div>';
219
+						 $output .= '</div>';
220
+					$output .= ' ]]></description>';
221 221
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
222 222
 					$output .= '<Point>';
223 223
 						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
@@ -230,41 +230,41 @@  discard block
 block discarded – undo
230 230
 				$output .= '<Placemark>';  
231 231
 					$output .= '<name>'.$spotter_item['ident'].' - '.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'</name>';
232 232
 					$output .= '<description><![CDATA[ ';
233
-                            $output .= '<div class="ge-balloon">';
234
-                                if ($spotter_item['image_thumbnail'] != "")
235
-                                {
236
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
237
-                                }
238
-                                $output .= '<div class="ge-row">';
239
-                                    $output .= '<span>Ident</span>';
240
-                                    $output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
241
-                                $output .= '</div>';
242
-                                $output .= '<div class="ge-row">';
243
-                                    $output .= '<span>Registration</span>';
244
-                                    $output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
245
-                                $output .= '</div>';
246
-                                $output .= '<div class="ge-row">';
247
-                                    $output .= '<span>Aircraft</span>';
248
-                                    $output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
249
-                                $output .= '</div>';
250
-                                $output .= '<div class="ge-row">';
251
-                                    $output .= '<span>Airline</span>';
252
-                                    $output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
253
-                                $output .= '</div>';
254
-                                $output .= '<div class="ge-row">';
255
-                                    $output .= '<span>Departure Airport</span>';
256
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
257
-                                $output .= '</div>';
258
-                                $output .= '<div class="ge-row">';
259
-                                    $output .= '<span>Arrival Airport</span>';
260
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
261
-                                $output .= '</div>';
233
+							$output .= '<div class="ge-balloon">';
234
+								if ($spotter_item['image_thumbnail'] != "")
235
+								{
236
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
237
+								}
238
+								$output .= '<div class="ge-row">';
239
+									$output .= '<span>Ident</span>';
240
+									$output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
241
+								$output .= '</div>';
242
+								$output .= '<div class="ge-row">';
243
+									$output .= '<span>Registration</span>';
244
+									$output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
245
+								$output .= '</div>';
246
+								$output .= '<div class="ge-row">';
247
+									$output .= '<span>Aircraft</span>';
248
+									$output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
249
+								$output .= '</div>';
250
+								$output .= '<div class="ge-row">';
251
+									$output .= '<span>Airline</span>';
252
+									$output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
253
+								$output .= '</div>';
254
+								$output .= '<div class="ge-row">';
255
+									$output .= '<span>Departure Airport</span>';
256
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
257
+								$output .= '</div>';
258
+								$output .= '<div class="ge-row">';
259
+									$output .= '<span>Arrival Airport</span>';
260
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
261
+								$output .= '</div>';
262 262
 $output .= '<div class="ge-row">';
263
-                                    $output .= '<span>Date</span>';
264
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
265
-                                $output .= '</div>';
266
-                        $output .= '</div>';
267
-                    $output .= ' ]]></description>';
263
+									$output .= '<span>Date</span>';
264
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
265
+								$output .= '</div>';
266
+						$output .= '</div>';
267
+					$output .= ' ]]></description>';
268 268
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
269 269
 					$output .= '<Point>';
270 270
 						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
@@ -273,14 +273,14 @@  discard block
 block discarded – undo
273 273
 				$output .= '</Placemark>'; 
274 274
 				
275 275
 				$output .= '<Style id="aircraft_'.$spotter_item['spotter_id'].'">';
276
-		    	$output .= '<IconStyle>';
277
-		      	$output .= '<Icon>';
278
-		        	$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
279
-		         $output .= '</Icon>';
280
-		         $output .= '<heading>'.$spotter_item['heading'].'</heading>';
281
-		        $output .= '</IconStyle>';
282
-		    $output .= '</Style>';
283
-	    }
276
+				$output .= '<IconStyle>';
277
+			  	$output .= '<Icon>';
278
+					$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
279
+				 $output .= '</Icon>';
280
+				 $output .= '<heading>'.$spotter_item['heading'].'</heading>';
281
+				$output .= '</IconStyle>';
282
+			$output .= '</Style>';
283
+		}
284 284
 	   }
285 285
 	   
286 286
 		 $output .= '</Document>';
Please login to merge, or discard this patch.
search-rss.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -4,55 +4,55 @@  discard block
 block discarded – undo
4 4
 require_once('require/class.Language.php');
5 5
 $Spotter = new Spotter();
6 6
 if (isset($_GET['start_date'])) {
7
-        //for the date manipulation into the query
8
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9
-                $start_date = $_GET['start_date'].":00";
10
-                $end_date = $_GET['end_date'].":00";
11
-                $sql_date = $start_date.",".$end_date;
12
-        } else if($_GET['start_date'] != ""){
13
-                $start_date = $_GET['start_date'].":00";
14
-                $sql_date = $start_date;
15
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17
-                $sql_date = $end_date;
18
-        } else $sql_date = '';
7
+		//for the date manipulation into the query
8
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9
+				$start_date = $_GET['start_date'].":00";
10
+				$end_date = $_GET['end_date'].":00";
11
+				$sql_date = $start_date.",".$end_date;
12
+		} else if($_GET['start_date'] != ""){
13
+				$start_date = $_GET['start_date'].":00";
14
+				$sql_date = $start_date;
15
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17
+				$sql_date = $end_date;
18
+		} else $sql_date = '';
19 19
 } else $sql_date = '';
20 20
 
21 21
 if (isset($_GET['highest_altitude'])) {
22
-        //for altitude manipulation
23
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24
-                $end_altitude = $_GET['highest_altitude'];
25
-                $start_altitude = $_GET['lowest_altitude'];
26
-                $sql_altitude = $start_altitude.",".$end_altitude;
27
-        } else if($_GET['highest_altitude'] != ""){
28
-                $end_altitude = $_GET['highest_altitude'];
29
-                $sql_altitude = $end_altitude;
30
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31
-                $start_altitude = $_GET['lowest_altitude'].",60000";
32
-                $sql_altitude = $start_altitude;
33
-        } else $sql_altitude = '';
22
+		//for altitude manipulation
23
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24
+				$end_altitude = $_GET['highest_altitude'];
25
+				$start_altitude = $_GET['lowest_altitude'];
26
+				$sql_altitude = $start_altitude.",".$end_altitude;
27
+		} else if($_GET['highest_altitude'] != ""){
28
+				$end_altitude = $_GET['highest_altitude'];
29
+				$sql_altitude = $end_altitude;
30
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31
+				$start_altitude = $_GET['lowest_altitude'].",60000";
32
+				$sql_altitude = $start_altitude;
33
+		} else $sql_altitude = '';
34 34
 } else $sql_altitude = '';
35 35
 
36 36
 //calculuation for the pagination
37 37
 if(!isset($_GET['limit']))
38 38
 {
39
-        if (!isset($_GET['number_results']))
40
-        {
41
-                $limit_start = 0;
42
-                $limit_end = 25;
43
-                $absolute_difference = 25;
44
-        } else {
45
-                if ($_GET['number_results'] > 1000){
46
-                        $_GET['number_results'] = 1000;
47
-                }
48
-                $limit_start = 0;
49
-                $limit_end = $_GET['number_results'];
50
-                $absolute_difference = $_GET['number_results'];
51
-        }
39
+		if (!isset($_GET['number_results']))
40
+		{
41
+				$limit_start = 0;
42
+				$limit_end = 25;
43
+				$absolute_difference = 25;
44
+		} else {
45
+				if ($_GET['number_results'] > 1000){
46
+						$_GET['number_results'] = 1000;
47
+				}
48
+				$limit_start = 0;
49
+				$limit_end = $_GET['number_results'];
50
+				$absolute_difference = $_GET['number_results'];
51
+		}
52 52
 }  else {
53
-        $limit_explode = explode(",", $_GET['limit']);
54
-        $limit_start = $limit_explode[0];
55
-        $limit_end = $limit_explode[1];
53
+		$limit_explode = explode(",", $_GET['limit']);
54
+		$limit_start = $limit_explode[0];
55
+		$limit_end = $limit_explode[1];
56 56
 }
57 57
 
58 58
 $absolute_difference = abs($limit_start - $limit_end);
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
102 102
   
103 103
   if (!empty($spotter_array))
104 104
   {
105
-    foreach($spotter_array as $spotter_item)
106
-    {
105
+	foreach($spotter_array as $spotter_item)
106
+	{
107 107
 
108 108
           
109 109
 		  print '<item>';
110
-		    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>';
111
-		    print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
112
-		    print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
113
-		    print '<description>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'])).'</description>';
114
-		    print '<pubDate>'.$date.'</pubDate>';
110
+			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>';
111
+			print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
112
+			print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
113
+			print '<description>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'])).'</description>';
114
+			print '<pubDate>'.$date.'</pubDate>';
115 115
 		  print '</item>';
116 116
 		    
117 117
 		 }
Please login to merge, or discard this patch.
country-statistics-aircraft.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 require_once('require/class.Spotter.php');
4 4
 require_once('require/class.Language.php');
5 5
 if (!isset($_GET['country'])) {
6
-        header('Location: '.$globalURL.'/country');
7
-        die();
6
+		header('Location: '.$globalURL.'/country');
7
+		die();
8 8
 }
9 9
 $Spotter = new Spotter();
10 10
 
Please login to merge, or discard this patch.