Ysurac / FlightAirMap

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);

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);

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">';

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

header.php

Spacing +22 added lines, -22 removed lines

@@ -8,31 +8,31 @@ 
 if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
 else $MapType = $globalMapProvider;
 if (isset($_GET['3d'])) {
-	setcookie('MapFormat','3d');
+	setcookie('MapFormat', '3d');
 } else if (isset($_GET['2d'])) {
-	setcookie('MapFormat','2d');
+	setcookie('MapFormat', '2d');
 }
 
 if (isset($_POST['archive'])) {
-	setcookie('archive','true');
-	setcookie('archive_begin',strtotime($_POST['start_date']));
-	setcookie('archive_end',strtotime($_POST['end_date']));
-	setcookie('archive_speed',$_POST['archivespeed']);
+	setcookie('archive', 'true');
+	setcookie('archive_begin', strtotime($_POST['start_date']));
+	setcookie('archive_end', strtotime($_POST['end_date']));
+	setcookie('archive_speed', $_POST['archivespeed']);
 }
 if (isset($_POST['noarchive'])) {
-	setcookie('archive','false',-1);
-	setcookie('archive_begin','',-1);
-	setcookie('archive_end','',-1);
-	setcookie('archive_speed','',-1);
+	setcookie('archive', 'false', -1);
+	setcookie('archive_begin', '', -1);
+	setcookie('archive_end', '', -1);
+	setcookie('archive_speed', '', -1);
 }
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
-	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+	$allfilters = array_filter(array_keys($_COOKIE), function($key) {
+	    return strpos($key, 'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
-		setcookie($filt,null,-1);
+		setcookie($filt, null, -1);
 	}
 }
 ?>
@@ -240,7 +240,7 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (!isset($type) || $type == 'aircraft') {
 ?>
@@ -310,7 +310,7 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -589,7 +589,7 @@ 
 ?>
       <div class="search">
       <form action="<?php print $globalURL; ?>/search" method="get">
-		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
+		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
 	</form>
 	</div>
   	<div class="social">
@@ -607,7 +607,7 @@ 
 	print '</div>';
 }
 
-if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') {
+if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') {
 ?>
     <div class="top-header clear" role="main">
 <?php
@@ -620,7 +620,7 @@ 
     </div>
 <?php
 }
-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
 {
     ?>
     <div class="top-header clear" role="main">
@@ -633,15 +633,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+    if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+    } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -649,7 +649,7 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php

js/map-marine.2d.js.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -16,10 +16,10 @@ 
 
 <?php
 	if (isset($_GET['fammarine_id'])) {
-		$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($fammarine_id)) {
 ?>
@@ -182,7 +182,7 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -198,7 +198,7 @@ 
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -231,7 +231,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -279,7 +279,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

js/map-tracker.2d.js.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -17,10 +17,10 @@ 
 
 <?php
 	if (isset($_GET['famtrackid'])) {
-		$famtrackid = filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING);
+		$famtrackid = filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($famtrackid)) {
 ?>
@@ -182,7 +182,7 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -198,7 +198,7 @@ 
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -231,7 +231,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -279,7 +279,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

require/class.SBS.php

Spacing +59 added lines, -59 removed lines

@@ -6,83 +6,83 @@ 
 	// Not yet finished, no CRC checks
 	//echo $buffer."\n";
 	$data = array();
-	$typehex = substr($buffer,0,1);
-	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-	else $hex = substr($buffer,1,-1);
-	$bin = gmp_strval( gmp_init($hex,16), 2);
+	$typehex = substr($buffer, 0, 1);
+	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1, -1);
+	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -13);
+	else $hex = substr($buffer, 1, -1);
+	$bin = gmp_strval(gmp_init($hex, 16), 2);
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 	if (strlen($hex) == 28) {
-	    $df = intval(substr($bin,0,5),2);
+	    $df = intval(substr($bin, 0, 5), 2);
 	    //$ca = intval(substr($bin,5,3),2);
 	    // Only support DF17 for now
 	    //if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
-	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
-		$icao = substr($hex,2,6);
+	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex, $bin) || $typehex == '@')) {
+		$icao = substr($hex, 2, 6);
 		$data['hex'] = $icao;
-		$tc = intval(substr($bin,32,5),2);
+		$tc = intval(substr($bin, 32, 5), 2);
 		if ($tc >= 1 && $tc <= 4) {
 		    //callsign
-		    $csbin = substr($bin,40,56);
+		    $csbin = substr($bin, 40, 56);
 		    $charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
 		    $cs = '';
-		    $cs .= $charset[intval(substr($csbin,0,6),2)];
-		    $cs .= $charset[intval(substr($csbin,6,6),2)];
-		    $cs .= $charset[intval(substr($csbin,12,6),2)];
-		    $cs .= $charset[intval(substr($csbin,18,6),2)];
-		    $cs .= $charset[intval(substr($csbin,24,6),2)];
-		    $cs .= $charset[intval(substr($csbin,30,6),2)];
-		    $cs .= $charset[intval(substr($csbin,36,6),2)];
-		    $cs .= $charset[intval(substr($csbin,42,6),2)];
-		    $cs = str_replace('_','',$cs);
-		    $cs = str_replace('#','',$cs);
+		    $cs .= $charset[intval(substr($csbin, 0, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 6, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 12, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 18, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 24, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 30, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 36, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 42, 6), 2)];
+		    $cs = str_replace('_', '', $cs);
+		    $cs = str_replace('#', '', $cs);
 		    $callsign = $cs;
 		    $data['ident'] = $callsign;
 		} elseif ($tc >= 9 && $tc <= 18) {
 		    // Check Q-bit
-		    $q = substr($bin,47,1);
+		    $q = substr($bin, 47, 1);
 		    if ($q) {
-			$n = intval(substr($bin,40,7).substr($bin,48,4),2);
-			$alt = $n*25-1000;
+			$n = intval(substr($bin, 40, 7).substr($bin, 48, 4), 2);
+			$alt = $n*25 - 1000;
 			$data['altitude'] = $alt;
 		    }
 		    // Check odd/even flag
-		    $oe = substr($bin,53,1);
+		    $oe = substr($bin, 53, 1);
 		    //if ($oe) => odd else even
 		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
-		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
-		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+		    $cprlat = intval(substr($bin, 54, 17), 2)/131072.0;
+		    $cprlon = intval(substr($bin, 71, 17), 2)/131072.0;
+		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat, 'longitude' => $cprlon, 'created' => time());
 		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
 			$cprlon_even = $this::$latlon[$icao]['longitude'];
 		    
-			$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
-			$lat_even = (360.0/60)*($j%60+$cprlat_even);
-			$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
+			$j = 59*$cprlat_even - 60*$cprlat_odd + 0.5;
+			$lat_even = (360.0/60)*($j%60 + $cprlat_even);
+			$lat_odd = (360.0/59)*($j%59 + $cprlat_odd);
 			if ($lat_even >= 270) $lat_even = $lat_even - 360;
 			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
 			// check latitude zone
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 			    if ($this::$latlon[$icao]['created'] > time()) {
-				$ni = $this->cprN($lat_even,0);
-				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
+				$ni = $this->cprN($lat_even, 0);
+				$m = floor($cprlon_even*($this->cprNL($lat_even) - 1) - $cprlon_odd*$this->cprNL($lat_even) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_even);
 				$lat = $lat_even;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 				    $data['latitude'] = $lat;
 				    $data['longitude'] = $lon;
 				}
 			    } else {
-				$ni = $this->cprN($lat_odd,1);
-				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
+				$ni = $this->cprN($lat_odd, 1);
+				$m = floor($cprlon_even*($this->cprNL($lat_odd) - 1) - $cprlon_odd*$this->cprNL($lat_odd) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_odd);
 				$lat = $lat_odd;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 				    $data['latitude'] = $lat;
@@ -94,15 +94,15 @@ 
 		    }
 		} elseif ($tc == 19) {
 		    // speed & heading
-		    $v_ew_dir = intval(substr($bin,45,1));
-		    $v_ew = intval(substr($bin,46,10),2);
-		    $v_ns_dir = intval(substr($bin,56,1));
-		    $v_ns = intval(substr($bin,57,10),2);
+		    $v_ew_dir = intval(substr($bin, 45, 1));
+		    $v_ew = intval(substr($bin, 46, 10), 2);
+		    $v_ns_dir = intval(substr($bin, 56, 1));
+		    $v_ns = intval(substr($bin, 57, 10), 2);
 		    if ($v_ew_dir) $v_ew = -1*$v_ew;
 		    if ($v_ns_dir) $v_ns = -1*$v_ns;
-		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
-		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-		    if ($heading <0) $heading = $heading+360;
+		    $speed = sqrt($v_ns*$v_ns + $v_ew*$v_ew);
+		    $heading = atan2($v_ew, $v_ns)*360.0/(2*pi());
+		    if ($heading < 0) $heading = $heading + 360;
 		    $data['speed'] = $speed;
 		    $data['heading'] = $heading;
 		}
@@ -117,7 +117,7 @@ 
 
 	public function cprNL($lat) {
 	//Lookup table to convert the latitude to index.
-	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
+	if ($lat < 0) $lat = -$lat; // Table is simmetric about the equator.
 	if ($lat < 10.47047130) return 59;
 	if ($lat < 14.82817437) return 58;
 	if ($lat < 18.18626357) return 57;
@@ -179,7 +179,7 @@ 
 	return 1;
     }
     
-    public function cprN($lat,$isodd) {
+    public function cprN($lat, $isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
 	if ($nl > 1) return $nl;
 	else return 1;
@@ -205,10 +205,10 @@ 
 );
 
 	$crc = 0;
-	$checksum = intval(substr($msg,22,6),16);
+	$checksum = intval(substr($msg, 22, 6), 16);
 
 	for ($j = 0; $j < strlen($bin); $j++) {
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j], 0);
 	}
 	if ($crc == $checksum) return true;
 	else {
@@ -227,10 +227,10 @@ 
 	    $msg['aircraftid'] = hexdec($data['address']);
 	    $msg['hex'] = $data['address'];
 	    $msg['flightid'] = hexdec($data['address']);
-	    $msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-	    $msg['date_log'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+	    $msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+	    $msg['date_log'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 	    $msg['callsign'] = $data['ident'];
 	    $msg['altitude'] = '';
 	    $msg['speed'] = '';
@@ -243,7 +243,7 @@ 
 	    $msg['emergency'] = '';
 	    $msg['SPI'] = '';
 	    $msg['ground'] = '';
-    	    $result[] = implode(',',$msg);
+    	    $result[] = implode(',', $msg);
     	}
     	if (isset($data['latitude']) && $data['latitude'] != 0) {
 	    $msg = array();
@@ -253,10 +253,10 @@ 
 	    $msg['aircraftid'] = hexdec($data['address']);
 	    $msg['hex'] = $data['address'];
 	    $msg['flightid'] = hexdec($data['address']);
-	    $msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-	    $msg['date_log'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+	    $msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+	    $msg['date_log'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 	    $msg['callsign'] = '';
 	    if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
 	    else $msg['altitude'] = '';
@@ -274,7 +274,7 @@ 
 	    $msg['SPI'] = 0;
 	    if (isset($data['ground'])) $msg['ground'] = 1;
 	    else $msg['ground'] = 0;
-    	    $result[] = implode(',',$msg);
+    	    $result[] = implode(',', $msg);
         }
         return $result;
     }

statistics-month.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 	$Tracker = new Tracker();
 }
 if (!isset($filter_name)) $filter_name = '';
-$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];
 }
@@ -32,20 +32,20 @@ 
 	  </div>
       <p>'._("Below is a chart that plots the busiest day during the <strong>last month</strong>.").'</p>';
 
-if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 elseif ($type == 'marine') $date_array = $Marine->countAllDatesLastMonth();
 elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLastMonth();
 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $month_data = '';
 $month_cnt = '';
-foreach($date_array as $month_item)
+foreach ($date_array as $month_item)
 {
 	$month_data .= '"'.$month_item['date_name'].'",';
 	$month_cnt .= $month_item['date_count'].',';
 }
 $month_data = "['x',".substr($month_data, 0, -1)."]";
-$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 print 'c3.generate({
     bindto: "#chart",
     data: { x: "x",
@@ -56,11 +56,11 @@ 
 //$date_array = $Stats->countAllDates();
 if (!empty($date_array))
 {
-	foreach($date_array as $key => $row) {
+	foreach ($date_array as $key => $row) {
 		$years[$key] = $row['date_name'];
 		$counts[$key] = $row['date_count'];
 	}
-	array_multisort($counts,SORT_DESC,$date_array);
+	array_multisort($counts, SORT_DESC, $date_array);
 	print '<div class="table-responsive">';
 	print '<table class="common-date table-striped">';
 	print '<thead>';
@@ -70,13 +70,13 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
 		print '<td>';
-		if ($type == 'aircraft') print '<a href="'.$globalURL.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
-		else print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
+		if ($type == 'aircraft') print '<a href="'.$globalURL.'/date/'.date('Y-m-d', strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
+		else print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d', strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
 		print '</td>';
 		print '<td>';
 		print $date_item['date_count'];