| @@ -3,8 +3,8 @@ | ||
| 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))); | 
| @@ -7,8 +7,8 @@ discard block | ||
| 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 | ||
| 18 | 18 | |
| 19 | 19 | if (!empty($spotter_array)) | 
| 20 | 20 |  { | 
| 21 | -	$title = sprintf(_("Most Common Departure Airports from %s"),$country); | |
| 21 | +	$title = sprintf(_("Most Common Departure Airports 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 { | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | if ($_GET['country'] != "NA") | 
| 42 | 42 |  	{ | 
| 43 | 43 | print '<div class="info column">'; | 
| 44 | -		print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>'; | |
| 44 | +		print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>'; | |
| 45 | 45 | print '</div>'; | 
| 46 | 46 |  	} else { | 
| 47 | 47 |  		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>'; | 
| @@ -50,7 +50,7 @@ discard block | ||
| 50 | 50 |  	include('country-sub-menu.php'); | 
| 51 | 51 | print '<div class="column">'; | 
| 52 | 52 |  	print '<h2>'._("Most Common Departure Airports").'</h2>'; | 
| 53 | -	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>'; | |
| 53 | +	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports & airlines from <strong>%s</strong>."), $country).'</p>'; | |
| 54 | 54 | |
| 55 | 55 | $airport_airport_array = $Spotter->countAllDepartureAirportsByCountry($country); | 
| 56 | 56 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; | 
| @@ -60,7 +60,7 @@ discard block | ||
| 60 | 60 | print '<script>'; | 
| 61 | 61 | print 'var series = ['; | 
| 62 | 62 | $airport_data = ''; | 
| 63 | - foreach($airport_airport_array as $airport_item) | |
| 63 | + foreach ($airport_airport_array as $airport_item) | |
| 64 | 64 |  	{ | 
| 65 | 65 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; | 
| 66 | 66 | } | 
| @@ -114,7 +114,7 @@ discard block | ||
| 114 | 114 | print '</thead>'; | 
| 115 | 115 | print '<tbody>'; | 
| 116 | 116 | $i = 1; | 
| 117 | - foreach($airport_airport_array as $airport_item) | |
| 117 | + foreach ($airport_airport_array as $airport_item) | |
| 118 | 118 |  	{ | 
| 119 | 119 | print '<tr>'; | 
| 120 | 120 | print '<td><strong>'.$i.'</strong></td>'; | 
| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | <?php | 
| 30 | 30 | if (isset($_GET['q'])) | 
| 31 | 31 |  { | 
| 32 | - $spotter_array = $Spotter->searchSpotterData($_GET['q'],"","","","","","","","","","","","","","","","","","0,10","",""); | |
| 32 | + $spotter_array = $Spotter->searchSpotterData($_GET['q'], "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", ""); | |
| 33 | 33 |  } else { | 
| 34 | 34 |  	$spotter_array = $Spotter->getLatestSpotterData("0,10", ""); | 
| 35 | 35 | } | 
| @@ -37,7 +37,7 @@ discard block | ||
| 37 | 37 | print '<div class="table-responsive">'; | 
| 38 | 38 | print '<table id="table-tv">'; | 
| 39 | 39 | print '<tbody>'; | 
| 40 | -foreach($spotter_array as $spotter_item) | |
| 40 | +foreach ($spotter_array as $spotter_item) | |
| 41 | 41 |  { | 
| 42 | 42 |  	if (isset($globalTimezone)) { | 
| 43 | 43 | date_default_timezone_set($globalTimezone); | 
| @@ -7,8 +7,8 @@ discard block | ||
| 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 |  if (isset($_GET['sort'])) { | 
| 13 | 13 | $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort); | 
| 14 | 14 |  } else { | 
| @@ -17,16 +17,16 @@ discard block | ||
| 17 | 17 | |
| 18 | 18 | if (!empty($spotter_array)) | 
| 19 | 19 |  { | 
| 20 | -	$title = sprintf(_("Most Common Aircraft Manufacturer from %s"),$country); | |
| 20 | +	$title = sprintf(_("Most Common Aircraft Manufacturer from %s"), $country); | |
| 21 | 21 |  	require_once('header.php'); | 
| 22 | 22 | print '<div class="select-item">'; | 
| 23 | 23 | print '<form action="'.$globalURL.'/country" method="post">'; | 
| 24 | 24 | print '<select name="country" class="selectpicker" data-live-search="true">'; | 
| 25 | 25 | print '<option></option>'; | 
| 26 | 26 | $all_countries = $Spotter->getAllCountries(); | 
| 27 | - foreach($all_countries as $all_country) | |
| 27 | + foreach ($all_countries as $all_country) | |
| 28 | 28 |  	{ | 
| 29 | - if($country == $all_country['country']) | |
| 29 | + if ($country == $all_country['country']) | |
| 30 | 30 |  		{ | 
| 31 | 31 |  			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>'; | 
| 32 | 32 |  		} else { | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | if ($_GET['country'] != "NA") | 
| 42 | 42 |  	{ | 
| 43 | 43 | print '<div class="info column">'; | 
| 44 | -		print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>'; | |
| 44 | +		print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>'; | |
| 45 | 45 | print '</div>'; | 
| 46 | 46 |  	} else { | 
| 47 | 47 |  		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>'; | 
| @@ -50,7 +50,7 @@ discard block | ||
| 50 | 50 |  	include('country-sub-menu.php'); | 
| 51 | 51 | print '<div class="column">'; | 
| 52 | 52 |  	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>'; | 
| 53 | -	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>'; | |
| 53 | +	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>'; | |
| 54 | 54 | $manufacturers_array = $Spotter->countAllAircraftManufacturerByCountry($country); | 
| 55 | 55 | if (!empty($manufacturers_array)) | 
| 56 | 56 |  	{ | 
| @@ -63,7 +63,7 @@ discard block | ||
| 63 | 63 | print '</thead>'; | 
| 64 | 64 | print '<tbody>'; | 
| 65 | 65 | $i = 1; | 
| 66 | - foreach($manufacturers_array as $manufacturer_item) | |
| 66 | + foreach ($manufacturers_array as $manufacturer_item) | |
| 67 | 67 |  		{ | 
| 68 | 68 | print '<tr>'; | 
| 69 | 69 | print '<td><strong>'.$i.'</strong></td>'; | 
| @@ -3,8 +3,8 @@ | ||
| 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))); | 
| @@ -8,7 +8,7 @@ | ||
| 8 | 8 | |
| 9 | 9 | $page_url = $globalURL.'/acars-latest'; | 
| 10 | 10 | |
| 11 | -if(!isset($_GET['limit'])) | |
| 11 | +if (!isset($_GET['limit'])) | |
| 12 | 12 |  { | 
| 13 | 13 | $limit_start = 0; | 
| 14 | 14 | $limit_end = 25; | 
| @@ -11,7 +11,7 @@ discard block | ||
| 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 | ||
| 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 & 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> | 
| @@ -5,55 +5,55 @@ discard block | ||
| 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 | ||
| 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 | |
| @@ -6,14 +6,14 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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'].','; | 
| @@ -4,55 +4,55 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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>'; | 
| @@ -5,14 +5,14 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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>'; | 
| @@ -4,55 +4,55 @@ discard block | ||
| 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 | ||
| 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 | } | 
| @@ -5,14 +5,14 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | |
| @@ -7,8 +7,8 @@ discard block | ||
| 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 | ||
| 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 | ||
| 42 | 42 | if ($_GET['country'] != "NA") | 
| 43 | 43 |  	{ | 
| 44 | 44 | print '<div class="info column">'; | 
| 45 | -		print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>'; | |
| 45 | +		print '<h1>'.sprintf(_("Airports & 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 | ||
| 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 & airlines from <strong>%s</strong>."),$country).'</p>'; | |
| 54 | +	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports & 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 | ||
| 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>'; | 
| @@ -3,8 +3,8 @@ | ||
| 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))); |