Ysurac / FlightAirMap

news.php

Spacing +4 added lines, -4 removed lines

@@ -14,18 +14,18 @@ 
 else $type = 'global';
 
 //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];
 }
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -59,7 +59,7 @@ 
 if (!empty($anews))
 {
 	$j = 0;
-	foreach($anews as $news) {
+	foreach ($anews as $news) {
 		if ($j > 10) break;
 		$j++;
 		print '<div class="news">';

Braces +21 added lines, -10 removed lines

@@ -7,11 +7,17 @@ 
 $title = _("News");
 require_once('header.php');
 
-if (isset($_GET['tracker'])) $type = 'tracker';
-elseif (isset($_GET['marine'])) $type = 'marine';
-elseif (isset($_GET['aircraft'])) $type = 'aircraft';
-elseif (isset($_GET['satellite'])) $type = 'satellite';
-else $type = 'global';
+if (isset($_GET['tracker'])) {
+	$type = 'tracker';
+} elseif (isset($_GET['marine'])) {
+	$type = 'marine';
+} elseif (isset($_GET['aircraft'])) {
+	$type = 'aircraft';
+} elseif (isset($_GET['satellite'])) {
+	$type = 'satellite';
+} else {
+	$type = 'global';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -19,7 +25,7 @@ 
   $limit_start = 0;
   $limit_end = 25;
   $absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -46,9 +52,12 @@ 
 	$feeds = $globalNewsFeeds[$type];
 } else {
 	$lg = $lang[1];
-	if (isset($globalNewsFeeds[$type][$lg])) $feeds = $globalNewsFeeds[$type][$lg];
-	else $feeds = array_shift($globalNewsFeeds[$type]);
-}
+	if (isset($globalNewsFeeds[$type][$lg])) {
+		$feeds = $globalNewsFeeds[$type][$lg];
+	} else {
+		$feeds = array_shift($globalNewsFeeds[$type]);
+	}
+	}
 
 $SimplePie->set_feed_url($feeds);
 $SimplePie->set_cache_duration(3600);
@@ -60,7 +69,9 @@ 
 {
 	$j = 0;
 	foreach($anews as $news) {
-		if ($j > 10) break;
+		if ($j > 10) {
+			break;
+		}
 		$j++;
 		print '<div class="news">';
 		print '<h4><a href="'.$news->get_permalink().'">'.$news->get_title().'</a> <span>('.$news->get_date('j M Y, g:i a').')</span></h4>'."\n";

owner-sub-menu.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 	</form>
 </div>
 <?php
-    if (isset($owner)) {
+	if (isset($owner)) {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
@@ -38,5 +38,5 @@ 
 	</ul>
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-aircraft" || strtolower($current_page) == "owner-statistics-registration" || strtolower($current_page) == "owner-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "owner-statistics-aircraft" || strtolower($current_page) == "owner-statistics-registration" || strtolower($current_page) == "owner-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -23,7 +23,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-departure-airport" || strtolower($current_page) == "owner-statistics-departure-airport-country" || strtolower($current_page) == "owner-statistics-arrival-airport" || strtolower($current_page) == "owner-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "owner-statistics-departure-airport" || strtolower($current_page) == "owner-statistics-departure-airport-country" || strtolower($current_page) == "owner-statistics-arrival-airport" || strtolower($current_page) == "owner-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -33,8 +33,8 @@ 
 			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
 <?php

Braces +77 added lines, -11 removed lines

@@ -3,7 +3,13 @@ 
 </span>
 <div class="stats_airline">
 	<form id="changedate" method="post">
-		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 	</form>
 </div>
 <?php
@@ -11,15 +17,39 @@ 
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-aircraft" || strtolower($current_page) == "owner-statistics-registration" || strtolower($current_page) == "owner-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Aircraft Type"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Registration"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Manufacturer"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Aircraft Type"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -27,14 +57,50 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
 <?php

manufacturer-detailed.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-if (!isset($_GET['aircraft_manufacturer'])){
+if (!isset($_GET['aircraft_manufacturer'])) {
 	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']);
 		if (isset($limit_explode[1])) {
 			$limit_start = $limit_explode[0];
@@ -32,19 +32,19 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))));
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))));
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/manufacturer/'.$manufacturer;
 	
 	if ($sort != '') {
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, $sort);
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, '');
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, '');
 	}
 	
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$manufacturer);
+		$title = sprintf(_("Detailed View for %s"), $manufacturer);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -53,9 +53,9 @@ 
 		$Stats = new Stats();
 		$all_manufacturers = $Stats->getAllManufacturers();
 		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
-		foreach($all_manufacturers as $all_manufacturer)
+		foreach ($all_manufacturers as $all_manufacturer)
 		{
-			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+			if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 			} else {
@@ -72,7 +72,7 @@ 
 		print '</div>';
 
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$manufacturer).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $manufacturer).'</p>';
 
 		include('manufacturer-sub-menu.php');
 		include('table-output.php'); 

Braces +4 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		if (isset($limit_explode[1])) {
 			$limit_start = $limit_explode[0];
@@ -52,7 +52,9 @@ 
 		print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 		$Stats = new Stats();
 		$all_manufacturers = $Stats->getAllManufacturers();
-		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
+		if (empty($all_manufacturers)) {
+			$all_manufacturers = $Spotter->getAllManufacturers();
+		}
 		foreach($all_manufacturers as $all_manufacturer)
 		{
 			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))

tsk-geojson.php

Indentation +11 added lines, -11 removed lines

@@ -23,8 +23,8 @@ 
 		$id = $spotter_item['Waypoint']['@attributes']['id'];
 		if ($id == 0 || !is_numeric($id)) $id = $j;
 		$output .= '{"type": "Feature",';
-		    $output .= '"id": '.$id.',';
-		    $output .= '"properties": {';
+			$output .= '"id": '.$id.',';
+			$output .= '"properties": {';
 			$output .= '"type": "'.$spotter_item['@attributes']['type'].'",';
 			//$output .= '"id": "'.$spotter_item['Waypoint']['@attributes']['id'].'",';
 			$output .= '"name": "'.$spotter_item['Waypoint']['@attributes']['name'].'",';
@@ -35,31 +35,31 @@ 
 			} elseif ($spotter_item['@attributes']['type'] == 'Finish') {
 				$output .= '"icon": "/images/tsk/tsk-finish.png"';
 			} else $output .= '"icon": "/images/tsk/number_'.$id.'.png"';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
+				$output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 		$j++;
 	}
 	// Lines
 	$output .= '{"type": "Feature",';
-	    $output .= '"properties": {';
+		$output .= '"properties": {';
 		$output .= '"type": "'.$spotter_array['@attributes']['type'].'"';
-	    $output .= '},';
-	    $output .= '"geometry": {';
+		$output .= '},';
+		$output .= '"geometry": {';
 		$output .= '"type": "LineString",';
 		$output .= '"coordinates": [';
 	foreach($spotter_array['Point'] as $spotter_item)
 	{
-			    $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
+				$output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
 	}
 	$output  = substr($output, 0, -1);
 		$output .= ']';
-	    $output .= '}';
+		$output .= '}';
 	$output .= '},';
 	$output  = substr($output, 0, -1);
 }

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 }
 header('Content-Type: text/javascript');
 
-$tskfile = filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL);
+$tskfile = filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL);
 
 $spotter_array = $TSK->parse_xml($tskfile);
 
@@ -16,7 +16,7 @@ 
 if (!empty($spotter_array))
 {	  
 	$j = 0;
-	foreach($spotter_array['Point'] as $spotter_item)
+	foreach ($spotter_array['Point'] as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -53,7 +53,7 @@ 
 	    $output .= '"geometry": {';
 		$output .= '"type": "LineString",';
 		$output .= '"coordinates": [';
-	foreach($spotter_array['Point'] as $spotter_item)
+	foreach ($spotter_array['Point'] as $spotter_item)
 	{
 			    $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
 	}

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$id = $spotter_item['Waypoint']['@attributes']['id'];
-		if ($id == 0 || !is_numeric($id)) $id = $j;
+		if ($id == 0 || !is_numeric($id)) {
+			$id = $j;
+		}
 		$output .= '{"type": "Feature",';
 		    $output .= '"id": '.$id.',';
 		    $output .= '"properties": {';
@@ -34,7 +36,9 @@ 
 				$output .= '"icon": "/images/tsk/tsk-start.png"';
 			} elseif ($spotter_item['@attributes']['type'] == 'Finish') {
 				$output .= '"icon": "/images/tsk/tsk-finish.png"';
-			} else $output .= '"icon": "/images/tsk/number_'.$id.'.png"';
+			} else {
+				$output .= '"icon": "/images/tsk/number_'.$id.'.png"';
+			}
 		    $output .= '},';
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';

require/class.APRS.php

Doc Comments +4 added lines

@@ -174,6 +174,10 @@
 		'\|' => 'TNC Stream SW',
 		'\~' => 'TNC Stream SW');
 
+	/**
+	 * @param integer $n
+	 * @param integer $s
+	 */
 	private function urshift($n, $s) {
 		return ($n >= 0) ? ($n >> $s) :
 		    (($n & 0x7fffffff) >> $s) | 

Indentation +2 added lines, -2 removed lines

@@ -176,8 +176,8 @@
 
 	private function urshift($n, $s) {
 		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
-		    (0x40000000 >> ($s - 1));
+			(($n & 0x7fffffff) >> $s) | 
+			(0x40000000 >> ($s - 1));
 	}
 
 	/*

Braces +307 added lines, -110 removed lines

@@ -196,16 +196,22 @@ 
 		
 		/* Check that end was found and body has at least one byte. */
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-			if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+			if ($globalDebug) {
+				echo '!!! APRS invalid : '.$input."\n";
+			}
 			return false;
 		}
 		
-		if ($debug) echo 'input : '.$input."\n";
+		if ($debug) {
+			echo 'input : '.$input."\n";
+		}
 		/* Save header and body. */
 		$body = substr($input,$splitpos+1,$input_len);
 		$body_len = strlen($body);
 		$header = substr($input,0,$splitpos);
-		if ($debug) echo 'header : '.$header."\n";
+		if ($debug) {
+			echo 'header : '.$header."\n";
+		}
 		
 		/* Parse source, target and path. */
 		//FLRDF0A52>APRS,qAS,LSTB
@@ -219,11 +225,15 @@ 
 				$result['format_source'] = 'famaprs';
 				$result['source_type'] = 'ais';
 			} else {
-				if ($debug) echo 'ident : '.$ident."\n";
+				if ($debug) {
+					echo 'ident : '.$ident."\n";
+				}
 				$result['ident'] = $ident;
 			}
 		} else {
-			if ($debug) 'No ident'."\n";
+			if ($debug) {
+				'No ident'."\n";
+			}
 			return false;
 		}
 		$elements = explode(',',$all_elements);
@@ -233,7 +243,9 @@ 
 			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
 			//if ($element == 'TCPIP*') return false;
 			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
-				if ($debug) echo 'element : '.$element."\n";
+				if ($debug) {
+					echo 'element : '.$element."\n";
+				}
 				return false;
 			}
 			/*
@@ -246,13 +258,17 @@ 
 		}
 		
 		$type = substr($body,0,1);
-		if ($debug) echo 'type : '.$type."\n";
+		if ($debug) {
+			echo 'type : '.$type."\n";
+		}
 		if ($type == ';') {
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
 				$result['address'] = trim(substr($body,1,9));
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
 				$result['mmsi'] = trim(substr($body,1,9));
-			} else $result['ident'] = trim(substr($body,1,9));
+			} else {
+				$result['ident'] = trim(substr($body,1,9));
+			}
 		} elseif ($type == ',') {
 			// Invalid data or test data
 			return false;
@@ -309,7 +325,9 @@ 
 			//$symbol_table = $matches[4];
 			$lat = intval($lat_deg);
 			$lon = intval($lon_deg);
-			if ($lat > 89 || $lon > 179) return false;
+			if ($lat > 89 || $lon > 179) {
+				return false;
+			}
 			/*
 			    $tmp_5b = str_replace('.','',$lat_min);
 			    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
@@ -318,8 +336,12 @@ 
 			    */
 			$latitude = $lat + floatval($lat_min)/60;
 			$longitude = $lon + floatval($lon_min)/60;
-			if ($sind == 'S') $latitude = 0-$latitude;
-			if ($wind == 'W') $longitude = 0-$longitude;
+			if ($sind == 'S') {
+				$latitude = 0-$latitude;
+			}
+			if ($wind == 'W') {
+				$longitude = 0-$longitude;
+			}
 			$result['latitude'] = $latitude;
 			$result['longitude'] = $longitude;
 			$body_parse = substr($body_parse,18);
@@ -344,22 +366,29 @@ 
 			if ($find) {
 				$body_split = str_split($body_parse);
 				$symbol_code = $body_split[0];
-				if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code;
-				else $symbol_code = '\\'.$symbol_code;
+				if (!isset($symbolll) || $symbolll == '/') {
+					$symbol_code = '/'.$symbol_code;
+				} else {
+					$symbol_code = '\\'.$symbol_code;
+				}
 				//'
 				//if ($type != ';' && $type != '>') {
 				if ($type != '') {
 					$body_parse = substr($body_parse,1);
 					$body_parse_len = strlen($body_parse);
 					$result['symbol_code'] = $symbol_code;
-					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
+					if (isset($this->symbols[$symbol_code])) {
+						$result['symbol'] = $this->symbols[$symbol_code];
+					}
 					if ($symbol_code != '_') {
 					}
 					if ($body_parse_len >= 7) {
 						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
 							$course = substr($body_parse,0,3);
 							$tmp_s = intval($course);
-							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+							if ($tmp_s >= 1 && $tmp_s <= 360) {
+								$result['heading'] = intval($course);
+							}
 							$speed = substr($body_parse,4,3);
 							if ($speed != '...') {
 								$result['speed'] = intval($speed);
@@ -394,10 +423,16 @@ 
 							$dao_split = str_split($dao);
 							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
 							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
-							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-							else $result['latitude'] += $lat_off;
-							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-							else $result['longitude'] += $lon_off;
+							if ($result['latitude'] < 0) {
+								$result['latitude'] -= $lat_off;
+							} else {
+								$result['latitude'] += $lat_off;
+							}
+							if ($result['longitude'] < 0) {
+								$result['longitude'] -= $lon_off;
+							} else {
+								$result['longitude'] += $lon_off;
+							}
 						}
 						$body_parse = substr($body_parse,6);
 					}
@@ -435,27 +470,48 @@ 
 						//$mode = substr($id,0,2);
 						$address = substr($id,2);
 						$addressType = (intval(substr($id,0,2),16))&3;
-						if ($addressType == 0) $result['addresstype'] = "RANDOM";
-						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
-						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
-						elseif ($addressType == 3) $result['addresstype'] = "OGN";
+						if ($addressType == 0) {
+							$result['addresstype'] = "RANDOM";
+						} elseif ($addressType == 1) {
+							$result['addresstype'] = "ICAO";
+						} elseif ($addressType == 2) {
+							$result['addresstype'] = "FLARM";
+						} elseif ($addressType == 3) {
+							$result['addresstype'] = "OGN";
+						}
 						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
 						$result['aircrafttype_code'] = $aircraftType;
-						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-						elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-						elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-						elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-						elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-						elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-						elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-						elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-						elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-						elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-						elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+						if ($aircraftType == 0) {
+							$result['aircrafttype'] = "UNKNOWN";
+						} elseif ($aircraftType == 1) {
+							$result['aircrafttype'] = "GLIDER";
+						} elseif ($aircraftType == 2) {
+							$result['aircrafttype'] = "TOW_PLANE";
+						} elseif ($aircraftType == 3) {
+							$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+						} elseif ($aircraftType == 4) {
+							$result['aircrafttype'] = "PARACHUTE";
+						} elseif ($aircraftType == 5) {
+							$result['aircrafttype'] = "DROP_PLANE";
+						} elseif ($aircraftType == 6) {
+							$result['aircrafttype'] = "HANG_GLIDER";
+						} elseif ($aircraftType == 7) {
+							$result['aircrafttype'] = "PARA_GLIDER";
+						} elseif ($aircraftType == 8) {
+							$result['aircrafttype'] = "POWERED_AIRCRAFT";
+						} elseif ($aircraftType == 9) {
+							$result['aircrafttype'] = "JET_AIRCRAFT";
+						} elseif ($aircraftType == 10) {
+							$result['aircrafttype'] = "UFO";
+						} elseif ($aircraftType == 11) {
+							$result['aircrafttype'] = "BALLOON";
+						} elseif ($aircraftType == 12) {
+							$result['aircrafttype'] = "AIRSHIP";
+						} elseif ($aircraftType == 13) {
+							$result['aircrafttype'] = "UAV";
+						} elseif ($aircraftType == 15) {
+							$result['aircrafttype'] = "STATIC_OBJECT";
+						}
 						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 						$result['stealth'] = $stealth;
 						$result['address'] = $address;
@@ -490,77 +546,181 @@ 
 					//g012t088r000p000P000h38b10110
 					//g011t086r000p000P000h29b10198
 					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[7] != '...') {
+							$result['pressure'] = round((intval($matches[7])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[7] != '...') {
+							$result['pressure'] = round((intval($matches[7])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[7] != '...') {
+							$result['humidity'] = intval($matches[7]);
+						}
+						if ($matches[6] != '...') {
+							$result['pressure'] = round((intval($matches[6])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['humidity'] = intval($matches[5]);
+						}
+						if ($matches[6] != '...') {
+							$result['pressure'] = round((intval($matches[6])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[2] != '...') {
+							$result['humidity'] = intval($matches[3]);
+						}
+						if ($matches[4] != '...') {
+							$result['pressure'] = round((intval($matches[4])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['humidity'] = intval($matches[4]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					}
 					$result['comment'] = trim($body_parse);
 				}
-			} else $result['comment'] = trim($body_parse);
+			} else {
+				$result['comment'] = trim($body_parse);
+			}
+		}
+		if (isset($result['latitude'])) {
+			$result['latitude'] = round($result['latitude'],4);
+		}
+		if (isset($result['longitude'])) {
+			$result['longitude'] = round($result['longitude'],4);
+		}
+		if ($debug) {
+			print_r($result);
 		}
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
-		if ($debug) print_r($result);
 		return $result;
 	}
 
@@ -572,12 +732,21 @@ 
 		$aprs_connect = 0;
 		$aprs_keep = 120;
 		$aprs_last_tx = time();
-		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
-		else $aprs_pass = '-1';
+		if (isset($globalAPRSversion)) {
+			$aprs_version = $globalAPRSversion;
+		} else {
+			$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+		}
+		if (isset($globalServerAPRSssid)) {
+			$aprs_ssid = $globalServerAPRSssid;
+		} else {
+			$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+		}
+		if (isset($globalServerAPRSpass)) {
+			$aprs_pass = $globalServerAPRSpass;
+		} else {
+			$aprs_pass = '-1';
+		}
 		$aprs_filter  = '';
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 		$Common = new Common();
@@ -616,10 +785,14 @@ 
 	*/
 	public function send($data) {
 		global $globalDebug;
-		if ($this->connected === false) $this->connect();
+		if ($this->connected === false) {
+			$this->connect();
+		}
 		$send = socket_send( $this->socket  , $data , strlen($data),0);
 		if ($send === FALSE) {
-			if ($globalDebug) echo 'Reconnect...';
+			if ($globalDebug) {
+				echo 'Reconnect...';
+			}
 			socket_close($this->socket);
 			$this->connect();
 		}
@@ -642,22 +815,32 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($squawk != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SQ='.$squawk;
 			}
 			if ($verticalrate != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'VR='.$verticalrate;
 			}
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AI='.$aircraft_icao;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			/*
 			// Use AMSL altitude
 			$GeoidClass = new GeoidHeight();
@@ -682,30 +865,44 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.str_replace(' ','_',$ident);
 			}
 			if ($typeid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'TI='.$typeid;
 			}
 			if ($statusid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SI='.$statusid;
 			}
 			if ($imo != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'IMO='.$imo;
 			}
 			if ($arrival_date != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AD='.strtotime($arrival_date);
 			}
 			if ($arrival_code != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$altitude = 0;
 			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}

Spacing +157 added lines, -158 removed lines

@@ -175,8 +175,7 @@ 
 		'\~' => 'TNC Stream SW');
 
 	private function urshift($n, $s) {
-		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
+		return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
 		    (0x40000000 >> ($s - 1));
 	}
 
@@ -192,7 +191,7 @@ 
 		$input_len = strlen($input);
 		
 		/* Find the end of header checking for NULL bytes while doing it. */
-		$splitpos = strpos($input,':');
+		$splitpos = strpos($input, ':');
 		
 		/* Check that end was found and body has at least one byte. */
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -202,14 +201,14 @@ 
 		
 		if ($debug) echo 'input : '.$input."\n";
 		/* Save header and body. */
-		$body = substr($input,$splitpos+1,$input_len);
+		$body = substr($input, $splitpos + 1, $input_len);
 		$body_len = strlen($body);
-		$header = substr($input,0,$splitpos);
+		$header = substr($input, 0, $splitpos);
 		if ($debug) echo 'header : '.$header."\n";
 		
 		/* Parse source, target and path. */
 		//FLRDF0A52>APRS,qAS,LSTB
-		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
+		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
 			$ident = $matches[1];
 			$all_elements = $matches[2];
 			if ($ident == 'AIRCRAFT') {
@@ -226,13 +225,13 @@ 
 			if ($debug) 'No ident'."\n";
 			return false;
 		}
-		$elements = explode(',',$all_elements);
+		$elements = explode(',', $all_elements);
 		$source = end($elements);
 		$result['source'] = $source;
 		foreach ($elements as $element) {
-			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
 			//if ($element == 'TCPIP*') return false;
-			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+			} elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
 				if ($debug) echo 'element : '.$element."\n";
 				return false;
 			}
@@ -245,14 +244,14 @@ 
 			*/
 		}
 		
-		$type = substr($body,0,1);
+		$type = substr($body, 0, 1);
 		if ($debug) echo 'type : '.$type."\n";
 		if ($type == ';') {
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
-				$result['address'] = trim(substr($body,1,9));
+				$result['address'] = trim(substr($body, 1, 9));
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
-				$result['mmsi'] = trim(substr($body,1,9));
-			} else $result['ident'] = trim(substr($body,1,9));
+				$result['mmsi'] = trim(substr($body, 1, 9));
+			} else $result['ident'] = trim(substr($body, 1, 9));
 		} elseif ($type == ',') {
 			// Invalid data or test data
 			return false;
@@ -260,20 +259,20 @@ 
 		
 		// Check for Timestamp
 		$find = false;
-		$body_parse = substr($body,1);
-		if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-			$body_parse = substr($body_parse,10);
+		$body_parse = substr($body, 1);
+		if (preg_match('/^;(.){9}\*/', $body, $matches)) {
+			$body_parse = substr($body_parse, 10);
 			$find = true;
 		}
-		if (preg_match('/^`(.*)\//',$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match('/^`(.*)\//', $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match("/^'(.*)\//",$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match("/^'(.*)\//", $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = $matches[0];
 			if ($matches[4] == 'h') {
@@ -286,17 +285,17 @@ 
 				// This work or not ?
 				$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
 			}
-			$body_parse = substr($body_parse,7);
+			$body_parse = substr($body_parse, 7);
 			$result['timestamp'] = $timestamp;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-			$body_parse = substr($body_parse,8);
+			$body_parse = substr($body_parse, 8);
 			$result['timestamp'] = $timestamp;
 		}
 		//if (strlen($body_parse) > 19) {
-		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
 			$find = true;
 			// 4658.70N/00707.78Ez
 			$sind = strtoupper($matches[3]);
@@ -318,11 +317,11 @@ 
 			    */
 			$latitude = $lat + floatval($lat_min)/60;
 			$longitude = $lon + floatval($lon_min)/60;
-			if ($sind == 'S') $latitude = 0-$latitude;
-			if ($wind == 'W') $longitude = 0-$longitude;
+			if ($sind == 'S') $latitude = 0 - $latitude;
+			if ($wind == 'W') $longitude = 0 - $longitude;
 			$result['latitude'] = $latitude;
 			$result['longitude'] = $longitude;
-			$body_parse = substr($body_parse,18);
+			$body_parse = substr($body_parse, 18);
 			$body_parse_len = strlen($body_parse);
 		}
 		$body_parse_len = strlen($body_parse);
@@ -349,22 +348,22 @@ 
 				//'
 				//if ($type != ';' && $type != '>') {
 				if ($type != '') {
-					$body_parse = substr($body_parse,1);
+					$body_parse = substr($body_parse, 1);
 					$body_parse_len = strlen($body_parse);
 					$result['symbol_code'] = $symbol_code;
 					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 					if ($symbol_code != '_') {
 					}
 					if ($body_parse_len >= 7) {
-						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-							$course = substr($body_parse,0,3);
+						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
+							$course = substr($body_parse, 0, 3);
 							$tmp_s = intval($course);
 							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-							$speed = substr($body_parse,4,3);
+							$speed = substr($body_parse, 4, 3);
 							if ($speed != '...') {
 								$result['speed'] = intval($speed);
 							}
-							$body_parse = substr($body_parse,7);
+							$body_parse = substr($body_parse, 7);
 						}
 						// Check PHGR, PHG, RNG
 					} 
@@ -374,11 +373,11 @@ 
 					}
 					*/
 					if (strlen($body_parse) > 0) {
-						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
 							$altitude = intval($matches[1]);
 							$result['altitude'] = $altitude;
 							//$body_parse = trim(substr($body_parse,strlen($matches[0])));
-							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
 						}
 					}
 					// Telemetry
@@ -388,58 +387,58 @@ 
 					}
 					*/
 					// DAO
-					if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+					if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
 						$dao = $matches[1];
-						if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+						if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
 							$dao_split = str_split($dao);
-							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+							$lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
+							$lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
 							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 							else $result['latitude'] += $lat_off;
 							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 							else $result['longitude'] += $lon_off;
 						}
-						$body_parse = substr($body_parse,6);
+						$body_parse = substr($body_parse, 6);
 					}
-					if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['ident'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['ident'] = str_replace('_', ' ', $matches[1]);
 					}
-					if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+					if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
 						$result['squawk'] = $matches[1];
 					}
-					if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+					if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
 						$result['aircraft_icao'] = $matches[1];
 					}
-					if (preg_match('/VR=([-0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/VR=([-0-9]*)/', $body_parse, $matches)) {
 						$result['verticalrate'] = $matches[1];
 					}
-					if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
 						$result['typeid'] = $matches[1];
 					}
-					if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
 						$result['statusid'] = $matches[1];
 					}
-					if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+					if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
 						$result['imo'] = $matches[1];
 					}
-					if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
 						$result['arrival_date'] = $matches[1];
 					}
-					if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['arrival_code'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
 					}
 					// OGN comment
 					//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-					if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+					if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
 						$id = $matches[1];
 						//$mode = substr($id,0,2);
-						$address = substr($id,2);
-						$addressType = (intval(substr($id,0,2),16))&3;
+						$address = substr($id, 2);
+						$addressType = (intval(substr($id, 0, 2), 16))&3;
 						if ($addressType == 0) $result['addresstype'] = "RANDOM";
 						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
 						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
 						elseif ($addressType == 3) $result['addresstype'] = "OGN";
-						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
+						$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
 						$result['aircrafttype_code'] = $aircraftType;
 						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
 						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -456,110 +455,110 @@ 
 						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
 						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
 						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
-						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
+						$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
 						$result['stealth'] = $stealth;
 						$result['address'] = $address;
 					}
 					//Comment
 					$result['comment'] = trim($body_parse);
 					// parse weather
-					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-						$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-						$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
+						$result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
+						$result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$result['temp'] = round(5/9*(($matches[4])-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
 					}
 					// temperature
 					//g012t088r000p000P000h38b10110
 					//g011t086r000p000P000h29b10198
-					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
 						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
 						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
 					}
 					$result['comment'] = trim($body_parse);
 				}
 			} else $result['comment'] = trim($body_parse);
 		}
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
+		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
+		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
 		if ($debug) print_r($result);
 		return $result;
 	}
@@ -568,34 +567,34 @@ 
 	 * Connect to APRS server
 	*/
 	public function connect() {
-		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
+		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
 		$aprs_connect = 0;
 		$aprs_keep = 120;
 		$aprs_last_tx = time();
 		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+		else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
 		else $aprs_pass = '-1';
-		$aprs_filter  = '';
+		$aprs_filter = '';
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 		$Common = new Common();
-		$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
+		$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
 		if ($s !== false) {
 			echo 'Connected to APRS server! '."\n";
 			$authstart = time();
 			$this->socket = $s;
-			$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
-			socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
-			while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
+			$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
+			socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
+			while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
 				if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
 					echo 'APRS user verified !'."\n";
 					$this->connected = true;
 					return true;
 					break;
 				}
-				if (time()-$authstart > 5) {
+				if (time() - $authstart > 5) {
 					echo 'APRS timeout'."\n";
 					break;
 				}
@@ -617,7 +616,7 @@ 
 	public function send($data) {
 		global $globalDebug;
 		if ($this->connected === false) $this->connect();
-		$send = socket_send( $this->socket  , $data , strlen($data),0);
+		$send = socket_send($this->socket, $data, strlen($data), 0);
 		if ($send === FALSE) {
 			if ($globalDebug) echo 'Reconnect...';
 			socket_close($this->socket);
@@ -627,17 +626,17 @@ 
 }
 
 class APRSSpotter extends APRS {
-	public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
+	public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
 			$lat = $latitude;
 			$long = $longitude;
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
@@ -664,26 +663,26 @@ 
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
 			$altitude_real = round($altitude_real + $geoid);
 			*/
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }
 class APRSMarine extends APRS {
-	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) {
+	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'CS='.str_replace(' ','_',$ident);
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
 			}
 			if ($typeid != '') {
 				if ($custom != '') $custom .= '/';
@@ -703,11 +702,11 @@ 
 			}
 			if ($arrival_code != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
 			}
 			if ($custom != '') $custom = ' '.$custom;
 			$altitude = 0;
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }

require/class.SBS.php

Doc Comments +8 added lines

@@ -190,12 +190,20 @@
 		return 1;
 	}
 
+	/**
+	 * @param double $lat
+	 * @param integer $isodd
+	 */
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
 		if ($nl > 1) return $nl;
 		else return 1;
 	}
 
+	/**
+	 * @param string $msg
+	 * @param string $bin
+	 */
 	private function parityCheck($msg, $bin) {
 		$modes_checksum_table = array(
 		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,

Indentation +14 added lines, -14 removed lines

@@ -198,20 +198,20 @@
 
 	private function parityCheck($msg, $bin) {
 		$modes_checksum_table = array(
-		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
-		    0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
-		    0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
-		    0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
-		    0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
-		    0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
-		    0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
-		    0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
-		    0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
-		    0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
-		    0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
+			0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
+			0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
+			0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
+			0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
+			0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
+			0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
+			0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
+			0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
+			0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
+			0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
+			0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
 		);
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);

Spacing +60 added lines, -60 removed lines

@@ -18,25 +18,25 @@ 
 	public function parse($buffer) {
 		// Not yet finished, no CRC checks
 		$data = array();
-		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1);
+		$typehex = substr($buffer, 0, 1);
+		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1);
 		//elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-1);
-		else $hex = substr($buffer,1,-1);
-		$bin = gmp_strval( gmp_init($hex,16), 2);
+		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -1);
+		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) {
 		//echo strlen($hex);
 		//echo $hex;
 		if (strlen($hex) == 28 || strlen($hex) == 16) {
-			$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) {
 					// Category:
 					// 1 = light aircraft <= 7000 kg
@@ -59,67 +59,67 @@ 
 					// 22 = fixed ground or tethered obstruction
 					// 23 to 24 = reserved
 					//$data['category'] = intval(substr($bin,5,3),2);
-					$data['category'] = intval(substr($bin,37,3),2);
+					$data['category'] = intval(substr($bin, 37, 3), 2);
 					//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;
@@ -131,15 +131,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;
 				}
@@ -154,7 +154,7 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		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;
@@ -216,7 +216,7 @@ 
 		return 1;
 	}
 
-	private function cprN($lat,$isodd) {
+	private function cprN($lat, $isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
 		if ($nl > 1) return $nl;
 		else return 1;
@@ -240,9 +240,9 @@ 
 		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
 		);
 		$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 {
@@ -264,10 +264,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'] = '';
@@ -280,7 +280,7 @@ 
 			$msg['emergency'] = '';
 			$msg['SPI'] = '';
 			$msg['ground'] = '';
-			$result[] = implode(',',$msg);
+			$result[] = implode(',', $msg);
 		}
 		if (isset($data['latitude']) && $data['latitude'] != 0) {
 			$msg = array();
@@ -290,10 +290,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'] = '';
@@ -311,7 +311,7 @@ 
 			$msg['SPI'] = 0;
 			if (isset($data['ground'])) $msg['ground'] = 1;
 			else $msg['ground'] = 0;
-			$result[] = implode(',',$msg);
+			$result[] = implode(',', $msg);
 		}
 		return $result;
 	}

Braces +249 added lines, -87 removed lines

@@ -19,10 +19,15 @@ 
 		// Not yet finished, no CRC checks
 		$data = array();
 		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1);
+		if ($typehex == '*' || $typehex == ':') {
+			$hex = substr($buffer,1);
+		}
 		//elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-1);
-		else $hex = substr($buffer,1,-1);
+		elseif ($typehex == '@' || $typehex == '%') {
+			$hex = substr($buffer,13,-1);
+		} 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) {
@@ -90,8 +95,9 @@ 
 					//  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());
-					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+					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'];
@@ -99,8 +105,12 @@ 
 						$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;
+						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()) {
@@ -108,7 +118,9 @@ 
 								$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;
@@ -119,14 +131,18 @@ 
 								$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;
 									$data['longitude'] = $lon;
 								}
 							}
-						} else echo "Not cprNL";
+						} else {
+							echo "Not cprNL";
+						}
 						unset($this::$latlon[$icao]);
 					}
 				} elseif ($tc == 19) {
@@ -135,11 +151,17 @@ 
 					$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;
+					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;
+					if ($heading <0) {
+						$heading = $heading+360;
+					}
 					$data['speed'] = $speed;
 					$data['heading'] = $heading;
 				}
@@ -154,72 +176,194 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		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;
-		if ($lat < 21.02939493) return 56;
-		if ($lat < 23.54504487) return 55;
-		if ($lat < 25.82924707) return 54;
-		if ($lat < 27.93898710) return 53;
-		if ($lat < 29.91135686) return 52;
-		if ($lat < 31.77209708) return 51;
-		if ($lat < 33.53993436) return 50;
-		if ($lat < 35.22899598) return 49;
-		if ($lat < 36.85025108) return 48;
-		if ($lat < 38.41241892) return 47;
-		if ($lat < 39.92256684) return 46;
-		if ($lat < 41.38651832) return 45;
-		if ($lat < 42.80914012) return 44;
-		if ($lat < 44.19454951) return 43;
-		if ($lat < 45.54626723) return 42;
-		if ($lat < 46.86733252) return 41;
-		if ($lat < 48.16039128) return 40;
-		if ($lat < 49.42776439) return 39;
-		if ($lat < 50.67150166) return 38;
-		if ($lat < 51.89342469) return 37;
-		if ($lat < 53.09516153) return 36;
-		if ($lat < 54.27817472) return 35;
-		if ($lat < 55.44378444) return 34;
-		if ($lat < 56.59318756) return 33;
-		if ($lat < 57.72747354) return 32;
-		if ($lat < 58.84763776) return 31;
-		if ($lat < 59.95459277) return 30;
-		if ($lat < 61.04917774) return 29;
-		if ($lat < 62.13216659) return 28;
-		if ($lat < 63.20427479) return 27;
-		if ($lat < 64.26616523) return 26;
-		if ($lat < 65.31845310) return 25;
-		if ($lat < 66.36171008) return 24;
-		if ($lat < 67.39646774) return 23;
-		if ($lat < 68.42322022) return 22;
-		if ($lat < 69.44242631) return 21;
-		if ($lat < 70.45451075) return 20;
-		if ($lat < 71.45986473) return 19;
-		if ($lat < 72.45884545) return 18;
-		if ($lat < 73.45177442) return 17;
-		if ($lat < 74.43893416) return 16;
-		if ($lat < 75.42056257) return 15;
-		if ($lat < 76.39684391) return 14;
-		if ($lat < 77.36789461) return 13;
-		if ($lat < 78.33374083) return 12;
-		if ($lat < 79.29428225) return 11;
-		if ($lat < 80.24923213) return 10;
-		if ($lat < 81.19801349) return 9;
-		if ($lat < 82.13956981) return 8;
-		if ($lat < 83.07199445) return 7;
-		if ($lat < 83.99173563) return 6;
-		if ($lat < 84.89166191) return 5;
-		if ($lat < 85.75541621) return 4;
-		if ($lat < 86.53536998) return 3;
-		if ($lat < 87.00000000) return 2;
+		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;
+		}
+		if ($lat < 21.02939493) {
+			return 56;
+		}
+		if ($lat < 23.54504487) {
+			return 55;
+		}
+		if ($lat < 25.82924707) {
+			return 54;
+		}
+		if ($lat < 27.93898710) {
+			return 53;
+		}
+		if ($lat < 29.91135686) {
+			return 52;
+		}
+		if ($lat < 31.77209708) {
+			return 51;
+		}
+		if ($lat < 33.53993436) {
+			return 50;
+		}
+		if ($lat < 35.22899598) {
+			return 49;
+		}
+		if ($lat < 36.85025108) {
+			return 48;
+		}
+		if ($lat < 38.41241892) {
+			return 47;
+		}
+		if ($lat < 39.92256684) {
+			return 46;
+		}
+		if ($lat < 41.38651832) {
+			return 45;
+		}
+		if ($lat < 42.80914012) {
+			return 44;
+		}
+		if ($lat < 44.19454951) {
+			return 43;
+		}
+		if ($lat < 45.54626723) {
+			return 42;
+		}
+		if ($lat < 46.86733252) {
+			return 41;
+		}
+		if ($lat < 48.16039128) {
+			return 40;
+		}
+		if ($lat < 49.42776439) {
+			return 39;
+		}
+		if ($lat < 50.67150166) {
+			return 38;
+		}
+		if ($lat < 51.89342469) {
+			return 37;
+		}
+		if ($lat < 53.09516153) {
+			return 36;
+		}
+		if ($lat < 54.27817472) {
+			return 35;
+		}
+		if ($lat < 55.44378444) {
+			return 34;
+		}
+		if ($lat < 56.59318756) {
+			return 33;
+		}
+		if ($lat < 57.72747354) {
+			return 32;
+		}
+		if ($lat < 58.84763776) {
+			return 31;
+		}
+		if ($lat < 59.95459277) {
+			return 30;
+		}
+		if ($lat < 61.04917774) {
+			return 29;
+		}
+		if ($lat < 62.13216659) {
+			return 28;
+		}
+		if ($lat < 63.20427479) {
+			return 27;
+		}
+		if ($lat < 64.26616523) {
+			return 26;
+		}
+		if ($lat < 65.31845310) {
+			return 25;
+		}
+		if ($lat < 66.36171008) {
+			return 24;
+		}
+		if ($lat < 67.39646774) {
+			return 23;
+		}
+		if ($lat < 68.42322022) {
+			return 22;
+		}
+		if ($lat < 69.44242631) {
+			return 21;
+		}
+		if ($lat < 70.45451075) {
+			return 20;
+		}
+		if ($lat < 71.45986473) {
+			return 19;
+		}
+		if ($lat < 72.45884545) {
+			return 18;
+		}
+		if ($lat < 73.45177442) {
+			return 17;
+		}
+		if ($lat < 74.43893416) {
+			return 16;
+		}
+		if ($lat < 75.42056257) {
+			return 15;
+		}
+		if ($lat < 76.39684391) {
+			return 14;
+		}
+		if ($lat < 77.36789461) {
+			return 13;
+		}
+		if ($lat < 78.33374083) {
+			return 12;
+		}
+		if ($lat < 79.29428225) {
+			return 11;
+		}
+		if ($lat < 80.24923213) {
+			return 10;
+		}
+		if ($lat < 81.19801349) {
+			return 9;
+		}
+		if ($lat < 82.13956981) {
+			return 8;
+		}
+		if ($lat < 83.07199445) {
+			return 7;
+		}
+		if ($lat < 83.99173563) {
+			return 6;
+		}
+		if ($lat < 84.89166191) {
+			return 5;
+		}
+		if ($lat < 85.75541621) {
+			return 4;
+		}
+		if ($lat < 86.53536998) {
+			return 3;
+		}
+		if ($lat < 87.00000000) {
+			return 2;
+		}
 		return 1;
 	}
 
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
-		if ($nl > 1) return $nl;
-		else return 1;
+		if ($nl > 1) {
+			return $nl;
+		} else {
+			return 1;
+		}
 	}
 
 	private function parityCheck($msg, $bin) {
@@ -242,10 +386,13 @@ 
 		$crc = 0;
 		$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 {
+		if ($crc == $checksum) {
+			return true;
+		} else {
 			//echo "**** CRC ERROR ****\n";
 			return false;
 		}
@@ -295,22 +442,37 @@ 
 			$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'] = '';
+			if (isset($data['altitude'])) {
+				$msg['altitude'] = $data['altitude'];
+			} else {
+				$msg['altitude'] = '';
+			}
 			$msg['speed'] = $data['speed'];
-			if (isset($data['heading'])) $msg['track'] = $data['heading'];
-			else $msg['track'] = '';
+			if (isset($data['heading'])) {
+				$msg['track'] = $data['heading'];
+			} else {
+				$msg['track'] = '';
+			}
 			$msg['latitude'] = $data['latitude'];
 			$msg['longitude'] = $data['longitude'];
-			if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
-			else $msg['verticalrate'] = '';
-			if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
-			else $msg['squawk'] = 0;
+			if (isset($data['verticalrate'])) {
+				$msg['verticalrate'] = $data['verticalrate'];
+			} else {
+				$msg['verticalrate'] = '';
+			}
+			if (isset($data['squawk'])) {
+				$msg['squawk'] = $data['squawk'];
+			} else {
+				$msg['squawk'] = 0;
+			}
 			$msg['alert'] = 0;
 			$msg['emergency'] = 0;
 			$msg['SPI'] = 0;
-			if (isset($data['ground'])) $msg['ground'] = 1;
-			else $msg['ground'] = 0;
+			if (isset($data['ground'])) {
+				$msg['ground'] = 1;
+			} else {
+				$msg['ground'] = 0;
+			}
 			$result[] = implode(',',$msg);
 		}
 		return $result;

require/class.METAR.php

Indentation +34 added lines, -34 removed lines

@@ -14,35 +14,35 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 
 	/*
@@ -177,7 +177,7 @@ 
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
 			}
-                     /*
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -188,7 +188,7 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
+				// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
@@ -246,9 +246,9 @@ 
 				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];

Braces +130 added lines, -51 removed lines

@@ -73,8 +73,11 @@ 
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/*
@@ -104,29 +107,48 @@ 
 		//$pieces = explode(' ',$data);
 		$pieces = preg_split('/\s/',$data);
 		$pos = 0;
-		if ($pieces[0] == 'METAR') $pos++;
-		elseif ($pieces[0] == 'SPECI') $pos++;
-		if (strlen($pieces[$pos]) != 4) $pos++;
+		if ($pieces[0] == 'METAR') {
+			$pos++;
+		} elseif ($pieces[0] == 'SPECI') {
+			$pos++;
+		}
+		if (strlen($pieces[$pos]) != 4) {
+			$pos++;
+		}
 		$result = array();
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['location'] = $pieces[$pos];
 		$pos++;
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['dayofmonth'] = substr($pieces[$pos],0,2);
 		$result['time'] = substr($pieces[$pos],2,4);
 		$c = count($pieces);
 		for($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
-			if ($piece == 'RMK') break;
-			if ($piece == 'AUTO') $result['auto'] = true;
-			if ($piece == 'COR') $result['correction'] = true;
+			if ($piece == 'RMK') {
+				break;
+			}
+			if ($piece == 'AUTO') {
+				$result['auto'] = true;
+			}
+			if ($piece == 'COR') {
+				$result['correction'] = true;
+			}
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
 				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+				if ($result['wind']['unit'] == 'KT') {
+					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+				} elseif ($result['wind']['unit'] == 'KPH') {
+					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+				} elseif ($result['wind']['unit'] == 'MPS') {
+					$result['wind']['speed'] = round(((float)$matches[2]),2);
+				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -210,27 +232,49 @@ 
 				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
 				$type = $matches[1];
 				$cloud = array();
-				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+				if ($type == 'SKC') {
+					$cloud['type'] = 'No cloud/Sky clear';
+				} elseif ($type == 'CLR') {
+					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+				} elseif ($type == 'NSC') {
+					$cloud['type'] = 'No significant cloud';
+				} elseif ($type == 'FEW') {
+					$cloud['type'] = 'Few';
+				} elseif ($type == 'SCT') {
+					$cloud['type'] = 'Scattered';
+				} elseif ($type == 'BKN') {
+					$cloud['type'] = 'Broken';
+				} elseif ($type == 'OVC') {
+					$cloud['type'] = 'Overcast/Full cloud coverage';
+				} elseif ($type == 'VV') {
+					$cloud['type'] = 'Vertical visibility';
+				}
 				$cloud['type_code'] = $type;
 				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-				if (isset($matches[3])) $significant = $matches[3];
-				else $significant = '';
-				if ($significant == 'CB') $cloud['significant'] = 'Cumulonimbus';
-				elseif ($significant == 'AC') $cloud['significant'] = 'Altocumulus';
-				elseif ($significant == 'CBS') $cloud['significant'] = 'Cumulonimbus';
-				elseif ($significant == 'CC') $cloud['significant'] = 'Cirrocumulus';
-				elseif ($significant == 'CU') $cloud['significant'] = 'Cumulus';
-				elseif ($significant == 'CI') $cloud['significant'] = 'Cirrus';
-				elseif ($significant == 'CS') $cloud['significant'] = 'Cirrostratus';
-				elseif ($significant == 'TCU') $cloud['significant'] = 'Towering Cumulus';
-				else $cloud['significant'] = $significant;
+				if (isset($matches[3])) {
+					$significant = $matches[3];
+				} else {
+					$significant = '';
+				}
+				if ($significant == 'CB') {
+					$cloud['significant'] = 'Cumulonimbus';
+				} elseif ($significant == 'AC') {
+					$cloud['significant'] = 'Altocumulus';
+				} elseif ($significant == 'CBS') {
+					$cloud['significant'] = 'Cumulonimbus';
+				} elseif ($significant == 'CC') {
+					$cloud['significant'] = 'Cirrocumulus';
+				} elseif ($significant == 'CU') {
+					$cloud['significant'] = 'Cumulus';
+				} elseif ($significant == 'CI') {
+					$cloud['significant'] = 'Cirrus';
+				} elseif ($significant == 'CS') {
+					$cloud['significant'] = 'Cirrostratus';
+				} elseif ($significant == 'TCU') {
+					$cloud['significant'] = 'Towering Cumulus';
+				} else {
+					$cloud['significant'] = $significant;
+				}
 				//$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
 				$result['cloud'][] = $cloud;
 			}
@@ -254,8 +298,11 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) {
+					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				} else {
+					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -288,8 +335,11 @@ 
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
 			}
 		}
 		return $result;
@@ -305,8 +355,11 @@ 
 		if (isset($globalMETARcycle) && $globalMETARcycle) {
 			$query = "SELECT * FROM metar WHERE metar_location = :icao";
 		} else {
-			if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-			else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+			} else {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			}
 		}
 		$query_values = array(':icao' => $icao);
 		try {
@@ -378,7 +431,9 @@ 
 	*/
 	public function addMETARCycle() {
 		global $globalDebug, $globalIVAO, $globalTransaction;
-		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Downloading METAR cycle...";
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
@@ -389,28 +444,42 @@ 
 			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
 		}
 		if ($handle) {
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			if (isset($globalDebug) && $globalDebug) {
+				echo "Done - Updating DB...";
+			}
 			$date = '';
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			while(($line = fgets($handle,4096)) !== false) {
 				$line = str_replace(array("\r\n","\r", "\n"), '', $line);
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
 				} elseif (trim($line) != '') {
-					if ($date == '') $date = date('Y/m/d H:m');
+					if ($date == '') {
+						$date = date('Y/m/d H:m');
+					}
 					$pos = 0;
 					$pieces = preg_split('/\s/',$line);
-					if ($pieces[0] == 'METAR') $pos++;
-					if (strlen($pieces[$pos]) != 4) $pos++;
+					if ($pieces[0] == 'METAR') {
+						$pos++;
+					}
+					if (strlen($pieces[$pos]) != 4) {
+						$pos++;
+					}
 					$location = $pieces[$pos];
 					//if ($location == 'LFLL') echo 'location: '.$location.' - date: '.$date.' - data: '.$line."\n";
 					echo $this->addMETAR($location,$line,$date);
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $this->db->commit();
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
+		}
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Done\n";
 		}
-		if (isset($globalDebug) && $globalDebug) echo "Done\n";
 	}
 
 	/*
@@ -420,7 +489,9 @@ 
 	*/
 	public function downloadMETAR($icao) {
 		global $globalMETARurl;
-		if ($globalMETARurl == '') return array();
+		if ($globalMETARurl == '') {
+			return array();
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -432,16 +503,24 @@ 
 				$date = $line;
 			} 
 			if (trim($line) != '') {
-				if ($date == '') $date = date('Y/m/d H:m');
+				if ($date == '') {
+					$date = date('Y/m/d H:m');
+				}
 				$pos = 0;
 				$pieces = preg_split('/\s/',$line);
-				if ($pieces[0] == 'METAR') $pos++;
-				if (strlen($pieces[$pos]) != 4) $pos++;
+				if ($pieces[0] == 'METAR') {
+					$pos++;
+				}
+				if (strlen($pieces[$pos]) != 4) {
+					$pos++;
+				}
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
 					$this->addMETAR($location,$line,$date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		}
 		return array();

Spacing +51 added lines, -51 removed lines

@@ -68,7 +68,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -87,7 +87,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -101,9 +101,9 @@ 
 	public function parse($data) {
 		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
 		$codes = implode('|', array_keys($this->texts));
-		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
 		//$pieces = explode(' ',$data);
-		$pieces = preg_split('/\s/',$data);
+		$pieces = preg_split('/\s/', $data);
 		$pos = 0;
 		if ($pieces[0] == 'METAR') $pos++;
 		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -113,25 +113,25 @@ 
 		$result['location'] = $pieces[$pos];
 		$pos++;
 		if (!isset($pieces[$pos])) return $result;
-		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-		$result['time'] = substr($pieces[$pos],2,4);
+		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
+		$result['time'] = substr($pieces[$pos], 2, 4);
 		$c = count($pieces);
-		for($pos++; $pos < $c; $pos++) {
+		for ($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
 			if ($piece == 'RMK') break;
 			if ($piece == 'AUTO') $result['auto'] = true;
 			if ($piece == 'COR') $result['correction'] = true;
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-				$result['wind']['direction'] = (float)$matches[1];
+				$result['wind']['direction'] = (float) $matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
-				$result['wind']['gust'] = (float)$matches[3];
+				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
+				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
+				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
+				$result['wind']['gust'] = (float) $matches[3];
 				$result['wind']['unit'] = $matches[4];
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
 			}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -152,17 +152,17 @@ 
 
 			// Temperature
 			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-				$temp = (float)$matches[1];
+				$temp = (float) $matches[1];
 				if ($matches[1]{0} == 'M') {
-					$temp = ((float)substr($matches[1], 1)) * -1;
+					$temp = ((float) substr($matches[1], 1))*-1;
 				}
 				$result['temperature'] = $temp;
-				$dew = (float)$matches[2];
+				$dew = (float) $matches[2];
 				if ($matches[2]{0} == 'M') {
-					$dew = ((float)substr($matches[2], 1)) * -1;
+					$dew = ((float) substr($matches[2], 1))*-1;
 				}
 				$result['dew'] = $dew;
-				$result['rh'] = round(100*(exp((17.625*$dew)/(243.04+$dew))/exp((17.625*$temp)/(243.04+$temp))));
+				$result['rh'] = round(100*(exp((17.625*$dew)/(243.04 + $dew))/exp((17.625*$temp)/(243.04 + $temp))));
 			}
 			// QNH
 			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
@@ -172,7 +172,7 @@ 
 					$result['QNH'] = $matches[2];
 				} else {
 					// inHg
-					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
 				}
 				/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -193,12 +193,12 @@ 
     			// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
-					$result['visibility'] = (float)$matches[3] * 1609.34;
+					$result['visibility'] = (float) $matches[3]*1609.34;
 				} else {
 					if ($matches[1] == '9999') {
 						$result['visibility'] = '> 10000';
 					} else {
-						$result['visibility'] = (float)$matches[1];
+						$result['visibility'] = (float) $matches[1];
 					}
 				}
 			}
@@ -221,7 +221,7 @@ 
 				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
 				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
 				$cloud['type_code'] = $type;
-				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
 				if (isset($matches[3])) $significant = $matches[3];
 				else $significant = '';
 				if ($significant == 'CB') $cloud['significant'] = 'Cumulonimbus';
@@ -242,8 +242,8 @@ 
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
 				$result['RVR'] = $rvr;
 			}
 			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
@@ -256,12 +256,12 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
+					    'from' => (float) $matches[2],
+					    'to'   => (float) $matches[4],
 					    'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
@@ -314,7 +314,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -330,19 +330,19 @@ 
 	 * @param String $metar METAR text
 	 * @param String $date date of the METAR
 	*/
-	public function addMETAR($location,$metar,$date) {
+	public function addMETAR($location, $metar, $date) {
 		global $globalDBdriver;
-		$date = date('Y-m-d H:i:s',strtotime($date));
+		$date = date('Y-m-d H:i:s', strtotime($date));
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = :metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-		$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+		$query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -358,7 +358,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -372,7 +372,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -387,29 +387,29 @@ 
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
-			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
+			$Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r");
 		} else {
-			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
+			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r");
 		}
 		if ($handle) {
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
 			$date = '';
 			if ($globalTransaction) $this->db->beginTransaction();
-			while(($line = fgets($handle,4096)) !== false) {
-				$line = str_replace(array("\r\n","\r", "\n"), '', $line);
-				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+			while (($line = fgets($handle, 4096)) !== false) {
+				$line = str_replace(array("\r\n", "\r", "\n"), '', $line);
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 					$date = $line;
 				} elseif (trim($line) != '') {
 					if ($date == '') $date = date('Y/m/d H:m');
 					$pos = 0;
-					$pieces = preg_split('/\s/',$line);
+					$pieces = preg_split('/\s/', $line);
 					if ($pieces[0] == 'METAR') $pos++;
 					if (strlen($pieces[$pos]) != 4) $pos++;
 					$location = $pieces[$pos];
 					//if ($location == 'LFLL') echo 'location: '.$location.' - date: '.$date.' - data: '.$line."\n";
-					echo $this->addMETAR($location,$line,$date);
+					echo $this->addMETAR($location, $line, $date);
 				}
 			}
 			fclose($handle);
@@ -428,23 +428,23 @@ 
 		if ($globalMETARurl == '') return array();
 		date_default_timezone_set("UTC");
 		$Common = new Common();
-		$url = str_replace('{icao}',$icao,$globalMETARurl);
+		$url = str_replace('{icao}', $icao, $globalMETARurl);
 		$cycle = $Common->getData($url);
 		$date = '';
-		foreach(explode("\n",$cycle) as $line) {
-			$line = str_replace(array("\r\n","\r", "\n"), '', $line);
-			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+		foreach (explode("\n", $cycle) as $line) {
+			$line = str_replace(array("\r\n", "\r", "\n"), '', $line);
+			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 				$date = $line;
 			} 
 			if (trim($line) != '') {
 				if ($date == '') $date = date('Y/m/d H:m');
 				$pos = 0;
-				$pieces = preg_split('/\s/',$line);
+				$pieces = preg_split('/\s/', $line);
 				if ($pieces[0] == 'METAR') $pos++;
 				if (strlen($pieces[$pos]) != 4) $pos++;
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
-					$this->addMETAR($location,$line,$date);
+					$this->addMETAR($location, $line, $date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
 				} else return array();
 			}

require/class.TSK.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	*/
 	public function parse_xml($url) {
 		$Common = new Common();
-		$filedata = $Common->getData($url,'get','','','','','','',true);
+		$filedata = $Common->getData($url, 'get', '', '', '', '', '', '', true);
 		if ($filedata != '' && $filedata !== false) {
 			$xml = simplexml_load_string($filedata);
 			if ($xml !== false) {

install/install-action.php

Indentation +12 added lines, -12 removed lines

@@ -86,9 +86,9 @@ 
 	if ($check_version == '0') {
 		
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
@@ -98,8 +98,8 @@ 
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
@@ -156,10 +156,10 @@ 
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
 	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 	    $_SESSION['install'] = 'owner';
@@ -169,10 +169,10 @@ 
 	    print json_encode($result);
 	*/
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {

Spacing +67 added lines, -67 removed lines

@@ -70,15 +70,15 @@ 
 	$globalDebug = FALSE;
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	$globalDebug = FALSE;
@@ -92,8 +92,8 @@ 
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
 		if ((!isset($globalAircraft) || $globalAircraft === TRUE) && (!isset($globalVA) || $globalVA === FALSE)) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -101,24 +101,24 @@ 
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} elseif (!is_numeric($check_version)) {
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
 		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
@@ -127,8 +127,8 @@ 
 	$error .= update_db::update_waypoints();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 /*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
@@ -145,7 +145,7 @@ 
 */
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
@@ -153,12 +153,12 @@ 
 	$error .= update_db::update_countries();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -171,15 +171,15 @@ 
 	} else {
 	    $_SESSION['install'] = 'sources';
 	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -187,19 +187,19 @@ 
 		$error .= update_db::update_ModeS_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -208,8 +208,8 @@ 
 		$error .= update_db::update_ModeS_ogn();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
@@ -228,15 +228,15 @@ 
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -244,19 +244,19 @@ 
 		$error .= update_db::update_routes_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data'));
+		} else 	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -264,8 +264,8 @@ 
 		$error .= update_db::update_translation_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -283,15 +283,15 @@ 
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -299,19 +299,19 @@ 
 		$error = update_db::update_owner_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -320,13 +320,13 @@ 
 			$error .= update_db::update_notam();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -339,7 +339,7 @@ 
 		*/
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		//}
 	}
@@ -376,9 +376,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 		unset($_SESSION['sources']);
 	}
 	/*
@@ -403,7 +403,7 @@ 
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -415,48 +415,48 @@ 
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file

Braces +78 added lines, -28 removed lines

@@ -75,7 +75,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	}
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -93,7 +95,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		}
 		if ((!isset($globalAircraft) || $globalAircraft === TRUE) && (!isset($globalVA) || $globalVA === FALSE)) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -107,7 +111,9 @@ 
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -128,8 +136,10 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
-/*
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
+	/*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -154,7 +164,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	}
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
@@ -188,7 +200,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		}
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -209,18 +223,26 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -245,7 +267,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		}
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -265,7 +289,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -300,7 +326,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -321,12 +349,16 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			}
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -376,7 +408,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') {
+				$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			}
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 		unset($_SESSION['sources']);
@@ -387,15 +421,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -416,33 +456,43 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		}
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			}
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));