Ysurac / FlightAirMap

aircraft-statistics-registration.php

Spacing +7 added lines, -7 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -23,9 +23,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByAircraft($aircraft_type);
 	if (!empty($aircraft_array))
@@ -68,7 +68,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

aircraft-statistics-airline.php

Spacing +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@ 
 	header('Location: '.$globalURL.'/aircraft');
 	die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Airlines from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -24,9 +24,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -52,7 +52,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByAircraft($aircraft_type);
 
@@ -70,7 +70,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

aircraft-statistics-route.php

Spacing +7 added lines, -7 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -23,9 +23,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAircraft($aircraft_type);
 	if (!empty($route_array))
@@ -68,7 +68,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

marine-type-detailed.php

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@ 
 require_once('require/class.Language.php');
 $Marine = new Marine();
 $type = 'marine';
-if (!isset($_GET['type'])){
+if (!isset($_GET['type'])) {
 	header('Location: '.$globalURL.'/');
 } else {
 	//calculuation for the pagination
-	if(!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
+	if (!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
 	{
 		$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];
@@ -28,14 +28,14 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$marine_type = filter_input(INPUT_GET,'type',FILTER_SANITIZE_STRING);
+	$marine_type = filter_input(INPUT_GET, 'type', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/marine/type/'.$marine_type;
-	$sort = htmlspecialchars(filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING));
-	$spotter_array = $Marine->getMarineDataByType($marine_type,$limit_start.",".$absolute_difference, $sort);
+	$sort = htmlspecialchars(filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING));
+	$spotter_array = $Marine->getMarineDataByType($marine_type, $limit_start.",".$absolute_difference, $sort);
 	
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['type']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['type']);
 		require_once('header.php');
 	
 	/*    
@@ -75,7 +75,7 @@ 
 		//include('aircraft-sub-menu.php');
 	        
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all marine of type <strong>%s</strong>."),$spotter_array[0]['type']).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all marine of type <strong>%s</strong>."), $spotter_array[0]['type']).'</p>';
 		  
 		include('table-output.php');
 		  

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,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];

aircraft-statistics-departure-airport.php

Spacing +8 added lines, -8 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Departure Airports for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -23,9 +23,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -52,7 +52,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByAircraft($aircraft_type);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -61,7 +61,7 @@ 
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_name'].' ('.$airport_item['airport_departure_icao'].')",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 	}
@@ -116,7 +116,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-sub-menu.php

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 (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
 							print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
 						} else {
@@ -63,7 +63,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">
@@ -74,7 +74,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">
@@ -90,7 +90,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">
@@ -101,7 +101,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">
@@ -110,7 +110,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">
@@ -122,7 +122,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">
@@ -137,7 +137,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">
@@ -161,7 +161,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">
@@ -172,7 +172,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">
@@ -188,7 +188,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">
@@ -200,7 +200,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">
@@ -211,7 +211,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">
@@ -225,7 +225,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">
@@ -241,7 +241,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">

aircraft-statistics-arrival-airport-country.php

Spacing +8 added lines, -8 removed lines

@@ -8,14 +8,14 @@ 
         die();
 }
 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Arrival Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -24,9 +24,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -53,7 +53,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-  	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+  	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAircraft($aircraft_type);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -61,7 +61,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -109,7 +109,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

statistics-type.php

Spacing +5 added lines, -5 removed lines

@@ -7,8 +7,8 @@ 
 
 $type = 'marine';
 if (!isset($filter_name)) $filter_name = '';
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -20,10 +20,10 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common vessel types.").'</p>';
 	  
-$type_array = $Marine->countAllMarineTypes(true,0,'',$filter_name,$year,$month);
+$type_array = $Marine->countAllMarineTypes(true, 0, '', $filter_name, $year, $month);
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $type_data = '';
-foreach($type_array as $type_item)
+foreach ($type_array as $type_item)
 {
 	$type_data .= '["'.$type_item['marine_type'].'",'.$type_item['marine_type_count'].'],';
 }
@@ -48,7 +48,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($type_array as $type_item)
+	foreach ($type_array as $type_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
 $title = _("Statistics").' - '._("Most common Vessel Type");
 
 $type = 'marine';
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 

require/class.AIS.php

Spacing +129 added lines, -129 removed lines

@@ -117,31 +117,31 @@ 
 
 	private function make_latf($temp) { // unsigned long 
 		$flat = 0.0; // float
-		$temp = $temp & 0x07FFFFFF;
-		if ($temp & 0x04000000) {
-			$temp = $temp ^ 0x07FFFFFF;
+		$temp = $temp&0x07FFFFFF;
+		if ($temp&0x04000000) {
+			$temp = $temp^0x07FFFFFF;
 			$temp += 1;
-			$flat = (float)($temp / (60.0 * 10000.0));
+			$flat = (float) ($temp/(60.0*10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else $flat = (float) ($temp/(60.0*10000.0));
 		return $flat; // float
 	}
 
 	private function make_lonf($temp) { // unsigned long
 		$flon = 0.0; // float
-		$temp = $temp & 0x0FFFFFFF;
-		if ($temp & 0x08000000) {
-			$temp = $temp ^ 0x0FFFFFFF;
+		$temp = $temp&0x0FFFFFFF;
+		if ($temp&0x08000000) {
+			$temp = $temp^0x0FFFFFFF;
 			$temp += 1;
-			$flon = (float)($temp / (60.0 * 10000.0));
+			$flon = (float) ($temp/(60.0*10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else $flon = (float) ($temp/(60.0*10000.0));
 		return $flon;
 	}
 
 	private function ascii_2_dec($chr) {
-		$dec=ord($chr);//get decimal ascii code
-		$hex=dechex($dec);//convert decimal to hex
+		$dec = ord($chr); //get decimal ascii code
+		$hex = dechex($dec); //convert decimal to hex
 		return ($dec);
 	}
 	
@@ -160,15 +160,15 @@ 
 		//only process in the following range: 48-87, 96-119
 		if ($ascii < 48) { }
 		else {
-			if($ascii>119) { }
+			if ($ascii > 119) { }
 			else {
-				if ($ascii>87 && $ascii<96) ;
+				if ($ascii > 87 && $ascii < 96);
 				else {
-					$ascii=$ascii+40;
-					if ($ascii>128){
-						$ascii=$ascii+32;
+					$ascii = $ascii + 40;
+					if ($ascii > 128) {
+						$ascii = $ascii + 32;
 					} else {
-						$ascii=$ascii+40;
+						$ascii = $ascii + 40;
 					}
 				}
 			}
@@ -177,7 +177,7 @@ 
 	}
 
 	private function dec_2_6bit($dec) {
-		$bin=decbin($dec);
+		$bin = decbin($dec);
 		return(substr($bin, -6)); 
 	}
 
@@ -195,11 +195,11 @@ 
 		);
 		// "
 		$rv = '';
-		if ($_size % 6 == 0) {
-			$len = $_size / 6;
-			for ($i=0; $i<$len; $i++) {
-				$offset = $i * 6;
-				$rv .= $ais_chars[ bindec(substr($_str,$_start + $offset,6)) ];
+		if ($_size%6 == 0) {
+			$len = $_size/6;
+			for ($i = 0; $i < $len; $i++) {
+				$offset = $i*6;
+				$rv .= $ais_chars[bindec(substr($_str, $_start + $offset, 6))];
 			}
 		}
 		return $rv;
@@ -226,93 +226,93 @@ 
 		$ro->eta_hour = '';
 		$ro->eta_minute = '';
 		$ro->ts = time();
-		$ro->id = bindec(substr($_aisdata,0,6));
-		$ro->mmsi = bindec(substr($_aisdata,8,30));
+		$ro->id = bindec(substr($_aisdata, 0, 6));
+		$ro->mmsi = bindec(substr($_aisdata, 8, 30));
 		if ($ro->id >= 1 && $ro->id <= 3) {
-			$ro->cog = bindec(substr($_aisdata,116,12))/10;
-			$ro->sog = bindec(substr($_aisdata,50,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
+			$ro->cog = bindec(substr($_aisdata, 116, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 50, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 4) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,79,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,107,27)));
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 79, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 107, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 5) {
-			$ro->imo = bindec(substr($_aisdata,40,30));
-			$ro->callsign = $this->binchar($_aisdata,70,42);
-			$ro->name = $this->binchar($_aisdata,112,120);
-			$ro->typeid = bindec(substr($_aisdata,232,8));
+			$ro->imo = bindec(substr($_aisdata, 40, 30));
+			$ro->callsign = $this->binchar($_aisdata, 70, 42);
+			$ro->name = $this->binchar($_aisdata, 112, 120);
+			$ro->typeid = bindec(substr($_aisdata, 232, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,240,9));
 			//$ro->to_stern = bindec(substr($_aisdata,249,9));
 			//$ro->to_port = bindec(substr($_aisdata,258,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,264,6));
-			$ro->eta_month = bindec(substr($_aisdata,274,4));
-			$ro->eta_day = bindec(substr($_aisdata,278,5));
-			$ro->eta_hour = bindec(substr($_aisdata,283,5));
-			$ro->eta_minute = bindec(substr($_aisdata,288,6));
+			$ro->eta_month = bindec(substr($_aisdata, 274, 4));
+			$ro->eta_day = bindec(substr($_aisdata, 278, 5));
+			$ro->eta_hour = bindec(substr($_aisdata, 283, 5));
+			$ro->eta_minute = bindec(substr($_aisdata, 288, 6));
 			//$ro->draught = bindec(substr($_aisdata,294,8));
-			$ro->destination = $this->binchar($_aisdata,302,120);
+			$ro->destination = $this->binchar($_aisdata, 302, 120);
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 9) {
 			// Search and Rescue aircraft position report
 		} else if ($ro->id == 18) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 57, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 85, 27)));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
-			$ro->name = $this->binchar($_aisdata,143,120);
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
+			$ro->name = $this->binchar($_aisdata, 143, 120);
 			$ro->cls = 2; // class B
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
-			$ro->typeid = bindec(substr($_aisdata,263,8));
+			$ro->typeid = bindec(substr($_aisdata, 263, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
 			//$ro->to_stern = bindec(substr($_aisdata,280,9));
 			//$ro->to_port = bindec(substr($_aisdata,289,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,295,6));
 		} else if ($ro->id == 21) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,164,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,192,27)));
-			$ro->name = $this->binchar($_aisdata,43,120);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 164, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 192, 27)));
+			$ro->name = $this->binchar($_aisdata, 43, 120);
 			//$ro->to_bow = bindec(substr($_aisdata,219,9));
 			//$ro->to_stern = bindec(substr($_aisdata,228,9));
 			//$ro->to_port = bindec(substr($_aisdata,237,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,243,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 24) {
-			$pn = bindec(substr($_aisdata,38,2));
+			$pn = bindec(substr($_aisdata, 38, 2));
 			if ($pn == 0) {
-				$ro->name = $this->binchar($_aisdata,40,120);
+				$ro->name = $this->binchar($_aisdata, 40, 120);
 			}
-			$ro->typeid = bindec(substr($_aisdata,40,8));
+			$ro->typeid = bindec(substr($_aisdata, 40, 8));
 			$ro->type = $this->getShipType($ro->typeid);
-			$ro->callsign = $this->binchar($_aisdata,90,42);
+			$ro->callsign = $this->binchar($_aisdata, 90, 42);
 			//$ro->to_bow = bindec(substr($_aisdata,132,9));
 			//$ro->to_stern = bindec(substr($_aisdata,141,9));
 			//$ro->to_port = bindec(substr($_aisdata,150,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,156,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
-			$ro->cog = bindec(substr($_aisdata,85,9));
+			$ro->cog = bindec(substr($_aisdata, 85, 9));
 			if ($ro->cog == 511) $ro->cog = 0.0;
-			$ro->sog = bindec(substr($_aisdata,79,6));
+			$ro->sog = bindec(substr($_aisdata, 79, 6));
 			if ($ro->sog == 63) $ro->sog = 0.0;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 44, 18))*10);
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 62, 17))*10);
 			$ro->cls = 1; // class A
 		
 		}
-		$ro->statusid = bindec(substr($_aisdata,38,4));
+		$ro->statusid = bindec(substr($_aisdata, 38, 4));
 		$ro->status = $this->getStatus($ro->statusid);
 		return $ro;
 	}
@@ -359,7 +359,7 @@ 
 	}
 
 	public function getShipTypeID($type) {
-		$typeid = array_search($type,$this->shiptype);
+		$typeid = array_search($type, $this->shiptype);
 		if ($typeid !== FALSE) return $typeid;
 		else return '';
 	}
@@ -367,14 +367,14 @@ 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
 		global $port; // tcpip port...
 		static $debug_counter = 0;
-		$aisdata168='';//six bit array of ascii characters
+		$aisdata168 = ''; //six bit array of ascii characters
 		$ais_nmea_array = str_split($_itu); // convert to an array
 		foreach ($ais_nmea_array as $value) {
 			$dec = $this->ascii_2_dec($value);
 			$bit8 = $this->asciidec_2_8bit($dec);
 			$bit6 = $this->dec_2_6bit($bit8);
 			//echo $value ."-" .$bit6 ."";
-			$aisdata168 .=$bit6;
+			$aisdata168 .= $bit6;
 		}
 		//echo $aisdata168 . "<br/>";
 		//return $this->decode_ais($aisdata168, $aux);
@@ -397,24 +397,24 @@ 
 		// calculate checksum after ! till *
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
-		$end = strrpos ( $rawdata , '*' );
+		$end = strrpos($rawdata, '*');
 		if ($end === FALSE) return -1; // check for NULLS!!!
-		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
-		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
-		if ( $chksum == $dcs ) { // NMEA checksum pass
+		$cs = substr($rawdata, $end + 1);
+		if (strlen($cs) != 2) return -1; // correct cs length
+		$dcs = (int) hexdec($cs);
+		for ($alias = 1; $alias < $end; $alias++) $chksum ^= ord($rawdata[$alias]); // perform XOR for NMEA checksum
+		if ($chksum == $dcs) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
 			if (!isset($pcs[1])) {
 				echo "ERROR,INVALID_DATA ".time()." $rawdata\n";
 				return -1;
 			}
-			$num_seq = (int)$pcs[1]; // number of sequences
-			$seq = (int)$pcs[2]; // get sequence
+			$num_seq = (int) $pcs[1]; // number of sequences
+			$seq = (int) $pcs[2]; // get sequence
 			// get msg sequence id
 			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			else $msg_sid = (int) $pcs[3]; // multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -447,7 +447,7 @@ 
 					}
 				}
 				$itu = $itu.$pcs[5]; // get itu message
-				$filler += (int)$pcs[6][0]; // get filler
+				$filler += (int) $pcs[6][0]; // get filler
 				if ($num_seq == 1 // valid single message
 				    || $num_seq == $pseq // valid multi-part message
 				) {
@@ -469,13 +469,13 @@ 
 		$cbuf = $cbuf.$ibuf;
 		$last_pos = 0;
 		$result = new stdClass();
-		while ( ($start = strpos($cbuf,"VDM",$last_pos)) !== FALSE) {
+		while (($start = strpos($cbuf, "VDM", $last_pos)) !== FALSE) {
 		//while ( ($start = strpos($cbuf,"!AI",$last_pos)) !== FALSE) {
 			//DEBUG echo $cbuf;
-			if ( ($end = strpos($cbuf,"\r\n", $start)) !== FALSE) { //TBD need to trim?
+			if (($end = strpos($cbuf, "\r\n", $start)) !== FALSE) { //TBD need to trim?
 				$tst = substr($cbuf, $start - 3, ($end - $start + 3));
 				//DEBUG echo "[$start $end $tst]\n";
-				$result = $this->process_ais_raw( $tst, "" );
+				$result = $this->process_ais_raw($tst, "");
 				$last_pos = $end + 1;
 			} else break;
 		}
@@ -487,41 +487,41 @@ 
 	// incoming data from serial or IP comms
 	public function process_ais_line($cbuf) {
 		$result = new stdClass();
-		$start = strpos($cbuf,"VDM");
+		$start = strpos($cbuf, "VDM");
 		$tst = substr($cbuf, $start - 3);
-		$result = $this->process_ais_raw( $tst, "" );
+		$result = $this->process_ais_raw($tst, "");
 		return $result;
 	}
 
 	/* AIS Encoding
 	*/
-	private function mk_ais_lat( $lat ) {
+	private function mk_ais_lat($lat) {
 		//$lat = 1.2569;
-		if ($lat<0.0) {
+		if ($lat < 0.0) {
 			$lat = -$lat;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$latd = 0x00000000;
-		$latd = intval ($lat * 600000.0);
-		if ($neg==true) {
+		$latd = intval($lat*600000.0);
+		if ($neg == true) {
 			$latd = ~$latd;
-			$latd+=1;
+			$latd += 1;
 			$latd &= 0x07FFFFFF;
 		}
 		return $latd;
 	}
 
-	private function mk_ais_lon( $lon ) {
+	private function mk_ais_lon($lon) {
 		//$lon = 103.851;
-		if ($lon<0.0) {
+		if ($lon < 0.0) {
 			$lon = -$lon;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$lond = 0x00000000;
-		$lond = intval ($lon * 600000.0);
-		if ($neg==true) {
+		$lond = intval($lon*600000.0);
+		if ($neg == true) {
 			$lond = ~$lond;
-			$lond+=1;
+			$lond += 1;
 			$lond &= 0x0FFFFFFF;
 		}
 		return $lond;
@@ -529,8 +529,8 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
+		if ($len > $max_len) $name = substr($name, 0, $max_len);
+		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len)*6);
 		else $pad = '';
 		$rv = '';
 		$ais_chars = array(
@@ -547,26 +547,26 @@ 
 		if ($_a) foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
 			else $dec = 0;
-			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
+			$bin = str_pad(decbin($dec), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
 		}
 		return $rv.$pad;
 	}
 
-	private function mk_ais($_enc, $_part=1,$_total=1,$_seq='',$_ch='A') {
+	private function mk_ais($_enc, $_part = 1, $_total = 1, $_seq = '', $_ch = 'A') {
 		$len_bit = strlen($_enc);
-		$rem6 = $len_bit % 6;
+		$rem6 = $len_bit%6;
 		$pad6_len = 0;
 		if ($rem6) $pad6_len = 6 - $rem6;
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
-		$len_enc = strlen($_enc) / 6;
+		$len_enc = strlen($_enc)/6;
 		//echo $_enc.' '.$len_enc.'<br/>';
 		$itu = '';
-		for ($i=0; $i<$len_enc; $i++) {
-			$offset = $i * 6;
-			$dec = bindec(substr($_enc,$offset,6));
+		for ($i = 0; $i < $len_enc; $i++) {
+			$offset = $i*6;
+			$dec = bindec(substr($_enc, $offset, 6));
 			if ($dec < 40) $dec += 48;
 			else $dec += 56;
 			//echo chr($dec)." $dec<br/>";
@@ -576,15 +576,15 @@ 
 		$chksum = 0;
 		$itu = "AIVDM,$_part,$_total,$_seq,$_ch,".$itu.",0";
 		$len_itu = strlen($itu);
-		for ($i=0; $i<$len_itu; $i++) {
-			$chksum ^= ord( $itu[$i] );
+		for ($i = 0; $i < $len_itu; $i++) {
+			$chksum ^= ord($itu[$i]);
 		}
-		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
+		$hex_arr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+		$lsb = $chksum&0x0F;
+		if ($lsb >= 0 && $lsb <= 15) $lsbc = $hex_arr[$lsb];
 		else $lsbc = '0';
-		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
+		$msb = (($chksum&0xF0) >> 4)&0x0F;
+		if ($msb >= 0 && $msb <= 15) $msbc = $hex_arr[$msb];
 		else $msbc = '0';
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
@@ -609,14 +609,14 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
+			if (substr($mmsi, 0, 3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			elseif (substr($mmsi, 0, 3) == '972') return 'MOB (Man Overboard) device';
+			elseif (substr($mmsi, 0, 3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
+			elseif (substr($mmsi, 0, 3) == '111') return 'SAR (Search and Rescue) aircraft';
+			elseif (substr($mmsi, 0, 2) == '98') return 'Auxiliary craft associated with a parent ship';
+			elseif (substr($mmsi, 0, 2) == '99') return 'Aids to Navigation';
+			elseif (substr($mmsi, 0, 2) == '00') return 'Coastal stations';
+			elseif (substr($mmsi, 0, 1) == '0') return 'Group of ships';
 			else return 'Ship';
 		}
 
@@ -627,19 +627,19 @@ 
 		global $globalDebug;
 		$result = array();
 		$data = new stdClass();
-		$start = strpos($buffer,"VDM");
+		$start = strpos($buffer, "VDM");
 		$tst = substr($buffer, $start - 3);
-		$data = $this->process_ais_raw( $tst, "" );
+		$data = $this->process_ais_raw($tst, "");
 		if (!is_object($data)) {
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
 		if ($data->lon != 0) $result['longitude'] = $data->lon;
 		if ($data->lat != 0) $result['latitude'] = $data->lat;
-		$result['ident'] = trim(str_replace('@','',$data->name));
+		$result['ident'] = trim(str_replace('@', '', $data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'], 0, 3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
 		if ($data->sog != -1.0) $result['speed'] = $data->sog;
 		if ($data->heading !== '') $result['heading'] = $data->heading;
@@ -649,16 +649,16 @@ 
 		if ($data->type !== '') $result['type'] = $data->type;
 		if ($data->typeid !== '') $result['typeid'] = $data->typeid;
 		if ($data->imo !== '') $result['imo'] = $data->imo;
-		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign));
+		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@', '', $data->callsign));
 		if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') {
-			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d", $data->eta_month).'-'.sprintf("%02d", $data->eta_day).' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		} elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) {
-			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		}
 		if ($data->destination != '') {
-			$dest = trim(str_replace('@','',$data->destination));
+			$dest = trim(str_replace('@', '', $data->destination));
 			if ($dest != '') $result['destination'] = $dest;
 		}
 		$result['all'] = (array) $data;

Braces +176 added lines, -65 removed lines

@@ -123,7 +123,9 @@ 
 			$temp += 1;
 			$flat = (float)($temp / (60.0 * 10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flat = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flat; // float
 	}
 
@@ -135,7 +137,9 @@ 
 			$temp += 1;
 			$flon = (float)($temp / (60.0 * 10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flon = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flon;
 	}
 
@@ -158,10 +162,8 @@ 
     */
 	private function asciidec_2_8bit($ascii) {
 		//only process in the following range: 48-87, 96-119
-		if ($ascii < 48) { }
-		else {
-			if($ascii>119) { }
-			else {
+		if ($ascii < 48) { } else {
+			if($ascii>119) { } else {
 				if ($ascii>87 && $ascii<96) ;
 				else {
 					$ascii=$ascii+40;
@@ -263,7 +265,9 @@ 
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
 			$ro->cog = bindec(substr($_aisdata,112,12))/10;
@@ -273,7 +277,9 @@ 
 			$ro->name = $this->binchar($_aisdata,143,120);
 			$ro->cls = 2; // class B
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->typeid = bindec(substr($_aisdata,263,8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
@@ -304,9 +310,13 @@ 
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
 			$ro->cog = bindec(substr($_aisdata,85,9));
-			if ($ro->cog == 511) $ro->cog = 0.0;
+			if ($ro->cog == 511) {
+				$ro->cog = 0.0;
+			}
 			$ro->sog = bindec(substr($_aisdata,79,6));
-			if ($ro->sog == 63) $ro->sog = 0.0;
+			if ($ro->sog == 63) {
+				$ro->sog = 0.0;
+			}
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
 			$ro->cls = 1; // class A
@@ -354,14 +364,20 @@ 
 	}
 	
 	public function getShipType($code) {
-		if (isset($this->shiptype[$code])) return $this->shiptype[$code];
-		else return '';
+		if (isset($this->shiptype[$code])) {
+			return $this->shiptype[$code];
+		} else {
+			return '';
+		}
 	}
 
 	public function getShipTypeID($type) {
 		$typeid = array_search($type,$this->shiptype);
-		if ($typeid !== FALSE) return $typeid;
-		else return '';
+		if ($typeid !== FALSE) {
+			return $typeid;
+		} else {
+			return '';
+		}
 	}
 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
@@ -398,11 +414,20 @@ 
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
 		$end = strrpos ( $rawdata , '*' );
-		if ($end === FALSE) return -1; // check for NULLS!!!
+		if ($end === FALSE) {
+			return -1;
+		}
+		// check for NULLS!!!
 		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
+		if ( strlen($cs) != 2 ) {
+			return -1;
+		}
+		// correct cs length
 		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
+		for ( $alias=1; $alias<$end; $alias++) {
+			$chksum ^= ord( $rawdata[$alias] );
+		}
+		// perform XOR for NMEA checksum
 		if ( $chksum == $dcs ) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
@@ -413,8 +438,14 @@ 
 			$num_seq = (int)$pcs[1]; // number of sequences
 			$seq = (int)$pcs[2]; // get sequence
 			// get msg sequence id
-			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			if ($pcs[3] == '') {
+				$msg_sid = -1;
+			}
+			// non-multipart message, set to -1
+			else {
+				$msg_sid = (int)$pcs[3];
+			}
+			// multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -477,10 +508,18 @@ 
 				//DEBUG echo "[$start $end $tst]\n";
 				$result = $this->process_ais_raw( $tst, "" );
 				$last_pos = $end + 1;
-			} else break;
+			} else {
+				break;
+			}
+		}
+		if ($last_pos > 0) {
+			$cbuf = substr($cbuf, $last_pos);
 		}
-		if ($last_pos > 0) $cbuf = substr($cbuf, $last_pos); // move...
-		if (strlen($cbuf) > 1024) $cbuf = ""; // prevent overflow simple mode...
+		// move...
+		if (strlen($cbuf) > 1024) {
+			$cbuf = "";
+		}
+		// prevent overflow simple mode...
 		return $result;
 	}
 
@@ -500,7 +539,9 @@ 
 		if ($lat<0.0) {
 			$lat = -$lat;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$latd = 0x00000000;
 		$latd = intval ($lat * 600000.0);
 		if ($neg==true) {
@@ -516,7 +557,9 @@ 
 		if ($lon<0.0) {
 			$lon = -$lon;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$lond = 0x00000000;
 		$lond = intval ($lon * 600000.0);
 		if ($neg==true) {
@@ -529,9 +572,14 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
-		else $pad = '';
+		if ($len > $max_len) {
+			$name = substr($name,0,$max_len);
+		}
+		if ($len < $max_len) {
+			$pad = str_repeat('0', ($max_len - $len) * 6);
+		} else {
+			$pad = '';
+		}
 		$rv = '';
 		$ais_chars = array(
 		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
@@ -544,9 +592,12 @@ 
 		);
 		// "
 		$_a = str_split($name);
-		if ($_a) foreach ($_a as $_1) {
+		if ($_a) {
+			foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
-			else $dec = 0;
+		} else {
+				$dec = 0;
+			}
 			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
@@ -558,7 +609,9 @@ 
 		$len_bit = strlen($_enc);
 		$rem6 = $len_bit % 6;
 		$pad6_len = 0;
-		if ($rem6) $pad6_len = 6 - $rem6;
+		if ($rem6) {
+			$pad6_len = 6 - $rem6;
+		}
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
 		$len_enc = strlen($_enc) / 6;
@@ -567,8 +620,11 @@ 
 		for ($i=0; $i<$len_enc; $i++) {
 			$offset = $i * 6;
 			$dec = bindec(substr($_enc,$offset,6));
-			if ($dec < 40) $dec += 48;
-			else $dec += 56;
+			if ($dec < 40) {
+				$dec += 48;
+			} else {
+				$dec += 56;
+			}
 			//echo chr($dec)." $dec<br/>";
 			$itu .= chr($dec);
 		}
@@ -581,25 +637,41 @@ 
 		}
 		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
 		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
-		else $lsbc = '0';
+		if ($lsb >=0 && $lsb <= 15 ) {
+			$lsbc = $hex_arr[$lsb];
+		} else {
+			$lsbc = '0';
+		}
 		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
-		else $msbc = '0';
+		if ($msb >=0 && $msb <= 15 ) {
+			$msbc = $hex_arr[$msb];
+		} else {
+			$msbc = '0';
+		}
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
 	}
 
 	public function parse($buffer) {
 		$data = $this->process_ais_buf($buffer);
-		if (!is_object($data)) return array();
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if (!is_object($data)) {
+			return array();
+		}
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim($data->name);
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->cog != 0) $result['heading'] = $data->cog;
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
 		/*
 		    $ro->cls = 0; // AIS class undefined, also indicate unparsed msg
 		    $ro->id = bindec(substr($_aisdata,0,6));
@@ -609,15 +681,25 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
-			else return 'Ship';
+			if (substr($mmsi,0,3) == '974') {
+				return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			} elseif (substr($mmsi,0,3) == '972') {
+				return 'MOB (Man Overboard) device';
+			} elseif (substr($mmsi,0,3) == '970') {
+				return 'AIS SART (Search and Rescue Transmitter)';
+			} elseif (substr($mmsi,0,3) == '111') {
+				return 'SAR (Search and Rescue) aircraft';
+			} elseif (substr($mmsi,0,2) == '98') {
+				return 'Auxiliary craft associated with a parent ship';
+			} elseif (substr($mmsi,0,2) == '99') {
+				return 'Aids to Navigation';
+			} elseif (substr($mmsi,0,2) == '00') {
+				return 'Coastal stations';
+			} elseif (substr($mmsi,0,1) == '0') {
+				return 'Group of ships';
+			} else {
+				return 'Ship';
+			}
 		}
 
 	
@@ -634,32 +716,61 @@ 
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim(str_replace('@','',$data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') {
+			$result['mmsi'] = '3'.$result['mmsi'];
+		}
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->heading !== '') $result['heading'] = $data->heading;
-		elseif ($data->cog != 0) $result['heading'] = $data->cog;
-		if ($data->status != '') $result['status'] = $data->status;
-		if ($data->statusid !== '') $result['statusid'] = $data->statusid;
-		if ($data->type !== '') $result['type'] = $data->type;
-		if ($data->typeid !== '') $result['typeid'] = $data->typeid;
-		if ($data->imo !== '') $result['imo'] = $data->imo;
-		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign));
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->heading !== '') {
+			$result['heading'] = $data->heading;
+		} elseif ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
+		if ($data->status != '') {
+			$result['status'] = $data->status;
+		}
+		if ($data->statusid !== '') {
+			$result['statusid'] = $data->statusid;
+		}
+		if ($data->type !== '') {
+			$result['type'] = $data->type;
+		}
+		if ($data->typeid !== '') {
+			$result['typeid'] = $data->typeid;
+		}
+		if ($data->imo !== '') {
+			$result['imo'] = $data->imo;
+		}
+		if ($data->callsign !== '') {
+			$result['callsign'] = trim(str_replace('@','',$data->callsign));
+		}
 		if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') {
 			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			if ($eta_ts != '') {
+				$result['eta_ts'] = $eta_ts;
+			}
 		} elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) {
 			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			if ($eta_ts != '') {
+				$result['eta_ts'] = $eta_ts;
+			}
 		}
 		if ($data->destination != '') {
 			$dest = trim(str_replace('@','',$data->destination));
-			if ($dest != '') $result['destination'] = $dest;
+			if ($dest != '') {
+				$result['destination'] = $dest;
+			}
 		}
 		$result['all'] = (array) $data;
 		/*