Completed
Push — master ( 9af14b...8dc4cc )
by Yannick
23:09
created
registration-statistics-arrival-airport-country.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,9 @@
 block discarded – undo
8 8
 if ($registration != '') {
9 9
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
10 10
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
11
-} else $spotter_array=array();
11
+} else {
12
+	$spotter_array=array();
13
+}
12 14
 
13 15
 
14 16
 if (!empty($spotter_array))
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,17 +3,17 @@  discard block
 block discarded – undo
3 3
 require_once('require/class.Spotter.php');
4 4
 require_once('require/class.Language.php');
5 5
 $Spotter = new Spotter();
6
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
7
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
6
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
7
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
8 8
 if ($registration != '') {
9 9
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
10 10
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
11
-} else $spotter_array=array();
11
+} else $spotter_array = array();
12 12
 
13 13
 
14 14
 if (!empty($spotter_array))
15 15
 {
16
-	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"),$registration);
16
+	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"), $registration);
17 17
 	require_once('header.php');
18 18
 	print '<div class="info column">';
19 19
 	print '<h1>'.$_GET['registration'].' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	include('registration-sub-menu.php');
26 26
 	print '<div class="column">';
27 27
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
28
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
28
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
29 29
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByRegistration($registration);
30 30
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
31 31
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
34 34
 	print 'var series = [';
35 35
 	$country_data = '';
36
-	foreach($airport_country_array as $airport_item)
36
+	foreach ($airport_country_array as $airport_item)
37 37
 	{
38 38
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
39 39
 	}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		print '</thead>';
82 82
 		print '<tbody>';
83 83
 		$i = 1;
84
-		foreach($airport_country_array as $airport_item)
84
+		foreach ($airport_country_array as $airport_item)
85 85
 		{
86 86
 			print '<tr>';
87 87
 			print '<td><strong>'.$i.'</strong></td>';
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 3 patches
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.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@  discard block
 block discarded – undo
6 6
 
7 7
 if (isset($_GET['start_date'])) {
8 8
         //for the date manipulation into the query
9
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
10 10
                 $start_date = $_GET['start_date'].":00";
11 11
                 $end_date = $_GET['end_date'].":00";
12 12
                 $sql_date = $start_date.",".$end_date;
13
-        } else if($_GET['start_date'] != ""){
13
+        } else if ($_GET['start_date'] != "") {
14 14
                 $start_date = $_GET['start_date'].":00";
15 15
                 $sql_date = $start_date;
16
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
17 17
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
18 18
                 $sql_date = $end_date;
19 19
         } else $sql_date = '';
@@ -21,21 +21,21 @@  discard block
 block discarded – undo
21 21
 
22 22
 if (isset($_GET['highest_altitude'])) {
23 23
         //for altitude manipulation
24
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
25 25
                 $end_altitude = $_GET['highest_altitude'];
26 26
                 $start_altitude = $_GET['lowest_altitude'];
27 27
                 $sql_altitude = $start_altitude.",".$end_altitude;
28
-        } else if($_GET['highest_altitude'] != ""){
28
+        } else if ($_GET['highest_altitude'] != "") {
29 29
                 $end_altitude = $_GET['highest_altitude'];
30 30
                 $sql_altitude = $end_altitude;
31
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
32 32
                 $start_altitude = $_GET['lowest_altitude'].",60000";
33 33
                 $sql_altitude = $start_altitude;
34 34
         } else $sql_altitude = '';
35 35
 } else $sql_altitude = '';
36 36
 
37 37
 //calculuation for the pagination
38
-if(!isset($_GET['limit']))
38
+if (!isset($_GET['limit']))
39 39
 {
40 40
         if (!isset($_GET['number_results']))
41 41
         {
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
                 $limit_end = 25;
44 44
                 $absolute_difference = 25;
45 45
         } else {
46
-                if ($_GET['number_results'] > 1000){
46
+                if ($_GET['number_results'] > 1000) {
47 47
                         $_GET['number_results'] = 1000;
48 48
                 }
49 49
                 $limit_start = 0;
50 50
                 $limit_end = $_GET['number_results'];
51 51
                 $absolute_difference = $_GET['number_results'];
52 52
         }
53
-}  else {
53
+} else {
54 54
         $limit_explode = explode(",", $_GET['limit']);
55 55
         $limit_start = $limit_explode[0];
56 56
         $limit_end = $limit_explode[1];
@@ -70,30 +70,30 @@  discard block
 block discarded – undo
70 70
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
71 71
 else $sort = '';
72 72
 
73
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
74
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
75
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
76
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
77
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
78
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
79
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
80
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
81
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
82
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
83
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
84
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
85
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
86
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
87
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
88
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
89
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
73
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
74
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
75
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
76
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
77
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
78
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
79
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
80
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
81
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
82
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
83
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
84
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
85
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
86
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
87
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
88
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
89
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
90 90
  
91 91
       
92 92
 $output = "id,ident,registration,aircraft_icao,aircraft_name,aircraft_manufacturer,airline,airline_icao,airline_iata,airline_country,airline_callsign,airline_type,departure_airport_city,departure_airport_country,departure_airport_iata,departure_airport_icao,departure_airport_latitude,departure_airport_longitude,departure_airport_altitude,arrival_airport_city,arrival_airport_country,arrival_airport_iata,arrival_airport_icao,arrival_airport_latitude,arrival_airport_longitude,arrival_airport_altitude,latitude,longitude,altitude,ground_speed,heading,heading_name,waypoints,date\n";
93 93
 
94 94
 if (!empty($spotter_array))
95 95
 {
96
-  foreach($spotter_array as $spotter_item)
96
+  foreach ($spotter_array as $spotter_item)
97 97
   {
98 98
        	
99 99
     $output .= $spotter_item['spotter_id'].',';
Please login to merge, or discard this patch.
Braces   +18 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,8 +16,12 @@  discard block
 block discarded – undo
16 16
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
17 17
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
18 18
                 $sql_date = $end_date;
19
-        } else $sql_date = '';
20
-} else $sql_date = '';
19
+        } else {
20
+        	$sql_date = '';
21
+        }
22
+        } else {
23
+	$sql_date = '';
24
+}
21 25
 
22 26
 if (isset($_GET['highest_altitude'])) {
23 27
         //for altitude manipulation
@@ -31,8 +35,12 @@  discard block
 block discarded – undo
31 35
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
32 36
                 $start_altitude = $_GET['lowest_altitude'].",60000";
33 37
                 $sql_altitude = $start_altitude;
34
-        } else $sql_altitude = '';
35
-} else $sql_altitude = '';
38
+        } else {
39
+        	$sql_altitude = '';
40
+        }
41
+        } else {
42
+	$sql_altitude = '';
43
+}
36 44
 
37 45
 //calculuation for the pagination
38 46
 if(!isset($_GET['limit']))
@@ -50,7 +58,7 @@  discard block
 block discarded – undo
50 58
                 $limit_end = $_GET['number_results'];
51 59
                 $absolute_difference = $_GET['number_results'];
52 60
         }
53
-}  else {
61
+} else {
54 62
         $limit_explode = explode(",", $_GET['limit']);
55 63
         $limit_start = $limit_explode[0];
56 64
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@  discard block
 block discarded – undo
67 75
 
68 76
 header("Content-type: text/csv");
69 77
 
70
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
71
-else $sort = '';
78
+if (isset($_GET['sort'])) {
79
+	$sort = $_GET['sort'];
80
+} else {
81
+	$sort = '';
82
+}
72 83
 
73 84
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
74 85
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
Please login to merge, or discard this patch.
highlights-display.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 	$limit_start = 0;
13 13
 	$limit_end = 28;
14 14
 	$absolute_difference = 28;
15
-}  else {
15
+} else {
16 16
 	$limit_explode = explode(",", $_GET['limit']);
17 17
 	$limit_start = $limit_explode[0];
18 18
 	$limit_end = $limit_explode[1];
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@  discard block
 block discarded – undo
7 7
 require_once('header.php');
8 8
 
9 9
 //calculuation for the pagination
10
-if(!isset($_GET['limit']))
10
+if (!isset($_GET['limit']))
11 11
 {
12 12
 	$limit_start = 0;
13 13
 	$limit_end = 28;
14 14
 	$absolute_difference = 28;
15
-}  else {
15
+} else {
16 16
 	$limit_explode = explode(",", $_GET['limit']);
17 17
 	$limit_start = $limit_explode[0];
18 18
 	$limit_end = $limit_explode[1];
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 print '<div class="column">';	
40 40
 print '<p>'._("The view below shows all aircrafts that have been selected to have some sort of special characteristic about them, such as unique liveries, destinations etc.").'</p>';
41 41
 
42
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
42
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
43 43
 if ($sort != '') {
44 44
 	$spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort);
45 45
 } else {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 if (!empty($spotter_array))
49 49
 {
50 50
 	print '<div class="dispay-view">';
51
-	foreach($spotter_array as $spotter_item)
51
+	foreach ($spotter_array as $spotter_item)
52 52
 	{
53 53
 		if (isset($spotter_item['image']) && $spotter_item['image'] != "")
54 54
 		{
Please login to merge, or discard this patch.
search-kml.php 3 patches
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.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@  discard block
 block discarded – undo
5 5
 $Spotter = new Spotter();
6 6
 if (isset($_GET['start_date'])) {
7 7
         //for the date manipulation into the query
8
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
8
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
9 9
                 $start_date = $_GET['start_date'].":00";
10 10
                 $end_date = $_GET['end_date'].":00";
11 11
                 $sql_date = $start_date.",".$end_date;
12
-        } else if($_GET['start_date'] != ""){
12
+        } else if ($_GET['start_date'] != "") {
13 13
                 $start_date = $_GET['start_date'].":00";
14 14
                 $sql_date = $start_date;
15
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
15
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
16 16
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17 17
                 $sql_date = $end_date;
18 18
         } else $sql_date = '';
@@ -20,21 +20,21 @@  discard block
 block discarded – undo
20 20
 
21 21
 if (isset($_GET['highest_altitude'])) {
22 22
         //for altitude manipulation
23
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
23
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
24 24
                 $end_altitude = $_GET['highest_altitude'];
25 25
                 $start_altitude = $_GET['lowest_altitude'];
26 26
                 $sql_altitude = $start_altitude.",".$end_altitude;
27
-        } else if($_GET['highest_altitude'] != ""){
27
+        } else if ($_GET['highest_altitude'] != "") {
28 28
                 $end_altitude = $_GET['highest_altitude'];
29 29
                 $sql_altitude = $end_altitude;
30
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
30
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
31 31
                 $start_altitude = $_GET['lowest_altitude'].",60000";
32 32
                 $sql_altitude = $start_altitude;
33 33
         } else $sql_altitude = '';
34 34
 } else $sql_altitude = '';
35 35
 
36 36
 //calculuation for the pagination
37
-if(!isset($_GET['limit']))
37
+if (!isset($_GET['limit']))
38 38
 {
39 39
         if (!isset($_GET['number_results']))
40 40
         {
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
                 $limit_end = 25;
43 43
                 $absolute_difference = 25;
44 44
         } else {
45
-                if ($_GET['number_results'] > 1000){
45
+                if ($_GET['number_results'] > 1000) {
46 46
                         $_GET['number_results'] = 1000;
47 47
                 }
48 48
                 $limit_start = 0;
49 49
                 $limit_end = $_GET['number_results'];
50 50
                 $absolute_difference = $_GET['number_results'];
51 51
         }
52
-}  else {
52
+} else {
53 53
         $limit_explode = explode(",", $_GET['limit']);
54 54
         $limit_start = $limit_explode[0];
55 55
         $limit_end = $limit_explode[1];
@@ -69,23 +69,23 @@  discard block
 block discarded – undo
69 69
 
70 70
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
71 71
 else $sort = '';
72
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
75
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
76
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
77
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
78
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
79
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
80
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
81
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
82
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
83
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
84
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
85
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
86
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
87
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
88
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
72
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
73
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
74
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
75
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
76
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
77
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
78
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
79
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
80
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
81
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
82
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
83
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
84
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
85
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
86
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
87
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
88
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
89 89
       
90 90
       
91 91
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
             
116 116
     if (!empty($spotter_array))
117 117
 	  {	  
118
-	    foreach($spotter_array as $spotter_item)
118
+	    foreach ($spotter_array as $spotter_item)
119 119
 	    {
120 120
 				
121 121
 				
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
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>';
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
                     $output .= ' ]]></description>';
179 179
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
180 180
 					$output .= '<Point>';
181
-						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
181
+						$output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
182 182
 						$output .= '<altitudeMode>absolute</altitudeMode>';
183 183
 					$output .= '</Point>';
184 184
 				$output .= '</Placemark>'; 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
                     $output .= ' ]]></description>';
221 221
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
222 222
 					$output .= '<Point>';
223
-						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
223
+						$output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
224 224
 						$output .= '<altitudeMode>absolute</altitudeMode>';
225 225
 					$output .= '</Point>';
226 226
 				$output .= '</Placemark>'; 
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
                     $output .= ' ]]></description>';
268 268
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
269 269
 					$output .= '<Point>';
270
-						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
270
+						$output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
271 271
 						$output .= '<altitudeMode>absolute</altitudeMode>';
272 272
 					$output .= '</Point>';
273 273
 				$output .= '</Placemark>'; 
Please login to merge, or discard this patch.
Braces   +18 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,8 +15,12 @@  discard block
 block discarded – undo
15 15
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16 16
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17 17
                 $sql_date = $end_date;
18
-        } else $sql_date = '';
19
-} else $sql_date = '';
18
+        } else {
19
+        	$sql_date = '';
20
+        }
21
+        } else {
22
+	$sql_date = '';
23
+}
20 24
 
21 25
 if (isset($_GET['highest_altitude'])) {
22 26
         //for altitude manipulation
@@ -30,8 +34,12 @@  discard block
 block discarded – undo
30 34
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31 35
                 $start_altitude = $_GET['lowest_altitude'].",60000";
32 36
                 $sql_altitude = $start_altitude;
33
-        } else $sql_altitude = '';
34
-} else $sql_altitude = '';
37
+        } else {
38
+        	$sql_altitude = '';
39
+        }
40
+        } else {
41
+	$sql_altitude = '';
42
+}
35 43
 
36 44
 //calculuation for the pagination
37 45
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@  discard block
 block discarded – undo
49 57
                 $limit_end = $_GET['number_results'];
50 58
                 $absolute_difference = $_GET['number_results'];
51 59
         }
52
-}  else {
60
+} else {
53 61
         $limit_explode = explode(",", $_GET['limit']);
54 62
         $limit_start = $limit_explode[0];
55 63
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@  discard block
 block discarded – undo
67 75
 
68 76
 header('Content-Type: text/xml');
69 77
 
70
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
71
-else $sort = '';
78
+if (isset($_GET['sort'])) {
79
+	$sort = $_GET['sort'];
80
+} else {
81
+	$sort = '';
82
+}
72 83
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73 84
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74 85
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
Please login to merge, or discard this patch.
search-rss.php 3 patches
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.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@  discard block
 block discarded – undo
5 5
 $Spotter = new Spotter();
6 6
 if (isset($_GET['start_date'])) {
7 7
         //for the date manipulation into the query
8
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
8
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
9 9
                 $start_date = $_GET['start_date'].":00";
10 10
                 $end_date = $_GET['end_date'].":00";
11 11
                 $sql_date = $start_date.",".$end_date;
12
-        } else if($_GET['start_date'] != ""){
12
+        } else if ($_GET['start_date'] != "") {
13 13
                 $start_date = $_GET['start_date'].":00";
14 14
                 $sql_date = $start_date;
15
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
15
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
16 16
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17 17
                 $sql_date = $end_date;
18 18
         } else $sql_date = '';
@@ -20,21 +20,21 @@  discard block
 block discarded – undo
20 20
 
21 21
 if (isset($_GET['highest_altitude'])) {
22 22
         //for altitude manipulation
23
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
23
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
24 24
                 $end_altitude = $_GET['highest_altitude'];
25 25
                 $start_altitude = $_GET['lowest_altitude'];
26 26
                 $sql_altitude = $start_altitude.",".$end_altitude;
27
-        } else if($_GET['highest_altitude'] != ""){
27
+        } else if ($_GET['highest_altitude'] != "") {
28 28
                 $end_altitude = $_GET['highest_altitude'];
29 29
                 $sql_altitude = $end_altitude;
30
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
30
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
31 31
                 $start_altitude = $_GET['lowest_altitude'].",60000";
32 32
                 $sql_altitude = $start_altitude;
33 33
         } else $sql_altitude = '';
34 34
 } else $sql_altitude = '';
35 35
 
36 36
 //calculuation for the pagination
37
-if(!isset($_GET['limit']))
37
+if (!isset($_GET['limit']))
38 38
 {
39 39
         if (!isset($_GET['number_results']))
40 40
         {
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
42 42
                 $limit_end = 25;
43 43
                 $absolute_difference = 25;
44 44
         } else {
45
-                if ($_GET['number_results'] > 1000){
45
+                if ($_GET['number_results'] > 1000) {
46 46
                         $_GET['number_results'] = 1000;
47 47
                 }
48 48
                 $limit_start = 0;
49 49
                 $limit_end = $_GET['number_results'];
50 50
                 $absolute_difference = $_GET['number_results'];
51 51
         }
52
-}  else {
52
+} else {
53 53
         $limit_explode = explode(",", $_GET['limit']);
54 54
         $limit_start = $limit_explode[0];
55 55
         $limit_end = $limit_explode[1];
@@ -72,23 +72,23 @@  discard block
 block discarded – undo
72 72
 
73 73
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
74 74
 else $sort = '';
75
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
76
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
77
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
78
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
79
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
80
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
81
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
82
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
83
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
84
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
85
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
86
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
87
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
88
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
89
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
90
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
91
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
75
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
76
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
77
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
78
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
79
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
80
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
81
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
82
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
83
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
84
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
85
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
86
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
87
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
88
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
89
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
90
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
91
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
92 92
  
93 93
 print '<?xml version="1.0" encoding="UTF-8" ?>';
94 94
 print '<rss xmlns:flightairmap="http://'.$_SERVER['HTTP_HOST'].''.htmlentities($_SERVER['REQUEST_URI']).'" version="2.0">';
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
   
103 103
   if (!empty($spotter_array))
104 104
   {
105
-    foreach($spotter_array as $spotter_item)
105
+    foreach ($spotter_array as $spotter_item)
106 106
     {
107 107
 
108 108
           
Please login to merge, or discard this patch.
Braces   +18 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,8 +15,12 @@  discard block
 block discarded – undo
15 15
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16 16
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17 17
                 $sql_date = $end_date;
18
-        } else $sql_date = '';
19
-} else $sql_date = '';
18
+        } else {
19
+        	$sql_date = '';
20
+        }
21
+        } else {
22
+	$sql_date = '';
23
+}
20 24
 
21 25
 if (isset($_GET['highest_altitude'])) {
22 26
         //for altitude manipulation
@@ -30,8 +34,12 @@  discard block
 block discarded – undo
30 34
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31 35
                 $start_altitude = $_GET['lowest_altitude'].",60000";
32 36
                 $sql_altitude = $start_altitude;
33
-        } else $sql_altitude = '';
34
-} else $sql_altitude = '';
37
+        } else {
38
+        	$sql_altitude = '';
39
+        }
40
+        } else {
41
+	$sql_altitude = '';
42
+}
35 43
 
36 44
 //calculuation for the pagination
37 45
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@  discard block
 block discarded – undo
49 57
                 $limit_end = $_GET['number_results'];
50 58
                 $absolute_difference = $_GET['number_results'];
51 59
         }
52
-}  else {
60
+} else {
53 61
         $limit_explode = explode(",", $_GET['limit']);
54 62
         $limit_start = $limit_explode[0];
55 63
         $limit_end = $limit_explode[1];
@@ -70,8 +78,11 @@  discard block
 block discarded – undo
70 78
 
71 79
 $date = date("D, d M Y H:i:s T", time());
72 80
 
73
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
74
-else $sort = '';
81
+if (isset($_GET['sort'])) {
82
+	$sort = $_GET['sort'];
83
+} else {
84
+	$sort = '';
85
+}
75 86
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
76 87
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
77 88
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
Please login to merge, or discard this patch.
country-statistics-route.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
         die();
8 8
 }
9 9
 $Spotter = new Spotter();
10
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
11
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
10
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
11
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
12 12
 
13 13
 if (isset($_GET['sort'])) {
14 14
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
18 18
 
19 19
 if (!empty($spotter_array))
20 20
 {
21
-	$title = sprintf(_("Most Common Routes from %s"),$country);
21
+	$title = sprintf(_("Most Common Routes from %s"), $country);
22 22
 	require_once('header.php');
23 23
 	print '<div class="select-item">';
24 24
 	print '<form action="'.$globalURL.'/country" method="post">';
25 25
 	print '<select name="country" class="selectpicker" data-live-search="true">';
26 26
 	print '<option></option>';
27 27
 	$all_countries = $Spotter->getAllCountries();
28
-	foreach($all_countries as $all_country)
28
+	foreach ($all_countries as $all_country)
29 29
 	{
30
-		if($country == $all_country['country'])
30
+		if ($country == $all_country['country'])
31 31
 		{
32 32
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
33 33
 		} else {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	if ($_GET['country'] != "NA")
43 43
 	{
44 44
 		print '<div class="info column">';
45
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
45
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
46 46
 		print '</div>';
47 47
 	} else {
48 48
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	include('country-sub-menu.php');
52 52
 	print '<div class="column">';
53 53
 	print '<h2>'._("Most Common Routes").'</h2>';
54
-	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
54
+	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
55 55
 	$route_array = $Spotter->countAllRoutesByCountry($country);
56 56
 	if (!empty($route_array))
57 57
 	{
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		print '</thead>';
67 67
 		print '<tbody>';
68 68
 		$i = 1;
69
-		foreach($route_array as $route_item)
69
+		foreach ($route_array as $route_item)
70 70
 		{
71 71
 			print '<tr>';
72 72
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this 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.
country-statistics-aircraft.php 2 patches
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.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@  discard block
 block discarded – undo
9 9
 $Spotter = new Spotter();
10 10
 
11 11
 $country = ucwords(str_replace("-", " ", $_GET['country']));
12
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
12
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
13 13
 $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
14 14
 
15 15
 if (!empty($spotter_array))
16 16
 {
17
-	$title = sprintf(_("Most Common Aircraft from %s"),$country);
17
+	$title = sprintf(_("Most Common Aircraft from %s"), $country);
18 18
 
19 19
 	require_once('header.php');
20 20
 	print '<div class="select-item">';
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	print '<select name="country" class="selectpicker" data-live-search="true">';
23 23
 	print '<option></option>';
24 24
 	$all_countries = $Spotter->getAllCountries();
25
-	foreach($all_countries as $all_country)
25
+	foreach ($all_countries as $all_country)
26 26
 	{
27
-		if($country == $all_country['country'])
27
+		if ($country == $all_country['country'])
28 28
 		{
29 29
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
30 30
 		} else {
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	if ($_GET['country'] != "NA")
40 40
 	{
41 41
 		print '<div class="info column">';
42
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
42
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
43 43
 		print '</div>';
44 44
 	} else {
45 45
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	include('country-sub-menu.php');
49 49
 	print '<div class="column">';
50 50
 	print '<h2>'._("Most Common Aircraft").'</h2>';
51
-	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$country).'</p>';
51
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $country).'</p>';
52 52
 
53 53
 	$aircraft_array = $Spotter->countAllAircraftTypesByCountry($country);
54 54
 	if (!empty($aircraft_array))
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		print '</thead>';
63 63
 		print '<tbody>';
64 64
 		$i = 1;
65
-		foreach($aircraft_array as $aircraft_item)
65
+		foreach ($aircraft_array as $aircraft_item)
66 66
 		{
67 67
 			print '<tr>';
68 68
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
registration-detailed.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,17 +3,17 @@  discard block
 block discarded – undo
3 3
 require_once('require/class.Spotter.php');
4 4
 require_once('require/class.Language.php');
5 5
 
6
-if (!isset($_GET['registration'])){
6
+if (!isset($_GET['registration'])) {
7 7
 	header('Location: '.$globalURL.'');
8 8
 } else {
9 9
 	$Spotter = new Spotter();
10 10
 	//calculuation for the pagination
11
-	if(!isset($_GET['limit']))
11
+	if (!isset($_GET['limit']))
12 12
 	{
13 13
 		$limit_start = 0;
14 14
 		$limit_end = 25;
15 15
 		$absolute_difference = 25;
16
-	}  else {
16
+	} else {
17 17
 		$limit_explode = explode(",", $_GET['limit']);
18 18
 		$limit_start = $limit_explode[0];
19 19
 		$limit_end = $limit_explode[1];
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	$limit_next = $limit_end + $absolute_difference;
27 27
 	$limit_previous_1 = $limit_start - $absolute_difference;
28 28
 	$limit_previous_2 = $limit_end - $absolute_difference;
29
-	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
30
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
29
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
30
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
31 31
 	
32 32
 	$page_url = $globalURL.'/registration/'.$registration;
33 33
 	
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	
41 41
 	if (!empty($spotter_array))
42 42
 	{
43
-		$title = sprintf(_("Detailed View of aircraft with registration %s"),$registration);
43
+		$title = sprintf(_("Detailed View of aircraft with registration %s"), $registration);
44 44
 		require_once('header.php');
45 45
 		print '<div class="info column">';
46 46
 		print '<h1>'.$registration.' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 		
52 52
 		include('registration-sub-menu.php');
53 53
 		print '<div class="table column">';
54
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of aircraft with the registration <strong>%s</strong>."),$registration).'</p>';
54
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of aircraft with the registration <strong>%s</strong>."), $registration).'</p>';
55 55
 
56 56
 		include('table-output.php');
57 57
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 		$limit_start = 0;
15 15
 		$limit_end = 25;
16 16
 		$absolute_difference = 25;
17
-	}  else {
17
+	} else {
18 18
 		$limit_explode = explode(",", $_GET['limit']);
19 19
 		$limit_start = $limit_explode[0];
20 20
 		$limit_end = $limit_explode[1];
Please login to merge, or discard this patch.