Ysurac / FlightAirMap

manufacturer-statistics-airline-country.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,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($manufacturer == ucwords($all_manufacturer['aircraft_manufacturer']))

manufacturer-statistics-aircraft.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,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($manufacturer == ucwords($all_manufacturer['aircraft_manufacturer']))

ident.php

Braces +12 added lines, -5 removed lines

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

pilot-detailed.php

Braces +24 added lines, -8 removed lines

@@ -37,8 +37,12 @@ 
 	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 	$filter = array();
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
+	if ($year != '') {
+		$filter = array_merge($filter,array('year' => $year));
+	}
+	if ($month != '') {
+		$filter = array_merge($filter,array('month' => $month));
+	}
 	if ($sort != '') 
 	{
 		$spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
@@ -56,8 +60,12 @@ 
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']);
 		$ident = $spotter_array[0]['ident'];
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
+		if (isset($spotter_array[0]['latitude'])) {
+			$latitude = $spotter_array[0]['latitude'];
+		}
+		if (isset($spotter_array[0]['longitude'])) {
+			$longitude = $spotter_array[0]['longitude'];
+		}
 		require_once('header.php');
 		/*
 		if (isset($globalArchive) && $globalArchive) {
@@ -110,12 +118,18 @@ 
 		*/
 		print '<div class="info column">';
 		print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
-		if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
+		if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') {
+			print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
+		}
 		if ($year == '' && $month == '') {
 			$Stats = new Stats();
 			$flights = $Stats->getStatsPilot($pilot);
-		} else $flights = 0;
-		if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter);
+		} else {
+			$flights = 0;
+		}
+		if ($flights == 0) {
+			$flights = $Spotter->countFlightsByPilot($pilot,$filter);
+		}
 		print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
 		$aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter));
 		print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>';
@@ -126,7 +140,9 @@ 
 		$airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter));
 		print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
 		$duration = $Spotter->getFlightDurationByPilot($pilot,$filter);
-		if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
+		if ($duration != '0') {
+			print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
+		}
 		print '</div>';
 	
 		include('pilot-sub-menu.php');

footer.php

Braces +8 added lines, -3 removed lines

@@ -1,8 +1,10 @@ 
 </section>
 <div class="pub onmap">
 <?php
-	if (isset($globalPub)) print $globalPub;
-?>
+	if (isset($globalPub)) {
+		print $globalPub;
+	}
+	?>
 </div>
 <footer class="container">
 	<?php
@@ -13,7 +15,10 @@ 
 	<?php
 	    }
 	?>
-	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.com/" target="_blank">Get source code</a></span>
+	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.com/" target="_blank">Get source code</a></span>
 </footer>
 
 <div class="notifications bottom-left"></div>

country-detailed.php

Braces +1 added lines, -1 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];

search-kml.php

Braces +21 added lines, -8 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 
 header('Content-Type: text/xml');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
@@ -123,7 +134,9 @@ 
 			$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 			$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 			foreach ($waypoint_pieces as $waypoint_coordinate) {
-				if (isset($waypoint_coordinate[1])) $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+				if (isset($waypoint_coordinate[1])) {
+					$output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+				}
 			}
 			$output .= '</coordinates>';
 			$output .= '<altitudeMode>absolute</altitudeMode>';

airline-statistics-registration.php

Braces +7 added lines, -4 removed lines

@@ -43,7 +43,9 @@ 
 	}
 	$Stats = new Stats($Spotter->db);
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -66,8 +68,7 @@ 
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}
@@ -131,7 +132,9 @@ 
 				$images = $Image->getSpotterImage($aircraft_item['registration']);
 				if (isset($images['image_thumbnail'])) {
 					$aircraft_item['image_thumbnail'] = $images['image_thumbnail'];
-				} else $aircraft_item['image_thumbnail'] = '';
+				} else {
+					$aircraft_item['image_thumbnail'] = '';
+				}
 			}
 			if ($aircraft_item['image_thumbnail'] != "")
 			{

require/class.MarineLive.php

Braces +119 added lines, -40 removed lines

@@ -8,7 +8,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (MarineLive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (MarineLive)');
+		}
 	}
 
 
@@ -30,7 +32,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -80,8 +84,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -122,9 +129,13 @@ 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
 			}
 		}
-		if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC';
+		if ($orderby_query == '') {
+			$orderby_query= ' ORDER BY date DESC';
+		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate";
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -149,7 +160,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0";
@@ -190,48 +203,72 @@ 
 		}
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
+		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') {
+			$globalMap3DMarinesLimit = '300';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = 'SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id,marine_archive.type, marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine 
 				    WHERE latitude <> '0' AND longitude <> '0' 
 				    ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = "SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.type,marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine WHERE latitude <> '0' AND longitude <> '0' ";
 				$query .= "ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		}
 		try {
@@ -256,7 +293,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 		} else {
@@ -284,7 +323,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Marine = new Marine($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -292,7 +333,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
 		} else {
@@ -312,7 +355,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 		$Marine = new Marine($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter,true,true);
 
 		if (is_array($coord)) {
@@ -320,7 +365,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		/*
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
@@ -543,11 +590,15 @@ 
 		//$query  = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -642,7 +693,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -922,7 +975,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -930,7 +985,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 
 		if ($heading != '')
@@ -939,7 +996,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -947,9 +1006,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -970,15 +1033,27 @@ 
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
 		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
-		if ($typeid == '') $typeid = NULL;
-		if ($statusid == '') $statusid = NULL;
+		if ($typeid == '') {
+			$typeid = NULL;
+		}
+		if ($statusid == '') {
+			$statusid = NULL;
+		}
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
+            	if ($arrival_date == '') {
+            		$arrival_date = NULL;
+            	}
             	$query = '';
 		if ($globalArchive) {
-			if ($globalDebug) echo '-- Delete previous data -- ';
+			if ($globalDebug) {
+				echo '-- Delete previous data -- ';
+			}
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';
 		}
 		$query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date) 
@@ -993,10 +1068,14 @@ 
 		}
 		
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-			if ($globalDebug) echo '(Add to Marine archive : ';
+			if ($globalDebug) {
+				echo '(Add to Marine archive : ';
+			}
 			$MarineArchive = new MarineArchive($this->db);
 			$result =  $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source, $source_name, $over_country);
-			if ($globalDebug) echo $result.')';
+			if ($globalDebug) {
+				echo $result.')';
+			}
 		}
 		return "success";
 	}