Ysurac / FlightAirMap

manufacturer-sub-menu.php

Spacing +6 added lines, -6 removed lines

@@ -3,9 +3,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/manufacturer/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/manufacturer/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-aircraft" || strtolower($current_page) == "manufacturer-statistics-registration"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-aircraft" || strtolower($current_page) == "manufacturer-statistics-registration") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -14,7 +14,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-airline" || strtolower($current_page) == "manufacturer-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-airline" || strtolower($current_page) == "manufacturer-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -23,7 +23,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-departure-airport" || strtolower($current_page) == "manufacturer-statistics-departure-airport-country" || strtolower($current_page) == "manufacturer-statistics-arrival-airport" || strtolower($current_page) == "manufacturer-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-departure-airport" || strtolower($current_page) == "manufacturer-statistics-departure-airport-country" || strtolower($current_page) == "manufacturer-statistics-arrival-airport" || strtolower($current_page) == "manufacturer-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -33,7 +33,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/arrival-airport-country/<?php print $manufacturer; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/manufacturer/statistics/route/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/manufacturer/statistics/time/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/manufacturer/statistics/route/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/manufacturer/statistics/time/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

ident.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $ident = '';
-if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING);
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST, 'ident', FILTER_SANITIZE_STRING);
+if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 if ($ident != '')
 {
 	if (isset($_GET['marine'])) header('Location: '.$globalURL.'/marine/ident/'.$ident);

Braces +12 added lines, -5 removed lines

@@ -1,13 +1,20 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $ident = '';
-if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING);
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+if (isset($_POST['ident'])) {
+	$ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING);
+}
+if (isset($_GET['ident'])) {
+	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+}
 if ($ident != '')
 {
-	if (isset($_GET['marine'])) header('Location: '.$globalURL.'/marine/ident/'.$ident);
-	else header('Location: '.$globalURL.'/ident/'.$ident);
-} else {
+	if (isset($_GET['marine'])) {
+		header('Location: '.$globalURL.'/marine/ident/'.$ident);
+	} else {
+		header('Location: '.$globalURL.'/ident/'.$ident);
+	}
+	} else {
 	if ($globalURL == '') {
 		header('Location: /');
 	} else {

currently.php

Spacing +9 added lines, -9 removed lines

@@ -4,21 +4,21 @@ 
 
 $type = '';
 if (isset($_GET['marine'])) {
-	require_once('require/class.Marine.php');;
+	require_once('require/class.Marine.php'); ;
 	require_once('require/class.MarineLive.php');
-	$MarineLive=new MarineLive();
+	$MarineLive = new MarineLive();
 	$type = 'marine';
 	$page_url = $globalURL.'/marine/currently';
 } elseif (isset($_GET['tracker'])) {
-	require_once('require/class.Tracker.php');;
+	require_once('require/class.Tracker.php'); ;
 	require_once('require/class.TrackerLive.php');
-	$TrackerLive=new TrackerLive();
+	$TrackerLive = new TrackerLive();
 	$type = 'tracker';
 	$page_url = $globalURL.'/tracker/currently';
 } else {
-	require_once('require/class.Spotter.php');;
+	require_once('require/class.Spotter.php'); ;
 	require_once('require/class.SpotterLive.php');
-	$SpotterLive=new SpotterLive();
+	$SpotterLive = new SpotterLive();
 	$type = 'aircraft';
 	$page_url = $globalURL.'/currently';
 }
@@ -26,12 +26,12 @@ 
 $title = "Current Activity";
 require_once('header.php');
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -54,7 +54,7 @@ 
 elseif ($type == 'marine') print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>';
 elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort);
 	elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort);

Braces +24 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -50,20 +50,32 @@ 
 print '</div>';
 
 print '<div class="table column">';
-if ($type == 'aircraft') print '<p>'._("The table below shows the detailed information of all current flights.").'</p>';
-elseif ($type == 'marine') print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>';
-elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>';
+if ($type == 'aircraft') {
+	print '<p>'._("The table below shows the detailed information of all current flights.").'</p>';
+} elseif ($type == 'marine') {
+	print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>';
+} elseif ($type == 'tracker') {
+	print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>';
+}
 
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 if ($sort != '') {
-	if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort);
-	elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort);
-	elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort);
-} else {
-	if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference);
-	elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference);
-	elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference);
-}
+	if ($type == 'aircraft') {
+		$spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort);
+	} elseif ($type == 'marine') {
+		$spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort);
+	} elseif ($type == 'tracker') {
+		$spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort);
+	}
+	} else {
+	if ($type == 'aircraft') {
+		$spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference);
+	} elseif ($type == 'marine') {
+		$spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference);
+	} elseif ($type == 'tracker') {
+		$spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference);
+	}
+	}
 
 if (!empty($spotter_array))
 {

date.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $type = 'aircraft';
 if (isset($_GET['marine'])) $type = 'marine';
 elseif (isset($_GET['tracker'])) $type = 'tracker';
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 if ($type == 'marine') header('Location: '.$globalURL.'/marine/date/'.$date);
 elseif ($type == 'tracker') header('Location: '.$globalURL.'/tracker/date/'.$date);

Braces +15 added lines, -6 removed lines

@@ -1,11 +1,20 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $type = 'aircraft';
-if (isset($_GET['marine'])) $type = 'marine';
-elseif (isset($_GET['tracker'])) $type = 'tracker';
+if (isset($_GET['marine'])) {
+	$type = 'marine';
+} elseif (isset($_GET['tracker'])) {
+	$type = 'tracker';
+}
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
-if ($type == 'marine') header('Location: '.$globalURL.'/marine/date/'.$date);
-elseif ($type == 'tracker') header('Location: '.$globalURL.'/tracker/date/'.$date);
-else header('Location: '.$globalURL.'/date/'.$date);
+if ($date == '') {
+	$date = date('Y-m-d');
+}
+if ($type == 'marine') {
+	header('Location: '.$globalURL.'/marine/date/'.$date);
+} elseif ($type == 'tracker') {
+	header('Location: '.$globalURL.'/tracker/date/'.$date);
+} else {
+	header('Location: '.$globalURL.'/date/'.$date);
+}
 ?>
\ No newline at end of file

date-detailed.php

Spacing +22 added lines, -22 removed lines

@@ -2,34 +2,34 @@ 
 require_once('require/class.Connection.php');
 require_once('require/class.Language.php');
 $type = '';
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 if (isset($_GET['marine'])) {
-	require_once('require/class.Marine.php');;
+	require_once('require/class.Marine.php'); ;
 	$Marine = new Marine();
 	$type = 'marine';
 	$page_url = $globalURL.'/marine/date/'.$date;
 } elseif (isset($_GET['tracker'])) {
-	require_once('require/class.Tracker.php');;
+	require_once('require/class.Tracker.php'); ;
 	$Tracker = new Tracker();
 	$type = 'tracker';
 	$page_url = $globalURL.'/tracker/date/'.$date;
 } else {
-	require_once('require/class.Spotter.php');;
+	require_once('require/class.Spotter.php'); ;
 	$Spotter = new Spotter();
 	$type = 'aircraft';
 	$page_url = $globalURL.'/date/'.$date;
 }
 
-if (!isset($_GET['date'])){
+if (!isset($_GET['date'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -43,24 +43,24 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') 
 	{
-		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort);
-		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort);
-		else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date, $limit_start.",".$absolute_difference, $sort);
+		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date, $limit_start.",".$absolute_difference, $sort);
+		else $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference, $sort);
 	} else {
-		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference);
-		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference);
-		else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference);
+		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date, $limit_start.",".$absolute_difference);
+		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date, $limit_start.",".$absolute_difference);
+		else $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference);
 	}
 	
 	if (!empty($spotter_array))
 	{
 		date_default_timezone_set($globalTimezone);
-		if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
-		elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
-		else $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		else $title = sprintf(_("Detailed View for flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -78,15 +78,15 @@ 
 		print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 		print '<br />';
 		print '<div class="info column">';
-		if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
-		else print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		else print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 		print '</div>';
 
 		if ($type == 'aircraft') include('date-sub-menu.php');
 		print '<div class="table column">';
-		if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
-		else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
  
 		include('table-output.php');
 		print '<div class="pagination">';

Braces +37 added lines, -16 removed lines

@@ -29,7 +29,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -46,21 +46,33 @@ 
 	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 	if ($sort != '') 
 	{
-		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort);
-		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort);
-		else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		if ($type == 'marine') {
+			$spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		} elseif ($type == 'tracker') {
+			$spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		} else {
+			$spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		}
 	} else {
-		if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference);
-		elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference);
-		else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference);
+		if ($type == 'marine') {
+			$spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference);
+		} elseif ($type == 'tracker') {
+			$spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference);
+		} else {
+			$spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference);
+		}
 	}
 	
 	if (!empty($spotter_array))
 	{
 		date_default_timezone_set($globalTimezone);
-		if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
-		elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
-		else $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		if ($type == 'marine') {
+			$title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		} elseif ($type == 'tracker') {
+			$title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		} else {
+			$title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		}
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -78,15 +90,24 @@ 
 		print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 		print '<br />';
 		print '<div class="info column">';
-		if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
-		else print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		if ($type == 'marine') {
+			print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		} else {
+			print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		}
 		print '</div>';
 
-		if ($type == 'aircraft') include('date-sub-menu.php');
+		if ($type == 'aircraft') {
+			include('date-sub-menu.php');
+		}
 		print '<div class="table column">';
-		if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
-		else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		if ($type == 'marine') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		} elseif ($type == 'tracker') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		} else {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		}
  
 		include('table-output.php');
 		print '<div class="pagination">';

latest.php

Spacing +5 added lines, -5 removed lines

@@ -23,12 +23,12 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -51,7 +51,7 @@ 
 elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all recent trackers.").'</p>';
 else print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 $sql_begin = microtime(true);
 if ($type == 'marine') {
 	$spotter_array = $Marine->getLatestMarineData($limit_start.",".$absolute_difference, $sort);
@@ -60,7 +60,7 @@ 
 } else {
 	$spotter_array = $Spotter->getLatestSpotterData($limit_start.",".$absolute_difference, $sort);
 }
-$sql_time = microtime(true)-$sql_begin;
+$sql_time = microtime(true) - $sql_begin;
 $page_begin = microtime(true);
 if (!empty($spotter_array))
 {
@@ -77,6 +77,6 @@ 
 	print '</div>';
 	print '</div>';
 }
-$page_time = microtime(true)-$page_begin;
+$page_time = microtime(true) - $page_begin;
 require_once('footer.php');
 ?>
\ No newline at end of file

Braces +8 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -47,9 +47,13 @@ 
 print '<h1>'._("Latest Activity").'</h1>';
 print '</div>';
 print '<div class="table column">';
-if ($type == 'marine') print '<p>'._("The table below shows the detailed information of all recent vessels.").'</p>';
-elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all recent trackers.").'</p>';
-else print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>';
+if ($type == 'marine') {
+	print '<p>'._("The table below shows the detailed information of all recent vessels.").'</p>';
+} elseif ($type == 'tracker') {
+	print '<p>'._("The table below shows the detailed information of all recent trackers.").'</p>';
+} else {
+	print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>';
+}
 
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 $sql_begin = microtime(true);

statistics-country.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 }
 $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];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 
 require_once('header.php');

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 } 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 @@ 
 }
 
 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 @@ 
 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 @@ 
 	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>';

Braces +15 added lines, -7 removed lines

@@ -4,7 +4,9 @@ 
 require_once('require/class.Language.php');
 $Stats = new Stats();
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $type = 'aircraft';
 if (isset($_GET['marine'])) {
 	$type = 'marine';
@@ -21,8 +23,10 @@ 
 }
 $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];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -64,10 +68,14 @@ 
 $flightover_data = '';
 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'].'],';
-	elseif ($type == 'tracker') $flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
-}
+	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'].'],';
+	} elseif ($type == 'tracker') {
+		$flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
+	}
+	}
 $flightover_data = substr($flightover_data, 0, -1);
 print $flightover_data;
 print '];';

statistics-sub-menu.php

Indentation +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 ?>
 	</div>
 <?php 
-    if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
+	if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -95,7 +95,7 @@ 
 		    </ul>
 		</li>
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
@@ -107,7 +107,7 @@ 
 		    </ul>
 		</li>
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -127,7 +127,7 @@ 
 	</ul>
 </div>
 <?php
-    } else {
+	} else {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -189,7 +189,7 @@ 
 		</li>
 		-->
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<!--
 		<li class="dropdown">
@@ -203,7 +203,7 @@ 
 		</li>
 		-->
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -224,5 +224,5 @@ 
 	</ul>
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -28,11 +28,11 @@ 
 					$Spotter = new Spotter();
 					$alliances = $Spotter->getAllAllianceNames();
 					if (!empty($alliances)) {
-						foreach($alliances as $alliance) {
-							if (isset($airline_icao) && str_replace('_',' ',str_replace('alliance_','',$airline_icao)) == $alliance['alliance']) {
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
+						foreach ($alliances as $alliance) {
+							if (isset($airline_icao) && str_replace('_', ' ', str_replace('alliance_', '', $airline_icao)) == $alliance['alliance']) {
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
 							} else {
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'">'.$alliance['alliance'].'</option>';
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'">'.$alliance['alliance'].'</option>';
 							}
 						}
 						print '<option disabled>──────────</option>';
@@ -40,7 +40,7 @@ 
 					$Stats = new Stats();
 					if (!isset($filter_name)) $filter_name = '';
 					$airlines = $Stats->getAllAirlineNames($filter_name);
-					foreach($airlines as $airline) {
+					foreach ($airlines as $airline) {
 						if ($airline['airline_icao'] != '') {
 							if (isset($airline_icao) && $airline_icao != 'all' && $airline_icao == $airline['airline_icao']) {
 								print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
@@ -65,7 +65,7 @@ 
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
@@ -76,7 +76,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -92,7 +92,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -103,7 +103,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -112,7 +112,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -124,7 +124,7 @@ 
 		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -139,7 +139,7 @@ 
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 			<?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -169,7 +169,7 @@ 
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
@@ -180,7 +180,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -196,7 +196,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -208,7 +208,7 @@ 
 		</li>
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -219,7 +219,7 @@ 
 		-->
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -233,7 +233,7 @@ 
 		?>
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -249,7 +249,7 @@ 
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">

Braces +110 added lines, -27 removed lines

@@ -6,7 +6,13 @@ 
 	if (!isset($type) || $type != 'satellite') {
 ?>
 		<form id="changedate" method="post">
-			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 		</form>
 <?php
 	}
@@ -38,7 +44,9 @@ 
 						print '<option disabled>──────────</option>';
 					}
 					$Stats = new Stats();
-					if (!isset($filter_name)) $filter_name = '';
+					if (!isset($filter_name)) {
+						$filter_name = '';
+					}
 					$airlines = $Stats->getAllAirlineNames($filter_name);
 					foreach($airlines as $airline) {
 						if ($airline['airline_icao'] != '') {
@@ -69,10 +77,22 @@ 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -83,12 +103,21 @@ 
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -96,10 +125,22 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -107,8 +148,14 @@ 
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Waypoint"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -116,8 +163,14 @@ 
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Date"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Time"); ?></a></li>
 		    </ul>
 		</li>
 		<?php
@@ -173,9 +226,18 @@ 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
 			<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
 		    </ul>
 		</li>
@@ -187,12 +249,21 @@ 
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -200,10 +271,22 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<!--

atc-data.php

Indentation +6 added lines, -6 removed lines

@@ -40,15 +40,15 @@
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
 if ($spotter_item['atc_range'] > 0) {
-    print '<div><span>'._("Range").'</span>';
-    print $spotter_item['atc_range'];
-    print '</div>';
+	print '<div><span>'._("Range").'</span>';
+	print $spotter_item['atc_range'];
+	print '</div>';
 }
 print '</div>';
 if ($spotter_item['info'] != '') {
-    print '<div class="notamtext"><span>'._("Info").'</span>';
-    print $spotter_item['info'];
-    print '</div>';
+	print '<div class="notamtext"><span>'._("Info").'</span>';
+	print $spotter_item['info'];
+	print '</div>';
 }
 print '</div>';
 }

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
 $ATC = new ATC();
 
 if (isset($_GET['atcid'])) {
-	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
-	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
+	$atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT);
+	$atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
 	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
  ?>
@@ -38,7 +38,7 @@ 
 print '</div>';
 
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>';
 if ($spotter_item['atc_range'] > 0) {
     print '<div><span>'._("Range").'</span>';
     print $spotter_item['atc_range'];

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
+	if (!isset($atc_data[0])) {
+		$atc_data = $ATC->getByIdent($atcident);
+	}
  ?>
 <div class="alldetails">
 <button type="button" class="close">&times;</button>