Inspection of "Update to Cesium 1.37, possible to use local Cesiu..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6ab92f...6e8bf5 )

by Yannick

created 2017-09-11 13:47 UTC

Status

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$spotter_array = $Spotter->getAllFlightsforSitemap();
-		foreach($spotter_array as $spotter_item)
+		foreach ($spotter_array as $spotter_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){
+} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-		foreach($aircraft_types as $aircraft_item)
+		foreach ($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
@@ -46,13 +46,13 @@  discard block
 block discarded – undo
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "registration"){
+} else if (isset($_GET['type']) && $_GET['type'] == "registration") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$aircraft_registrations = $Spotter->getAllAircraftRegistrations();
-		foreach($aircraft_registrations as $aircraft_item)
+		foreach ($aircraft_registrations as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airline"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airline") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airline_names = $Stats->getAllAirlineNames();
-		foreach($airline_names as $airline_item)
+		foreach ($airline_names as $airline_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airport"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airport") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airport_names = $Stats->getAllAirportNames();
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
-		foreach($airport_names as $airport_item)
+		foreach ($airport_names as $airport_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){
+} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$manufacturer_names = $Stats->getAllManufacturers();
 	if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
-	foreach($manufacturer_names as $manufacturer_item)
+	foreach ($manufacturer_names as $manufacturer_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>';
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "country"){
+} else if (isset($_GET['type']) && $_GET['type'] == "country") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$country_names = $Spotter->getAllCountries();
-	foreach($country_names as $country_item)
+	foreach ($country_names as $country_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>';
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "ident"){
+} else if (isset($_GET['type']) && $_GET['type'] == "ident") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$ident_names = $Spotter->getAllIdents();
-	foreach($ident_names as $ident_item)
+	foreach ($ident_names as $ident_item)
 	{
 		if (ctype_alnum($ident_item['ident'])) {
 			$output .= '<url>';
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
 		}
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$ident_names = $Marine->getAllIdents();
-	foreach($ident_names as $ident_item)
+	foreach ($ident_names as $ident_item)
 	{
 		if (ctype_alnum($ident_item['ident'])) {
 			$output .= '<url>';
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
 		}
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Spotter->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Marine->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/marine/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -178,11 +178,11 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Tracker->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/tracker/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "route"){
+} else if (isset($_GET['type']) && $_GET['type'] == "route") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$route_names = $Spotter->getAllRoutes();
-	foreach($route_names as $route_item)
+	foreach ($route_names as $route_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
 	$output .= '<changefreq>daily</changefreq>';
 	$output .= '</url>';
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
 	$output .= '<changefreq>daily</changefreq>';
 	$output .= '</url>';
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */

Please login to merge, or discard this patch.

require/class.TrackerArchive.php 1 patch

Spacing +107 added lines, -107 removed lines patch added patch discarded remove patch

@@ -14,33 +14,33 @@  discard block
 block discarded – undo
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -68,38 +68,38 @@  discard block
 block discarded – undo
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
 
 	// tracker_archive
-	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
+	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Tracker.php');
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
-			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
 		// Route is not added in tracker_archive
-		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
+		$query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':comment' => $comment,':type' => $type);
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':comment' => $comment, ':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+                $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident));
 
                 return $spotter_array;
         }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
                 //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
+                $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id));
 
                 return $spotter_array;
         }
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
 	{
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
+                $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
+                $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -223,12 +223,12 @@  discard block
 block discarded – undo
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -302,13 +302,13 @@  discard block
 block discarded – undo
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -325,13 +325,13 @@  discard block
 block discarded – undo
         * @return Array the spotter information
         *
         */
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
+        public function getTrackerArchiveData($ident, $famtrackid, $date)
         {
     		$Tracker = new Tracker($this->db);
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
+                $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%'));
 
                 return $spotter_array;
         }
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -359,24 +359,24 @@  discard block
 block discarded – undo
         * @return Array the spotter information
         *
         */
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
+        public function getMinLiveTrackerData($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -395,14 +395,14 @@  discard block
 block discarded – undo
 						GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid 
 				    AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 */
-			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM tracker_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY famtrackid';
                 } else {
                         //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+                        $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM tracker_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
         * @return Array the spotter information
         *
         */
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
+        public function getMinLiveTrackerDataPlayback($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Should use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
+			$query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
 				    FROM tracker_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
+                        $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -496,23 +496,23 @@  discard block
 block discarded – undo
         * @return Array the spotter information
         *
         */
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
+        public function getLiveTrackerCount($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
     * @return Array the spotter information
     *
     */
-    public function searchTrackerData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+    public function searchTrackerData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
     {
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
 	        
 		$q_array = explode(" ", $q);
 		
-		foreach ($q_array as $q_item){
+		foreach ($q_array as $q_item) {
 		    $additional_query .= " AND (";
 		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
 		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
 	    if (!is_string($registration))
 	    {
 		return false;
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_icao))
 	    {
 		return false;
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_manufacturer))
 	    {
 		return false;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_icao))
 	    {
 		return false;
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_country))
 	    {
 		return false;
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_type))
 	    {
 		return false;
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport))
 	    {
 		return false;
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport_country))
 	    {
 		return false;
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 	    if (!is_string($callsign))
 	    {
 		return false;
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 		} else {
 			$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
 		}
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
 	    if (!is_string($owner))
 	    {
 		return false;
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 	    if (!is_string($pilot_name))
 	    {
 		return false;
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 	    if (!is_string($pilot_id))
 	    {
 		return false;
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($departure_airport_route))
 	    {
 		return false;
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($arrival_airport_route))
 	    {
 		return false;
@@ -784,8 +784,8 @@  discard block
 block discarded – undo
 	{
 	    $altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
 	    if ($altitude_array[1] != "")
@@ -803,8 +803,8 @@  discard block
 block discarded – undo
 	{
 	    $date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
 	    if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
@@ -836,8 +836,8 @@  discard block
 block discarded – undo
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
 	
 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
-		$dist = number_format($dist*0.621371,2,'.','');
-		$query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		$dist = number_format($dist*0.621371, 2, '.', '');
+		$query = "SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 	} else {
@@ -866,12 +866,12 @@  discard block
 block discarded – undo
 			$additional_query .= " AND (tracker_archive_output.waypoints <> '')";
 		}
 
-		$query  = "SELECT tracker_archive_output.* FROM tracker_archive_output 
+		$query = "SELECT tracker_archive_output.* FROM tracker_archive_output 
 		    WHERE tracker_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
 	}
-	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
+	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
     }
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
 	}
@@ -925,8 +925,8 @@  discard block
 block discarded – undo
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -967,7 +967,7 @@  discard block
 block discarded – undo
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -984,8 +984,8 @@  discard block
 block discarded – undo
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1037,8 +1037,8 @@  discard block
 block discarded – undo
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1097,7 +1097,7 @@  discard block
 block discarded – undo
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1161,14 +1161,14 @@  discard block
 block discarded – undo
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveTrackerDataById($id,$date)
+    public function getDateArchiveTrackerDataById($id, $date)
     {
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1178,14 +1178,14 @@  discard block
 block discarded – undo
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
+    public function getDateArchiveTrackerDataByIdent($ident, $date)
     {
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
     * @return Array the spotter information
     *
     */
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
 	global $global_query;
 	$Tracker = new Tracker($this->db);
@@ -1203,7 +1203,7 @@  discard block
 block discarded – undo
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filters,true,true);
+	$filter_query = $this->getFilter($filters, true, true);
 	
 	if ($airport != "")
 	{
@@ -1220,8 +1220,8 @@  discard block
 block discarded – undo
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {

Please login to merge, or discard this patch.

statistics-country.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 } else {
 	$title = _("Statistics").' - '._("Most common Country a flight was over");
 }
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 }
 
 if ($type == 'aircraft') {
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
 } elseif ($type == 'marine') {
 	$flightover_array = $Marine->countAllMarineOverCountries();
 } elseif ($type == 'tracker') {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 print '<div id="chart" class="chart" width="100%"></div><script>';
 print 'var series = [';
 $flightover_data = '';
-foreach($flightover_array as $flightover_item)
+foreach ($flightover_array as $flightover_item)
 {
 	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	array_splice($flightover_array,10);
-	foreach($flightover_array as $flightover_item)
+	array_splice($flightover_array, 10);
+	foreach ($flightover_array as $flightover_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

search.php 1 patch

Spacing +102 added lines, -102 removed lines patch added patch discarded remove patch

@@ -26,24 +26,24 @@  discard block
 block discarded – undo
 $sql_date = '';
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			//$end_date = $_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $start_date.",".$end_date;
 		}
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			$sql_date = $start_date;
 		}
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['end_date']) !== false) {
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $end_date;
 		}
 	} else $sql_date = '';
@@ -51,21 +51,21 @@  discard block
 block discarded – undo
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results']))
 	{
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -112,31 +112,31 @@  discard block
 block discarded – undo
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
     (isset($_GET['dist']) && $_GET['dist'] != ''))
-    ){  
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+    ) {  
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
@@ -145,15 +145,15 @@  discard block
 block discarded – undo
 	if ($archive == 1) {
 		if ($type == 'aircraft') {
 			$SpotterArchive = new SpotterArchive();
-			$spotter_array = $SpotterArchive->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,'',$origlat,$origlon,$dist);
+			$spotter_array = $SpotterArchive->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, '', $origlat, $origlon, $dist);
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$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,'',$origlat,$origlon,$dist);
+			$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, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'tracker') {
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'marine') {
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	}
 	 
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
 	//remove 3D=true parameter
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
-	if (!isset($_GET['3D'])){
+	if (!isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
 	} else {
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
 	}
-	if (isset($_GET['3D'])){
+	if (isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
 	} else {
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
@@ -215,32 +215,32 @@  discard block
 block discarded – undo
 		print '<div class="column">';
 		print '<div class="info">';
 		print '<h1>'._("Search Results for").' ';
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
 		print '</h1>';
 		print '</div>';
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
 					    </select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
 							</select>
 						</div>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
 					</div>
 				</div>
 <?php
-	}else {
+	} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -419,8 +419,8 @@  discard block
 block discarded – undo
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
@@ -452,10 +452,10 @@  discard block
 block discarded – undo
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend>Altitude</legend>
@@ -510,9 +510,9 @@  discard block
 block discarded – undo
 							<option></option>
 <?php
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-foreach($altitude_array as $altitude)
+foreach ($altitude_array as $altitude)
 {
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
 	{
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 	} else {
@@ -530,9 +530,9 @@  discard block
 block discarded – undo
 							<option></option>
 <?php
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-	foreach($altitude_array as $altitude)
+	foreach ($altitude_array as $altitude)
 	{
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
 		{
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 		} else {
@@ -655,10 +655,10 @@  discard block
 block discarded – undo
 				<div class="col-sm-10">
 					<select class="form-control" name="number_results">
 <?php
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
-foreach($number_results_array as $number)
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
+foreach ($number_results_array as $number)
 {
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
 	{
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
 	} else {
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 					<p class="help-block">Disabled in demo</p>
 				</div>
 			</div>
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 				</div>
 			</div>
 		</fieldset>

Please login to merge, or discard this patch.

require/class.Elevation.php 1 patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 			default:
 				throw new \Exception("bad resolution can be only one of 1,3");
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			$this->closeAllFiles();
 		});
 	}
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
 
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 				throw new \Exception("File '{$fileName}' not exists.");
 			}
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
 			if ($file === false) {
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
 			}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 			throw new \Exception("Not implemented yet");
 		}
 		$aRow     = $this->measPerDeg - $row;
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
 		$position *= 2;
 		fseek($file, $position);
 		$short  = fread($file, 2);
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
 		$latSec = $this->getSec($lat);
 		$lonSec = $this->getSec($lon);
 
-		$Xn = round($latSec / $this->resolution, 3);
-		$Yn = round($lonSec / $this->resolution, 3);
+		$Xn = round($latSec/$this->resolution, 3);
+		$Yn = round($lonSec/$this->resolution, 3);
 
 		$a1 = round($Xn);
 		$a2 = round($Yn);
@@ -133,55 +133,55 @@  discard block
 block discarded – undo
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
 
 		return $zN;
 	}
 
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
-		$d   = floor($deg);     // round degrees
+		$d   = floor($deg); // round degrees
 		if ($numPrefix >= 3) {
 			if ($d < 100) {
-				$d = '0' . $d;
+				$d = '0'.$d;
 			}
 		} // pad with leading zeros
 		if ($d < 10) {
-			$d = '0' . $d;
+			$d = '0'.$d;
 		}
 		return $d;
 	}
 
 	private function getSec($deg) {
 		$deg = abs($deg);
-		$sec = round($deg * 3600, 4);
-		$m   = fmod(floor($sec / 60), 60);
+		$sec = round($deg*3600, 4);
+		$m   = fmod(floor($sec/60), 60);
 		$s   = round(fmod($sec, 60), 4);
-		return ($m * 60) + $s;
+		return ($m*60) + $s;
 	}
 
-	public function download($lat,$lon, $debug = false) {
+	public function download($lat, $lon, $debug = false) {
 		$N      = $this->getDeg($lat, 2);
 		$E      = $this->getDeg($lon, 3);
-		$fileName  = "N{$N}E{$E}.hgt";
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+		$fileName = "N{$N}E{$E}.hgt";
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 			$Common = new Common();
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
 				return false;
 			}
 			if ($debug) echo 'Done'."\n";
 			if ($debug) echo 'Decompress '.$fileName.' ....';
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
 			if ($debug) echo 'Done'."\n";
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
 		}
 		return true;
 	}
@@ -194,22 +194,22 @@  discard block
 block discarded – undo
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
 		$query_values = array();
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 	}
 }

Please login to merge, or discard this patch.

airline-statistics-aircraft.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -7,22 +7,22 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 //	$spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>────────────────</option>';
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
 	if ($alliance === false) {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	}
 
 	/*
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 		$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
 	}
 	*/
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
 	if (!empty($aircraft_array))
 	{
 		print '<div class="table-responsive">';
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

owner-statistics-departure-airport-country.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -7,18 +7,18 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Owner of %s"),$spotter_array[0]['aircraft_owner']);
+	$title = sprintf(_("Most Common Departure Airports by Owner of %s"), $spotter_array[0]['aircraft_owner']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
 	include('owner-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
 
-	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner,$filter);
+	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner, $filter);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['airport_departure_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airline-statistics-route.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -7,21 +7,21 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Routes from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Routes from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
 	 print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	if ($alliance) {
-		$route_array = $Spotter->countAllRoutesByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
+		$route_array = $Spotter->countAllRoutesByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
 	} else {
 		$route_array = $Spotter->countAllRoutesByAirline($airline);
 	}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

country-statistics-registration.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 } else {
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by registration from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft by registration from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		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
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>';
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByCountry($country);
 	if (!empty($aircraft_array))
 	{
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
19	19
20	20	$spotter_array = $Spotter->getAllFlightsforSitemap();
21		- foreach($spotter_array as $spotter_item)
	21	+ foreach ($spotter_array as $spotter_item)
22	22	{
23	23	$output .= '<url>';
24	24	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
		@@ -29,13 +29,13 @@ discard block
		block discarded – undo
29	29	$output .= '</urlset>';
30	30
31	31
32		-} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){
	32	+} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") {
33	33
34	34	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
35	35	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
36	36	$aircraft_types = $Stats->getAllAircraftTypes();
37	37	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
38		- foreach($aircraft_types as $aircraft_item)
	38	+ foreach ($aircraft_types as $aircraft_item)
39	39	{
40	40	$output .= '<url>';
41	41	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
		@@ -46,13 +46,13 @@ discard block
		block discarded – undo
46	46	$output .= '</urlset>';
47	47
48	48
49		-} else if (isset($_GET['type']) && $_GET['type'] == "registration"){
	49	+} else if (isset($_GET['type']) && $_GET['type'] == "registration") {
50	50
51	51	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
52	52	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
53	53
54	54	$aircraft_registrations = $Spotter->getAllAircraftRegistrations();
55		- foreach($aircraft_registrations as $aircraft_item)
	55	+ foreach ($aircraft_registrations as $aircraft_item)
56	56	{
57	57	$output .= '<url>';
58	58	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
		@@ -62,13 +62,13 @@ discard block
		block discarded – undo
62	62	}
63	63	$output .= '</urlset>';
64	64
65		-} else if (isset($_GET['type']) && $_GET['type'] == "airline"){
	65	+} else if (isset($_GET['type']) && $_GET['type'] == "airline") {
66	66
67	67	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
68	68	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
69	69
70	70	$airline_names = $Stats->getAllAirlineNames();
71		- foreach($airline_names as $airline_item)
	71	+ foreach ($airline_names as $airline_item)
72	72	{
73	73	$output .= '<url>';
74	74	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
		@@ -78,14 +78,14 @@ discard block
		block discarded – undo
78	78	}
79	79	$output .= '</urlset>';
80	80
81		-} else if (isset($_GET['type']) && $_GET['type'] == "airport"){
	81	+} else if (isset($_GET['type']) && $_GET['type'] == "airport") {
82	82
83	83	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
84	84	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
85	85
86	86	$airport_names = $Stats->getAllAirportNames();
87	87	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
88		- foreach($airport_names as $airport_item)
	88	+ foreach ($airport_names as $airport_item)
89	89	{
90	90	$output .= '<url>';
91	91	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
		@@ -95,12 +95,12 @@ discard block
		block discarded – undo
95	95	}
96	96	$output .= '</urlset>';
97	97
98		-} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){
	98	+} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") {
99	99	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
100	100	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
101	101	$manufacturer_names = $Stats->getAllManufacturers();
102	102	if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
103		- foreach($manufacturer_names as $manufacturer_item)
	103	+ foreach ($manufacturer_names as $manufacturer_item)
104	104	{
105	105	$output .= '<url>';
106	106	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>';
		@@ -109,11 +109,11 @@ discard block
		block discarded – undo
109	109	$output .= '</url>';
110	110	}
111	111	$output .= '</urlset>';
112		-} else if (isset($_GET['type']) && $_GET['type'] == "country"){
	112	+} else if (isset($_GET['type']) && $_GET['type'] == "country") {
113	113	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
114	114	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
115	115	$country_names = $Spotter->getAllCountries();
116		- foreach($country_names as $country_item)
	116	+ foreach ($country_names as $country_item)
117	117	{
118	118	$output .= '<url>';
119	119	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>';
		@@ -122,11 +122,11 @@ discard block
		block discarded – undo
122	122	$output .= '</url>';
123	123	}
124	124	$output .= '</urlset>';
125		-} else if (isset($_GET['type']) && $_GET['type'] == "ident"){
	125	+} else if (isset($_GET['type']) && $_GET['type'] == "ident") {
126	126	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
127	127	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
128	128	$ident_names = $Spotter->getAllIdents();
129		- foreach($ident_names as $ident_item)
	129	+ foreach ($ident_names as $ident_item)
130	130	{
131	131	if (ctype_alnum($ident_item['ident'])) {
132	132	$output .= '<url>';
		@@ -137,11 +137,11 @@ discard block
		block discarded – undo
137	137	}
138	138	}
139	139	$output .= '</urlset>';
140		-} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident"){
	140	+} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident") {
141	141	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
142	142	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
143	143	$ident_names = $Marine->getAllIdents();
144		- foreach($ident_names as $ident_item)
	144	+ foreach ($ident_names as $ident_item)
145	145	{
146	146	if (ctype_alnum($ident_item['ident'])) {
147	147	$output .= '<url>';
		@@ -152,11 +152,11 @@ discard block
		block discarded – undo
152	152	}
153	153	}
154	154	$output .= '</urlset>';
155		-} else if (isset($_GET['type']) && $_GET['type'] == "date"){
	155	+} else if (isset($_GET['type']) && $_GET['type'] == "date") {
156	156	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
157	157	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
158	158	$date_names = $Spotter->getAllDates();
159		- foreach($date_names as $date_item)
	159	+ foreach ($date_names as $date_item)
160	160	{
161	161	$output .= '<url>';
162	162	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
		@@ -165,11 +165,11 @@ discard block
		block discarded – undo
165	165	$output .= '</url>';
166	166	}
167	167	$output .= '</urlset>';
168		-} else if (isset($_GET['type']) && $_GET['type'] == "marine-date"){
	168	+} else if (isset($_GET['type']) && $_GET['type'] == "marine-date") {
169	169	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
170	170	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
171	171	$date_names = $Marine->getAllDates();
172		- foreach($date_names as $date_item)
	172	+ foreach ($date_names as $date_item)
173	173	{
174	174	$output .= '<url>';
175	175	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/marine/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
		@@ -178,11 +178,11 @@ discard block
		block discarded – undo
178	178	$output .= '</url>';
179	179	}
180	180	$output .= '</urlset>';
181		-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date"){
	181	+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date") {
182	182	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
183	183	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
184	184	$date_names = $Tracker->getAllDates();
185		- foreach($date_names as $date_item)
	185	+ foreach ($date_names as $date_item)
186	186	{
187	187	$output .= '<url>';
188	188	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/tracker/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
		@@ -191,11 +191,11 @@ discard block
		block discarded – undo
191	191	$output .= '</url>';
192	192	}
193	193	$output .= '</urlset>';
194		-} else if (isset($_GET['type']) && $_GET['type'] == "route"){
	194	+} else if (isset($_GET['type']) && $_GET['type'] == "route") {
195	195	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
196	196	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
197	197	$route_names = $Spotter->getAllRoutes();
198		- foreach($route_names as $route_item)
	198	+ foreach ($route_names as $route_item)
199	199	{
200	200	$output .= '<url>';
201	201	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	$output .= '</url>';
205	205	}
206	206	$output .= '</urlset>';
207		-} else if (isset($_GET['type']) && $_GET['type'] == "static"){
	207	+} else if (isset($_GET['type']) && $_GET['type'] == "static") {
208	208	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
209	209	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
210	210	/* STATIC PAGES */
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	$output .= '<changefreq>daily</changefreq>';
323	323	$output .= '</url>';
324	324	$output .= '</urlset>';
325		-} else if (isset($_GET['type']) && $_GET['type'] == "marine-static"){
	325	+} else if (isset($_GET['type']) && $_GET['type'] == "marine-static") {
326	326	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
327	327	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
328	328	/* STATIC PAGES */
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	$output .= '<changefreq>daily</changefreq>';
349	349	$output .= '</url>';
350	350	$output .= '</urlset>';
351		-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static"){
	351	+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static") {
352	352	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
353	353	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
354	354	/* STATIC PAGES */

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	} else {
20	20	$title = _("Statistics").' - '._("Most common Country a flight was over");
21	21	}
22		-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
	22	+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
23	23	if ($airline_icao == '' && isset($globalFilter)) {
24	24	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25	25	}
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	}
49	49
50	50	if ($type == 'aircraft') {
51		- $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
	51	+ $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
52	52	} elseif ($type == 'marine') {
53	53	$flightover_array = $Marine->countAllMarineOverCountries();
54	54	} elseif ($type == 'tracker') {
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	print '<div id="chart" class="chart" width="100%"></div><script>';
63	63	print 'var series = [';
64	64	$flightover_data = '';
65		-foreach($flightover_array as $flightover_item)
	65	+foreach ($flightover_array as $flightover_item)
66	66	{
67	67	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
68	68	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
		@@ -113,8 +113,8 @@ discard block
		block discarded – undo
113	113	print '</thead>';
114	114	print '<tbody>';
115	115	$i = 1;
116		- array_splice($flightover_array,10);
117		- foreach($flightover_array as $flightover_item)
	116	+ array_splice($flightover_array, 10);
	117	+ foreach ($flightover_array as $flightover_item)
118	118	{
119	119	print '<tr>';
120	120	print '<td><strong>'.$i.'</strong></td>';

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	default:
42	42	throw new \Exception("bad resolution can be only one of 1,3");
43	43	}
44		- register_shutdown_function(function () {
	44	+ register_shutdown_function(function() {
45	45	$this->closeAllFiles();
46	46	});
47	47	}
		@@ -55,10 +55,10 @@ discard block
		block discarded – undo
55	55
56	56	private function getElevationAtPosition($fileName, $row, $column) {
57	57	if (!array_key_exists($fileName, $this->openedFiles)) {
58		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
	58	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
59	59	throw new \Exception("File '{$fileName}' not exists.");
60	60	}
61		- $file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
	61	+ $file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
62	62	if ($file === false) {
63	63	throw new \Exception("Cant open file '{$fileName}' for reading.");
64	64	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	throw new \Exception("Not implemented yet");
73	73	}
74	74	$aRow = $this->measPerDeg - $row;
75		- $position = ($this->measPerDeg * ($aRow - 1)) + $column;
	75	+ $position = ($this->measPerDeg*($aRow - 1)) + $column;
76	76	$position *= 2;
77	77	fseek($file, $position);
78	78	$short = fread($file, 2);
		@@ -100,8 +100,8 @@ discard block
		block discarded – undo
100	100	$latSec = $this->getSec($lat);
101	101	$lonSec = $this->getSec($lon);
102	102
103		- $Xn = round($latSec / $this->resolution, 3);
104		- $Yn = round($lonSec / $this->resolution, 3);
	103	+ $Xn = round($latSec/$this->resolution, 3);
	104	+ $Yn = round($lonSec/$this->resolution, 3);
105	105
106	106	$a1 = round($Xn);
107	107	$a2 = round($Yn);
		@@ -133,55 +133,55 @@ discard block
		block discarded – undo
133	133	$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
134	134	$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
135	135
136		- $n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
137		- $n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
138		- $n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
	136	+ $n1 = ($c2 - $a2)($b3 - $a3) - ($c3 - $a3)($b2 - $a2);
	137	+ $n2 = ($c3 - $a3)($b1 - $a1) - ($c1 - $a1)($b3 - $a3);
	138	+ $n3 = ($c1 - $a1)($b2 - $a2) - ($c2 - $a2)($b1 - $a1);
139	139
140		- $d = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
141		- $zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
	140	+ $d = -$n1$a1 - $n2$a2 - $n3*$a3;
	141	+ $zN = (-$n1$Xn - $n2$Yn - $d)/$n3;
142	142
143	143	return $zN;
144	144	}
145	145
146	146	private function getDeg($deg, $numPrefix) {
147	147	$deg = abs($deg);
148		- $d = floor($deg); // round degrees
	148	+ $d = floor($deg); // round degrees
149	149	if ($numPrefix >= 3) {
150	150	if ($d < 100) {
151		- $d = '0' . $d;
	151	+ $d = '0'.$d;
152	152	}
153	153	} // pad with leading zeros
154	154	if ($d < 10) {
155		- $d = '0' . $d;
	155	+ $d = '0'.$d;
156	156	}
157	157	return $d;
158	158	}
159	159
160	160	private function getSec($deg) {
161	161	$deg = abs($deg);
162		- $sec = round($deg * 3600, 4);
163		- $m = fmod(floor($sec / 60), 60);
	162	+ $sec = round($deg*3600, 4);
	163	+ $m = fmod(floor($sec/60), 60);
164	164	$s = round(fmod($sec, 60), 4);
165		- return ($m * 60) + $s;
	165	+ return ($m*60) + $s;
166	166	}
167	167
168		- public function download($lat,$lon, $debug = false) {
	168	+ public function download($lat, $lon, $debug = false) {
169	169	$N = $this->getDeg($lat, 2);
170	170	$E = $this->getDeg($lon, 3);
171		- $fileName = "N{$N}E{$E}.hgt";
172		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
	171	+ $fileName = "N{$N}E{$E}.hgt";
	172	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
173	173	$Common = new Common();
174	174	if ($debug) echo 'Downloading '.$fileName.'.gz ...';
175		- $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
	175	+ $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
	176	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
177	177	if ($debug) echo "File '{$fileName}.gz' not exists.";
178	178	return false;
179	179	}
180	180	if ($debug) echo 'Done'."\n";
181	181	if ($debug) echo 'Decompress '.$fileName.' ....';
182		- $Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
	182	+ $Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
183	183	if ($debug) echo 'Done'."\n";
184		- unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
	184	+ unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
185	185	}
186	186	return true;
187	187	}
		@@ -194,22 +194,22 @@ discard block
		block discarded – undo
194	194	try {
195	195	$sth = $db->prepare($query);
196	196	$sth->execute($query_values);
197		- } catch(PDOException $e) {
	197	+ } catch (PDOException $e) {
198	198	return "error : ".$e->getMessage();
199	199	}
200	200	while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
201		- $this->download($data['latitude'],$data['longitude'],true);
	201	+ $this->download($data['latitude'], $data['longitude'], true);
202	202	}
203	203	$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
204	204	$query_values = array();
205	205	try {
206	206	$sth = $db->prepare($query);
207	207	$sth->execute($query_values);
208		- } catch(PDOException $e) {
	208	+ } catch (PDOException $e) {
209	209	return "error : ".$e->getMessage();
210	210	}
211	211	while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
212		- $this->download($data['latitude'],$data['longitude'],true);
	212	+ $this->download($data['latitude'], $data['longitude'], true);
213	213	}
214	214	}
215	215	}

		@@ -7,22 +7,22 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airline');
8	8	die();
9	9	}
10		-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
	10	+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
11	11	$Spotter = new Spotter();
12	12	$alliance = false;
13		-if (strpos($airline,'alliance_') !== FALSE) {
	13	+if (strpos($airline, 'alliance_') !== FALSE) {
14	14	// $spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
15	15	$alliance = true;
16	16	} else {
17		- $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	17	+ $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
18	18	}
19	19
20	20	if (!empty($spotter_array) \|\| $alliance === true)
21	21	{
22	22	if ($alliance) {
23		- $title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
	23	+ $title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
24	24	} else {
25		- $title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	25	+ $title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
26	26	}
27	27	require_once('header.php');
28	28	print '<div class="select-item">';
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	$alliances = $Spotter->getAllAllianceNames();
33	33	if (!empty($alliances)) {
34	34	foreach ($alliances as $al) {
35		- if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
36		- print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
	35	+ if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
	36	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
37	37	} else {
38		- print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
	38	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
39	39	}
40	40	}
41	41	print '<option disabled>────────────────</option>';
		@@ -43,9 +43,9 @@ discard block
		block discarded – undo
43	43	$Stats = new Stats();
44	44	$airline_names = $Stats->getAllAirlineNames();
45	45	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
46		- foreach($airline_names as $airline_name)
	46	+ foreach ($airline_names as $airline_name)
47	47	{
48		- if($airline == $airline_name['airline_icao'])
	48	+ if ($airline == $airline_name['airline_icao'])
49	49	{
50	50	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
51	51	} else {
		@@ -79,12 +79,12 @@ discard block
		block discarded – undo
79	79	print '</div>';
80	80	} else {
81	81	print '<div class="info column">';
82		- print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
83		- if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
	82	+ print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
	83	+ if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
84	84	{
85		- print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
	85	+ print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
86	86	}
87		- print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
	87	+ print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
88	88	print '</div>';
89	89	}
90	90	} else {
		@@ -95,9 +95,9 @@ discard block
		block discarded – undo
95	95	print '<div class="column">';
96	96	print '<h2>'._("Most Common Aircraft").'</h2>';
97	97	if ($alliance === false) {
98		- print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	98	+ print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
99	99	} else {
100		- print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
	100	+ print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
101	101	}
102	102
103	103	/*
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
108	108	}
109	109	*/
110		- $aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
	110	+ $aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
111	111	if (!empty($aircraft_array))
112	112	{
113	113	print '<div class="table-responsive">';
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	print '</thead>';
121	121	print '<tbody>';
122	122	$i = 1;
123		- foreach($aircraft_array as $aircraft_item)
	123	+ foreach ($aircraft_array as $aircraft_item)
124	124	{
125	125	print '<tr>';
126	126	print '<td><strong>'.$i.'</strong></td>';

		@@ -7,18 +7,18 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
11		-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
12		-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
13		-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
	10	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	11	+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
	12	+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
	13	+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
14	14	$filter = array();
15		-if ($year != '') $filter = array_merge($filter,array('year' => $year));
16		-if ($month != '') $filter = array_merge($filter,array('month' => $month));
17		-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
	15	+if ($year != '') $filter = array_merge($filter, array('year' => $year));
	16	+if ($month != '') $filter = array_merge($filter, array('month' => $month));
	17	+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
18	18
19	19	if (!empty($spotter_array))
20	20	{
21		- $title = sprintf(_("Most Common Departure Airports by Owner of %s"),$spotter_array[0]['aircraft_owner']);
	21	+ $title = sprintf(_("Most Common Departure Airports by Owner of %s"), $spotter_array[0]['aircraft_owner']);
22	22	require_once('header.php');
23	23	print '<div class="info column">';
24	24	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
		@@ -28,16 +28,16 @@ discard block
		block discarded – undo
28	28	include('owner-sub-menu.php');
29	29	print '<div class="column">';
30	30	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
31		- print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
	31	+ print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
32	32
33		- $airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner,$filter);
	33	+ $airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner, $filter);
34	34	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
35	35	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
36	36	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
37	37	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
38	38	print 'var series = [';
39	39	$country_data = '';
40		- foreach($airport_country_array as $airport_item)
	40	+ foreach ($airport_country_array as $airport_item)
41	41	{
42	42	$country_data .= '[ "'.$airport_item['airport_departure_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
43	43	}
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	print '</thead>';
85	85	print '<tbody>';
86	86	$i = 1;
87		- foreach($airport_country_array as $airport_item)
	87	+ foreach ($airport_country_array as $airport_item)
88	88	{
89	89	print '<tr>';
90	90	print '<td><strong>'.$i.'</strong></td>';

		@@ -7,21 +7,21 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airline');
8	8	die();
9	9	}
10		-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
	10	+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
11	11	$Spotter = new Spotter();
12	12	$alliance = false;
13		-if (strpos($airline,'alliance_') !== FALSE) {
	13	+if (strpos($airline, 'alliance_') !== FALSE) {
14	14	$alliance = true;
15	15	} else {
16		- $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	16	+ $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
17	17	}
18	18
19	19	if (!empty($spotter_array) \|\| $alliance === true)
20	20	{
21	21	if ($alliance) {
22		- $title = sprintf(_("Most Common Routes from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
	22	+ $title = sprintf(_("Most Common Routes from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
23	23	} else {
24		- $title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	24	+ $title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
25	25	}
26	26	require_once('header.php');
27	27	print '<div class="select-item">';
		@@ -31,10 +31,10 @@ discard block
		block discarded – undo
31	31	$alliances = $Spotter->getAllAllianceNames();
32	32	if (!empty($alliances)) {
33	33	foreach ($alliances as $al) {
34		- if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
35		- print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
	34	+ if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
	35	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
36	36	} else {
37		- print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
	37	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
38	38	}
39	39	}
40	40	print '<option disabled>───────────────────</option>';
		@@ -42,9 +42,9 @@ discard block
		block discarded – undo
42	42	$Stats = new Stats();
43	43	$airline_names = $Stats->getAllAirlineNames();
44	44	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
45		- foreach($airline_names as $airline_name)
	45	+ foreach ($airline_names as $airline_name)
46	46	{
47		- if($airline == $airline_name['airline_icao'])
	47	+ if ($airline == $airline_name['airline_icao'])
48	48	{
49	49	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
50	50	} else {
		@@ -78,12 +78,12 @@ discard block
		block discarded – undo
78	78	print '</div>';
79	79	} else {
80	80	print '<div class="info column">';
81		- print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
82		- if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
	81	+ print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
	82	+ if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
83	83	{
84		- print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
	84	+ print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
85	85	}
86		- print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
	86	+ print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
87	87	print '</div>';
88	88	}
89	89	} else {
		@@ -94,12 +94,12 @@ discard block
		block discarded – undo
94	94	print '<div class="column">';
95	95	print '<h2>'._("Most Common Routes").'</h2>';
96	96	if ($alliance) {
97		- print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
	97	+ print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
98	98	} else {
99		- print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	99	+ print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
100	100	}
101	101	if ($alliance) {
102		- $route_array = $Spotter->countAllRoutesByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
	102	+ $route_array = $Spotter->countAllRoutesByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
103	103	} else {
104	104	$route_array = $Spotter->countAllRoutesByAirline($airline);
105	105	}
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	print '</thead>';
118	118	print '<tbody>';
119	119	$i = 1;
120		- foreach($route_array as $route_item)
	120	+ foreach ($route_array as $route_item)
121	121	{
122	122	print '<tr>';
123	123	print '<td><strong>'.$i.'</strong></td>';

		@@ -7,8 +7,8 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	10	+$country = ucwords(str_replace("-", " ", urldecode(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
		block discarded – undo
17	17
18	18	if (!empty($spotter_array))
19	19	{
20		- $title = sprintf(_("Most Common Aircraft by registration from %s"),$country);
	20	+ $title = sprintf(_("Most Common Aircraft by registration 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
		block discarded – undo
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
		block discarded – undo
50	50	include('country-sub-menu.php');
51	51	print '<div class="column">';
52	52	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
53		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>';
	53	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>';
54	54	$aircraft_array = $Spotter->countAllAircraftRegistrationByCountry($country);
55	55	if (!empty($aircraft_array))
56	56	{
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	print '</thead>';
66	66	print '<tbody>';
67	67	$i = 1;
68		- foreach($aircraft_array as $aircraft_item)
	68	+ foreach ($aircraft_array as $aircraft_item)
69	69	{
70	70	print '<tr>';
71	71	print '<td><strong>'.$i.'</strong></td>';

Ysurac / FlightAirMap

Push — master ( 6ab92f...6e8bf5 )

Status

Category

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +107 added lines, -107 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +102 added lines, -102 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch