Ysurac / FlightAirMap

airline-statistics-route.php

Spacing +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
@@ -22,9 +22,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -62,7 +62,7 @@ 
 	include('airline-sub-menu.php');
 	 print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	$route_array = $Spotter->countAllRoutesByAirline($airline);
 	if (!empty($route_array))
 	{
@@ -78,7 +78,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Braces +4 added lines, -3 removed lines

@@ -21,7 +21,9 @@ 
 	print '<option></option>';
 	$Stats = new Stats();
 	$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'])
@@ -43,8 +45,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" />';
 			}

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

date-statistics-arrival-airport.php

Spacing +9 added lines, -9 removed lines

@@ -3,13 +3,13 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Arrival Airports on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -27,13 +27,13 @@ 
 	print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 	print '<br />';  
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByDate($date);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -48,7 +48,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -87,7 +87,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
@@ -112,7 +112,7 @@ 
 	$title = _("Unknown Date");
 	require_once('header.php');
 	print '<h1>'._("Error").'</h1>';
-	print '<p>'._("Sorry, this date does not exist in this database. :(");'</p>';
+	print '<p>'._("Sorry, this date does not exist in this database. :("); '</p>';
 }
 
 require_once('footer.php');

manufacturer-statistics-departure-airport.php

Spacing +9 added lines, -9 removed lines

@@ -8,13 +8,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Departure Airports from %s"), $manufacturer);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -23,9 +23,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 {
@@ -44,7 +44,7 @@ 
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), $manufacturer).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -59,7 +59,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -98,7 +98,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

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($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_manufacturer'])) {
-        header('Location: '.$globalURL.'/manufacturer');
-        die();
+		header('Location: '.$globalURL.'/manufacturer');
+		die();
 }
 $Spotter = new Spotter();
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));

aircraft.php

Spacing +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@ 
 	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($aircraft_types as $value) {
+	foreach ($aircraft_types as $value) {
 		//$firstLetter = substr($value['aircraft_name'], 0, 1);
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
-		if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
+		if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 		{
 			if ($previous !== null) print ' | ';
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -31,12 +31,12 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($aircraft_types as $value) {
+	foreach ($aircraft_types as $value) {
 		//$firstLetter = substr($value['aircraft_name'], 0, 1);
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
+			if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 			{
 				if ($previous !== null) print '</div>';
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

Braces +15 added lines, -5 removed lines

@@ -16,7 +16,9 @@ 
 	print '<h1>'._("Aircrafts Types").'</h1>';
 
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
 	foreach($aircraft_types as $value) {
@@ -24,10 +26,14 @@ 
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
 		if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 		{
-			if ($previous !== null) print ' | ';
+			if ($previous !== null) {
+				print ' | ';
+			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
+		if ($firstLetter != '(' && $firstLetter != ')') {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -38,10 +44,14 @@ 
 		{
 			if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 			{
-				if ($previous !== null) print '</div>';
+				if ($previous !== null) {
+					print '</div>';
+				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
-			if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
+			if ($firstLetter != '(' && $firstLetter != ')') {
+				$previous = $firstLetter;
+			}
 			print '<div class="alphabet-item">';
 			print '<a href="'.$globalURL.'/aircraft/'.$value['aircraft_icao'].'">';
 			if ($value['aircraft_name'] == '') {

statistics-fatalities-month.php

Spacing +6 added lines, -6 removed lines

@@ -23,9 +23,9 @@ 
             	["'._("Month").'", "'._("# of Fatalities").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
-	$date_data .= '[ "'.date('F, Y',strtotime($date_item['year'].'-'.$date_item['month'].'-01')).'",'.$date_item['count'].'],';
+	$date_data .= '[ "'.date('F, Y', strtotime($date_item['year'].'-'.$date_item['month'].'-01')).'",'.$date_item['count'].'],';
 }
 $date_data = substr($date_data, 0, -1);
 print $date_data;
@@ -50,13 +50,13 @@ 
 
 if (!empty($date_array))
 {
-	foreach($date_array as $key => $row) {
+	foreach ($date_array as $key => $row) {
 		$years[$key] = $row['year'];
 		$months[$key] = $row['month'];
 		$counts[$key] = $row['count'];
 	}
 //	array_multisort($years,SORT_DESC,$months,SORT_DESC,$date_array);
-	array_multisort($counts,SORT_DESC,$date_array);
+	array_multisort($counts, SORT_DESC, $date_array);
 	print '<div class="table-responsive">';
 	print '<table class="common-date table-striped">';
 	print '<thead>';
@@ -66,12 +66,12 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
 		print '<td>';
-		print '<a href="'.$globalURL.'/accident/'.$date_item['year'].'-'.$date_item['month'].'">'.date('F, Y',strtotime($date_item['year'].'-'.$date_item['month'].'-01')).'</a>';
+		print '<a href="'.$globalURL.'/accident/'.$date_item['year'].'-'.$date_item['month'].'">'.date('F, Y', strtotime($date_item['year'].'-'.$date_item['month'].'-01')).'</a>';
 		print '</td>';
 		print '<td>';
 		print $date_item['count'];

require/class.Accident.php

Indentation +6 added lines, -6 removed lines

@@ -23,12 +23,12 @@
 	}
 	
 	/**
-	* Get Accidents data from DB
-	* @param String $limit Limit
-	* @param String $type Set type accident or incident
-	* @param String $date get data for a date
-	* @return Array Return Accidents data in array
-	*/
+	 * Get Accidents data from DB
+	 * @param String $limit Limit
+	 * @param String $type Set type accident or incident
+	 * @param String $date get data for a date
+	 * @return Array Return Accidents data in array
+	 */
 	public function getAccidentData($limit = '',$type = '',$date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);

Spacing +47 added lines, -47 removed lines

@@ -29,20 +29,20 @@ 
 	* @param String $date get data for a date
 	* @return Array Return Accidents data in array
 	*/
-	public function getAccidentData($limit = '',$type = '',$date = '') {
+	public function getAccidentData($limit = '', $type = '', $date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 		$Translation = new Translation($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		date_default_timezone_set('UTC');
 		$result = array();
 		$limit_query = '';
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -51,7 +51,7 @@ 
 
 		if ($type != '') {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				} else {
@@ -59,7 +59,7 @@ 
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				}
-				$query_values = array(':type' => $type,':date' => $date);
+				$query_values = array(':type' => $type, ':date' => $date);
 			} else {
 				$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
@@ -67,7 +67,7 @@ 
 			}
 		} else {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				} else {
@@ -86,7 +86,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$i = 0;
@@ -96,8 +96,8 @@ 
 			$data = array();
 			if ($row['registration'] != '') {
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 				$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 				$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 				if (!empty($aircraft_info)) {
@@ -105,7 +105,7 @@ 
 					$data['aircraft_name'] = $aircraft_info[0]['type'];
 					$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
 				} else {
-					$data = array_merge($data,array('aircraft_type' => 'NA'));
+					$data = array_merge($data, array('aircraft_type' => 'NA'));
 				}
 				$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
 				if (!empty($owner_data)) {
@@ -113,18 +113,18 @@ 
 					$data['aircraft_base'] = $owner_data['base'];
 					$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 				}
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
+			$icao = $Translation->checkTranslation($icao, false);
 			//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 			if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 				//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -133,11 +133,11 @@ 
 				if (!empty($airline_info)) {
 					//echo 'data found !'."\n";
 					//print_r($airline_info);
-					$data = array_merge($data,$airline_info);
+					$data = array_merge($data, $airline_info);
 				} 
 				//else echo 'No data...'."\n";
 			}
-			$data = array_merge($row,$data);
+			$data = array_merge($row, $data);
 			if ($data['ident'] == null) $data['ident'] = $icao;
 			if ($data['title'] == null) {
 				$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
@@ -171,7 +171,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -186,7 +186,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -201,15 +201,15 @@ 
 		if ($globalDebug) echo 'Import '.$file."\n";
 		$result = array();
 		if (file_exists($file)) {
-			if (($handle = fopen($file,'r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
+			if (($handle = fopen($file, 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
 					}
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
+			if (!empty($result)) $this->add($result, true);
 			elseif ($globalDebug) echo 'Nothing to import';
 		}
 	}
@@ -225,8 +225,8 @@ 
 		$all_md5_new = array();
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
 			if ($this->check_accidents_nb() > 0) {
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 						if (isset($data[1])) {
 							$year = $data[0];
 							$all_md5[$year] = $data[1];
@@ -236,10 +236,10 @@ 
 				}
 			}
 		}
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 					if (isset($data[1])) {
 						$year = $data[0];
 						$all_md5_new[$year] = $data[1];
@@ -248,10 +248,10 @@ 
 				fclose($handle);
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
 		foreach ($result as $file => $md5) {
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
 		}
@@ -261,7 +261,7 @@ 
 	* Add data to DB
 	* @param Array $crash An array with accidents/incidents data
 	*/
-	public function add($crash,$new = false) {
+	public function add($crash, $new = false) {
 		global $globalTransaction, $globalDebug;
 		require_once('class.Connection.php');
 		require_once('class.Image.php');
@@ -277,7 +277,7 @@ 
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
 		if ($globalTransaction) $Connection->db->beginTransaction();
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
@@ -290,31 +290,31 @@ 
 				$cr = array_map(function($value) {
 					return $value === "" ? NULL : $value;
 				}, $cr);
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 					if ($result_check['nb'] == 0) {
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
 						$sth->execute($query_values);
-						if ($cr['date'] > time()-(30*86400)) {
+						if ($cr['date'] > time() - (30*86400)) {
 							if (empty($Image->getSpotterImage($cr['registration']))) {
 								//if ($globalDebug) echo 'Get image...'."\n";
 								$Image->addSpotterImage($cr['registration']);
 							}
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
 					}
 				}
-				if ($globalTransaction && $j % 1000 == 0) {
+				if ($globalTransaction && $j%1000 == 0) {
 					$Connection->db->commit();
 					$Connection->db->beginTransaction();
 				}
 			}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack();
 			echo $e->getMessage();
 		}
@@ -332,7 +332,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);
@@ -350,7 +350,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);
@@ -365,7 +365,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}

Braces +75 added lines, -27 removed lines

@@ -96,8 +96,11 @@ 
 			$data = array();
 			if ($row['registration'] != '') {
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
 				$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 				$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 				if (!empty($aircraft_info)) {
@@ -113,17 +116,30 @@ 
 					$data['aircraft_base'] = $owner_data['base'];
 					$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 				}
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 			//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 			if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -138,10 +154,14 @@ 
 				//else echo 'No data...'."\n";
 			}
 			$data = array_merge($row,$data);
-			if ($data['ident'] == null) $data['ident'] = $icao;
+			if ($data['ident'] == null) {
+				$data['ident'] = $icao;
+			}
 			if ($data['title'] == null) {
 				$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
-			} else $data['message'] = strtolower($data['title']);
+			} else {
+				$data['message'] = strtolower($data['title']);
+			}
 			$ids = $Spotter->getAllIDByRegistration($data['registration']);
 			$date = $data['date'];
 			if (isset($ids[$date])) {
@@ -158,8 +178,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 	
 	/*
@@ -198,7 +219,9 @@ 
 	*/
 	public function import($file) {
 		global $globalTransaction, $globalDebug;
-		if ($globalDebug) echo 'Import '.$file."\n";
+		if ($globalDebug) {
+			echo 'Import '.$file."\n";
+		}
 		$result = array();
 		if (file_exists($file)) {
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -209,8 +232,11 @@ 
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
-			elseif ($globalDebug) echo 'Nothing to import';
+			if (!empty($result)) {
+				$this->add($result,true);
+			} elseif ($globalDebug) {
+				echo 'Nothing to import';
+			}
 		}
 	}
 
@@ -246,14 +272,23 @@ 
 					}
 				}
 				fclose($handle);
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+			} elseif ($globalDebug) {
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
+			}
+		} elseif ($globalDebug) {
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+		}
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
+		if (empty($result) && $globalDebug) {
+			echo 'Nothing to update';
+		}
 		foreach ($result as $file => $md5) {
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
+			} elseif ($globalDebug) {
+				echo 'Download '.$file.' failed';
+			}
 		}
 	}
 
@@ -270,13 +305,17 @@ 
 		$Image = new Image();
 		$Spotter = new Spotter();
 
-		if (empty($crash)) return false;
+		if (empty($crash)) {
+			return false;
+		}
 		if (!$new) {
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
 			$sthd = $Connection->db->prepare($query_delete);
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
@@ -291,7 +330,9 @@ 
 					return $value === "" ? NULL : $value;
 				}, $cr);
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					if (strpos($cr['registration'],'-') === FALSE) {
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					}
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -313,9 +354,13 @@ 
 					$Connection->db->beginTransaction();
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack();
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			echo $e->getMessage();
 		}
 		$sth_check->closeCursor();
@@ -354,8 +399,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_accidents_update() {

statistics-fatalities-year.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
             	["'._("Year").'", "'._("# of Fatalities").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.$date_item['year'].'",'.$date_item['count'].'],';
 }
@@ -50,12 +50,12 @@ 
 
 if (!empty($date_array))
 {
-	foreach($date_array as $key => $row) {
+	foreach ($date_array as $key => $row) {
 		$years[$key] = $row['year'];
 		$counts[$key] = $row['count'];
 	}
 	//array_multisort($years,SORT_DESC,$date_array);
-	array_multisort($counts,SORT_DESC,$date_array);
+	array_multisort($counts, SORT_DESC, $date_array);
 	print '<div class="table-responsive">';
 	print '<table class="common-date table-striped">';
 	print '<thead>';
@@ -65,7 +65,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics.php

Indentation +213 added lines, -213 removed lines

@@ -39,11 +39,11 @@ 
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
-    ?>
+	?>
     </div>
     <?php    
 	// print_r($Stats->getAllAirlineNames()); 
-    ?>
+	?>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
         <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name)); ?></span> <?php echo _("Flights"); ?></span>
@@ -51,23 +51,23 @@ 
         <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
-	    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+		if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    	    } else {
-    	?>
+			} else {
+		?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name)); ?></span> <?php echo _("Owners"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
     	<?php
-    	    }
-    	?>
+			}
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name)); ?></span> <?php echo _("Aircrafts types"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    		if ($airline_icao == '') {
-    	?>
+			if ($airline_icao == '') {
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name)); ?></span> <?php echo _("Airlines"); ?></span>
 	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
@@ -88,25 +88,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+				  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
+			if (count($aircraft_array) == 0) print _("No data available");
+			else {
 
-                    print '<div id="chart1" class="chart" width="100%"></div>
+					print '<div id="chart1" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart1);
                       function drawChart1() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Aircraft").'", "'._("# of times").'"], ';
-                            $aircraft_data = '';
-                          foreach($aircraft_array as $aircraft_item)
-                                    {
-                                            $aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-                                    }
-                                    $aircraft_data = substr($aircraft_data, 0, -1);
-                                    print $aircraft_data;
-                        print ']);
+							$aircraft_data = '';
+						  foreach($aircraft_array as $aircraft_item)
+									{
+											$aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+									}
+									$aircraft_data = substr($aircraft_data, 0, -1);
+									print $aircraft_data;
+						print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -121,8 +121,8 @@ 
                               drawChart1();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/aircraft" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -130,26 +130,26 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
-    if ($airline_icao == '' || $airline_icao == 'all') {
+	if ($airline_icao == '' || $airline_icao == 'all') {
 	$airline_array = $Stats->countAllAirlines(true,$filter_name);
 	if (count($airline_array) > 0) {
-            print '<div class="col-md-6">';
-	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
-	    print '<div id="chart2" class="chart" width="100%"></div>
+			print '<div class="col-md-6">';
+		print '<h2>'._("Top 10 Most Common Airline").'</h2>';
+		print '<div id="chart2" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart2);
                       function drawChart2() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Airline").'", "'._("# of times").'"], ';
-	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
-	    {
+		$airline_data = '';
+		foreach($airline_array as $airline_item)
+		{
 		$airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
-	    }
-	    $airline_data = substr($airline_data, 0, -1);
-	    print $airline_data;
-	    print ']);
+		}
+		$airline_data = substr($airline_data, 0, -1);
+		print $airline_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -164,23 +164,23 @@ 
                               drawChart2();
                             });
                   </script>';
-	    print '<div class="more"><a href="'.$globalURL.'/statistics/airline" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    	    print '</div>';
+		print '<div class="more"><a href="'.$globalURL.'/statistics/airline" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
+			print '</div>';
 	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
+	}
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
-    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+	$flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
+	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
-	    print '<div class="col-md-12">';
+		print '<div class="col-md-12">';
 	} else {
-            print '<div class="col-md-6">';
+			print '<div class="col-md-6">';
 	}
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
@@ -188,21 +188,21 @@ 
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div>
+		print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart7);
                       function drawChart7() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Pilots").'", "'._("# of times").'"], ';
-	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
-	    {
+		$pilot_data = '';
+		foreach($pilot_array as $pilot_item)
+		{
 		$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
-	    }
-	    $pilot_data = substr($pilot_data, 0, -1);
-	    print $pilot_data;
-	    print ']);
+		}
+		$pilot_data = substr($pilot_data, 0, -1);
+		print $pilot_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -217,7 +217,7 @@ 
                               drawChart7();
                             });
                   </script>';
-        }
+		}
 ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/pilot" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
@@ -226,7 +226,7 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    } else {
+	} else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
@@ -234,21 +234,21 @@ 
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div>
+		print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart7);
                       function drawChart7() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Owner").'", "'._("# of times").'"], ';
-                            $owner_data = '';
-	    foreach($owner_array as $owner_item)
-	    {
+							$owner_data = '';
+		foreach($owner_array as $owner_item)
+		{
 		$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
-	    }
-	    $owner_data = substr($owner_data, 0, -1);
-	    print $owner_data;
-	    print ']);
+		}
+		$owner_data = substr($owner_data, 0, -1);
+		print $owner_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -272,8 +272,8 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
-    if (!empty($flightover_array)) {
+	}
+	if (!empty($flightover_array)) {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
@@ -281,21 +281,21 @@ 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
 	if (count($flightover_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart10" class="chart" width="100%"></div>
+		print '<div id="chart10" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart10);
                       function drawChart10() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Country").'", "'._("# of times").'"], ';
-                            $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
-	    {
+							$flightover_data = '';
+		foreach($flightover_array as $flightover_item)
+		{
 		$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
-	    }
-	    $flightover_data = substr($flightover_data, 0, -1);
-	    print $flightover_data;
-	    print ']);
+		}
+		$flightover_data = substr($flightover_data, 0, -1);
+		print $flightover_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -319,7 +319,7 @@ 
                 </div>
             </div>
 <?php
-    }
+	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -329,8 +329,8 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
-    if (count($airport_airport_array) > 0) {
+	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
+	if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div>
                 <script>
@@ -343,13 +343,13 @@ 
 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
-                    $airport_data = '';
+					$airport_data = '';
 	foreach($airport_airport_array as $airport_item)
 	{
-	    $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
-	    $name = str_replace("'", "", $name);
-	    $name = str_replace('"', "", $name);
-	    $airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],';
+		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
+		$name = str_replace("'", "", $name);
+		$name = str_replace('"', "", $name);
+		$airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],';
 	}
 	$airport_data = substr($airport_data, 0, -1);
 	print $airport_data;
@@ -368,15 +368,15 @@ 
               }
                 </script>';
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
-    if (count($airport_airport_array2) > 0) {
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
+	if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div>
                 <script>
@@ -392,9 +392,9 @@ 
 	$airport_data2 = '';
 	foreach($airport_airport_array2 as $airport_item2)
 	{
-	    $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
-	    $name2 = str_replace(array("'",'"'), '', $name2);
-	    $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
+		$name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
+		$name2 = str_replace(array("'",'"'), '', $name2);
+		$airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
 	}
 	$airport_data2 = substr($airport_data2, 0, -1);
 	print $airport_data2;
@@ -413,7 +413,7 @@ 
               }
                 </script>';
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
         </div>
@@ -423,24 +423,24 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart8" class="chart" width="100%"></div>
+				  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart8" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart8);
                       function drawChart8() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Flights").'"], ';
-                            $year_data = '';
-                          foreach($year_array as $year_item)
-                                    {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
-                                    }
-                                    $year_data = substr($year_data, 0, -1);
-                                    print $year_data;
-                        print ']);
+							$year_data = '';
+						  foreach($year_array as $year_item)
+									{
+										$year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
+									}
+									$year_data = substr($year_data, 0, -1);
+									print $year_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -458,8 +458,8 @@ 
                               drawChart8();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -469,24 +469,24 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart9" class="chart" width="100%"></div>
+				  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+			if (count($month_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart9" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart9);
                       function drawChart9() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Day").'", "'._("# of Flights").'"], ';
-                            $month_data = '';
-                          foreach($month_array as $month_item)
-                                    {
-                                        $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
-                                    }
-                                    $month_data = substr($month_data, 0, -1);
-                                    print $month_data;
-                        print ']);
+							$month_data = '';
+						  foreach($month_array as $month_item)
+									{
+										$month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
+									}
+									$month_data = substr($month_data, 0, -1);
+									print $month_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -504,8 +504,8 @@ 
                               drawChart9();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -515,25 +515,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
-                  print '<div id="chart5" class="chart" width="100%"></div>
+					$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+			if (empty($date_array)) print _("No data available");
+			else {
+				  print '<div id="chart5" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart5);
                       function drawChart5() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Date").'", "'._("# of Flights").'"], ';
-                            $date_data = '';
+							$date_data = '';
                         
-                          foreach($date_array as $date_item)
-                                    {
-                                        $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
-                                    }
-                                    $date_data = substr($date_data, 0, -1);
-                                    print $date_data;
-                        print ']);
+						  foreach($date_array as $date_item)
+									{
+										$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
+									}
+									$date_data = substr($date_data, 0, -1);
+									print $date_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -551,8 +551,8 @@ 
                               drawChart5();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -562,25 +562,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
+				  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+			if (empty($hour_array)) print _("No data available");
+			else {
 
-                  print '<div id="chart6" class="chart" width="100%"></div>
+				  print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart6);
                       function drawChart6() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Hour").'", "'._("# of Flights").'"], ';
-                            $hour_data = '';
-                          foreach($hour_array as $hour_item)
-                                    {
-                                        $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
-                                    }
-                                    $hour_data = substr($hour_data, 0, -1);
-                                    print $hour_data;
-                        print ']);
+							$hour_data = '';
+						  foreach($hour_array as $hour_item)
+									{
+										$hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
+									}
+									$hour_data = substr($hour_data, 0, -1);
+									print $hour_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -598,8 +598,8 @@ 
                               drawChart6();
                             });
                   </script>';
-                  }
-                ?>
+				  }
+				?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -607,32 +607,32 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         </div>
 <?php
-    if (isset($globalAccidents) && $globalAccidents) {
+	if (isset($globalAccidents) && $globalAccidents) {
 ?>
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
                 <?php
-		    require_once('require/class.Accident.php');
-            	    $Accident = new Accident();
-                  $year_array = $Accident->countFatalitiesByYear($filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart32" class="chart" width="100%"></div>
+			require_once('require/class.Accident.php');
+					$Accident = new Accident();
+				  $year_array = $Accident->countFatalitiesByYear($filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart32" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart32);
                       function drawChart32() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Year").'", "'._("# of Fatalities").'"], ';
-                            $year_data = '';
-                          foreach($year_array as $year_item)
-                                    {
-                                        $year_data .= '[ "'.$year_item['year'].'",'.$year_item['count'].'],';
-                                    }
-                                    $year_data = substr($year_data, 0, -1);
-                                    print $year_data;
-                        print ']);
+							$year_data = '';
+						  foreach($year_array as $year_item)
+									{
+										$year_data .= '[ "'.$year_item['year'].'",'.$year_item['count'].'],';
+									}
+									$year_data = substr($year_data, 0, -1);
+									print $year_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -650,8 +650,8 @@ 
                               drawChart32();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -662,26 +662,26 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
                 <?php
-		    require_once('require/class.Accident.php');
-            	    $Accident = new Accident();
-                  $year_array = $Accident->countFatalitiesLast12Months($filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart33" class="chart" width="100%"></div>
+			require_once('require/class.Accident.php');
+					$Accident = new Accident();
+				  $year_array = $Accident->countFatalitiesLast12Months($filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart33" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart33);
                       function drawChart33() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Fatalities").'"], ';
-                            $year_data = '';
-                          foreach($year_array as $year_item)
-                                    {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],';
-                                    }
-                                    $year_data = substr($year_data, 0, -1);
-                                    print $year_data;
-                        print ']);
+							$year_data = '';
+						  foreach($year_array as $year_item)
+									{
+										$year_data .= '[ "'.date('F, Y',strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],';
+									}
+									$year_data = substr($year_data, 0, -1);
+									print $year_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -699,8 +699,8 @@ 
                               drawChart33();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -708,25 +708,25 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <br/>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '') {
+	if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '') {
 ?>
         <div class="row column">
         	<?php
-        	    $polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
-        	    if (!empty($polar)) {
-            		print '<h2>'._("Coverage pattern").'</h2>';
-        		foreach ($polar as $eachpolar) {
-        		    unset($polar_data);
-	        	    $Spotter = new Spotter();
-        		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
-        			$direction = $Spotter->parseDirection(($value*22.5));
-        			$distance = $key;
-        			$unit = 'km';
+				$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+				if (!empty($polar)) {
+					print '<h2>'._("Coverage pattern").'</h2>';
+				foreach ($polar as $eachpolar) {
+					unset($polar_data);
+					$Spotter = new Spotter();
+					$data = json_decode($eachpolar['source_data']);
+					foreach($data as $value => $key) {
+					$direction = $Spotter->parseDirection(($value*22.5));
+					$distance = $key;
+					$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					$distance = round($distance*0.539957);
 					$unit = 'nm';
@@ -737,10 +737,10 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        		    }
-        	?>
+					if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+					}
+			?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
         	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
@@ -772,22 +772,22 @@ 
 		</script>
             </div>
             <?php
-        	    }
-        	}
-            ?>
+				}
+			}
+			?>
         </div>
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    $msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
-        	    if (!empty($msg)) {
-            		print '<h2>'._("Messages received").'</h2>';
-        		foreach ($msg as $eachmsg) {
-        		    //$eachmsg = $msg[0];
-        		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
-        	?>
+				$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+				if (!empty($msg)) {
+					print '<h2>'._("Messages received").'</h2>';
+				foreach ($msg as $eachmsg) {
+					//$eachmsg = $msg[0];
+					$data = $eachmsg['source_data'];
+					if ($data > 500) $max = (round(($data+100)/100))*100;
+					else $max = 500;
+			?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
@@ -803,9 +803,9 @@ 
 			  });
 		</script>
             <?php
-        	   }
-        	}
-            ?>
+			   }
+			}
+			?>
             </div>
         </div>
         <div class="row column">
@@ -832,19 +832,19 @@ 
 				$hist_data .= '[ "'.$distance.'",'.$nb.'],';
 			}
 			$hist_data = substr($hist_data, 0, -1);
-            ?>
+			?>
             <div class="col-md-6">
                 <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
                 <?php
-                  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
+				  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawCharthist_'.str_replace(' ','_',strtolower($source)).');
                       function drawCharthist_'.str_replace(' ','_',strtolower($source)).'() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Distance").'", "'._("# of Flights").'"], ';
-                            print $hist_data;
-                        print ']);
+							print $hist_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -862,15 +862,15 @@ 
                               drawCharthist_'.str_replace(' ','_',strtolower($source)).'();
                             });
                   </script>';
-        	?>
+			?>
     	    </div>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         	<?php
-                  }
-                ?>
+				  }
+				?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>  

Spacing +75 added lines, -75 removed lines

@@ -7,17 +7,17 @@ 
 $title = _("Statistics");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
 	unset($_COOKIE['stats_airline_icao']);
-	setcookie('stats_airline_icao', '', time()-3600);
+	setcookie('stats_airline_icao', '', time() - 3600);
 	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
 	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 require_once('header.php');
 
 ?>
@@ -37,7 +37,7 @@ 
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+		print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 	}
     ?>
     </div>
@@ -46,30 +46,30 @@ 
     ?>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 	    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         <?php
     	    } else {
     	?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     	<?php
     	    }
     	?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name)); ?></span> <?php echo _("Aircrafts types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name)); ?></span> <?php echo _("Aircrafts types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         <?php
     		if ($airline_icao == '') {
     	?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 		}
 	?>
@@ -77,18 +77,18 @@ 
 		if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) {
 	?>
         <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 		}
 	?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
+                  $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name);
 		    if (count($aircraft_array) == 0) print _("No data available");
 		    else {
 
@@ -100,7 +100,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Aircraft").'", "'._("# of times").'"], ';
                             $aircraft_data = '';
-                          foreach($aircraft_array as $aircraft_item)
+                          foreach ($aircraft_array as $aircraft_item)
                                     {
                                             $aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
                                     }
@@ -127,11 +127,11 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/aircraft" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
     if ($airline_icao == '' || $airline_icao == 'all') {
-	$airline_array = $Stats->countAllAirlines(true,$filter_name);
+	$airline_array = $Stats->countAllAirlines(true, $filter_name);
 	if (count($airline_array) > 0) {
             print '<div class="col-md-6">';
 	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
@@ -143,7 +143,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Airline").'", "'._("# of times").'"], ';
 	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
+	    foreach ($airline_array as $airline_item)
 	    {
 		$airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 	    }
@@ -169,13 +169,13 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     }
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
+    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao, $filter_name);
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
 	    print '<div class="col-md-12">';
@@ -185,7 +185,7 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
+	$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
@@ -196,7 +196,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Pilots").'", "'._("# of times").'"], ';
 	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
+	    foreach ($pilot_array as $pilot_item)
 	    {
 		$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 	    }
@@ -224,14 +224,14 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     } else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
+	$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
@@ -242,7 +242,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Owner").'", "'._("# of times").'"], ';
                             $owner_data = '';
-	    foreach($owner_array as $owner_item)
+	    foreach ($owner_array as $owner_item)
 	    {
 		$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 	    }
@@ -270,7 +270,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     }
     if (!empty($flightover_array)) {
@@ -289,7 +289,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Country").'", "'._("# of times").'"], ';
                             $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
+	    foreach ($flightover_array as $flightover_item)
 	    {
 		$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
 	    }
@@ -322,14 +322,14 @@ 
     }
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
     	
         </div>
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
+    $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name);
     if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div>
@@ -344,7 +344,7 @@ 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
                     $airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 	    $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 	    $name = str_replace("'", "", $name);
@@ -371,11 +371,11 @@ 
     }
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
+    $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name);
     if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div>
@@ -390,10 +390,10 @@ 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
 	$airport_data2 = '';
-	foreach($airport_airport_array2 as $airport_item2)
+	foreach ($airport_airport_array2 as $airport_item2)
 	{
 	    $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
-	    $name2 = str_replace(array("'",'"'), '', $name2);
+	    $name2 = str_replace(array("'", '"'), '', $name2);
 	    $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
 	}
 	$airport_data2 = substr($airport_data2, 0, -1);
@@ -417,13 +417,13 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+                  $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		    if (count($year_array) == 0) print _("No data available");
 		    else {
                   print '<div id="chart8" class="chart" width="100%"></div>
@@ -434,9 +434,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Flights").'"], ';
                             $year_data = '';
-                          foreach($year_array as $year_item)
+                          foreach ($year_array as $year_item)
                                     {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
+                                        $year_data .= '[ "'.date('F, Y', strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
                                     }
                                     $year_data = substr($year_data, 0, -1);
                                     print $year_data;
@@ -464,12 +464,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+                  $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		    if (count($month_array) == 0) print _("No data available");
 		    else {
                   print '<div id="chart9" class="chart" width="100%"></div>
@@ -480,9 +480,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Day").'", "'._("# of Flights").'"], ';
                             $month_data = '';
-                          foreach($month_array as $month_item)
+                          foreach ($month_array as $month_item)
                                     {
-                                        $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
+                                        $month_data .= '[ "'.date('F j, Y', strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
                                     }
                                     $month_data = substr($month_data, 0, -1);
                                     print $month_data;
@@ -510,12 +510,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+                    $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		    if (empty($date_array)) print _("No data available");
 		    else {
                   print '<div id="chart5" class="chart" width="100%"></div>
@@ -527,7 +527,7 @@ 
                             ["'._("Date").'", "'._("# of Flights").'"], ';
                             $date_data = '';
                         
-                          foreach($date_array as $date_item)
+                          foreach ($date_array as $date_item)
                                     {
                                         $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
                                     }
@@ -557,12 +557,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+                  $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		    if (empty($hour_array)) print _("No data available");
 		    else {
 
@@ -574,7 +574,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Hour").'", "'._("# of Flights").'"], ';
                             $hour_data = '';
-                          foreach($hour_array as $hour_item)
+                          foreach ($hour_array as $hour_item)
                                     {
                                         $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
                                     }
@@ -604,7 +604,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
     if (isset($globalAccidents) && $globalAccidents) {
@@ -626,7 +626,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Year").'", "'._("# of Fatalities").'"], ';
                             $year_data = '';
-                          foreach($year_array as $year_item)
+                          foreach ($year_array as $year_item)
                                     {
                                         $year_data .= '[ "'.$year_item['year'].'",'.$year_item['count'].'],';
                                     }
@@ -656,7 +656,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
@@ -675,9 +675,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Fatalities").'"], ';
                             $year_data = '';
-                          foreach($year_array as $year_item)
+                          foreach ($year_array as $year_item)
                                     {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],';
+                                        $year_data .= '[ "'.date('F, Y', strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],';
                                     }
                                     $year_data = substr($year_data, 0, -1);
                                     print $year_data;
@@ -705,7 +705,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <br/>
 <?php
     }
@@ -716,14 +716,14 @@ 
 ?>
         <div class="row column">
         	<?php
-        	    $polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+        	    $polar = $Stats->getStatsSource(date('Y-m-d'), 'polar');
         	    if (!empty($polar)) {
             		print '<h2>'._("Coverage pattern").'</h2>';
         		foreach ($polar as $eachpolar) {
         		    unset($polar_data);
 	        	    $Spotter = new Spotter();
         		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
+        		    foreach ($data as $value => $key) {
         			$direction = $Spotter->parseDirection(($value*22.5));
         			$distance = $key;
         			$unit = 'km';
@@ -743,7 +743,7 @@ 
         	?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -767,7 +767,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -779,19 +779,19 @@ 
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    $msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+        	    $msg = $Stats->getStatsSource(date('Y-m-d'), 'msg');
         	    if (!empty($msg)) {
             		print '<h2>'._("Messages received").'</h2>';
         		foreach ($msg as $eachmsg) {
         		    //$eachmsg = $msg[0];
         		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
+        		    if ($data > 500) $max = (round(($data + 100)/100))*100;
         		    else $max = 500;
         	?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -811,12 +811,12 @@ 
         <div class="row column">
 
             <?php
-		$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
+		$hist = $Stats->getStatsSource(date('Y-m-d'), 'hist');
 		foreach ($hist as $hists) {
 			$hist_data = '';
 			$source = $hists['source_name'];
 			$hist_array = json_decode($hists['source_data']);
-			foreach($hist_array as $distance => $nb)
+			foreach ($hist_array as $distance => $nb)
 			{
 				$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -834,13 +834,13 @@ 
 			$hist_data = substr($hist_data, 0, -1);
             ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2>
                 <?php
-                  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
+                  print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
-                      google.setOnLoadCallback(drawCharthist_'.str_replace(' ','_',strtolower($source)).');
-                      function drawCharthist_'.str_replace(' ','_',strtolower($source)).'() {
+                      google.setOnLoadCallback(drawCharthist_'.str_replace(' ', '_', strtolower($source)).');
+                      function drawCharthist_'.str_replace(' ', '_', strtolower($source)).'() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Distance").'", "'._("# of Flights").'"], ';
                             print $hist_data;
@@ -855,16 +855,16 @@ 
                             colors: ["#1a3151"]
                         };
 
-                        var chart = new google.visualization.AreaChart(document.getElementById("charthist-'.str_replace(' ','_',strtolower($source)).'"));
+                        var chart = new google.visualization.AreaChart(document.getElementById("charthist-'.str_replace(' ', '_', strtolower($source)).'"));
                         chart.draw(data, options);
                       }
                       $(window).resize(function(){
-                              drawCharthist_'.str_replace(' ','_',strtolower($source)).'();
+                              drawCharthist_'.str_replace(' ', '_', strtolower($source)).'();
                             });
                   </script>';
         	?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         	<?php
                   }
                 ?>

Braces +50 added lines, -28 removed lines

@@ -6,7 +6,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
 	unset($_COOKIE['stats_airline_icao']);
@@ -15,8 +17,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
 	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+	if (isset($globalFilter['airline'])) {
+		$airline_icao = $globalFilter['airline'][0];
+	}
+	}
 setcookie('stats_airline_icao',$airline_icao);
 require_once('header.php');
 
@@ -36,7 +40,9 @@ 
 	if (isset($last_update[0]['value'])) {
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
-		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
+		if (isset($globalTimezone) && $globalTimezone != '') {
+			date_default_timezone_set($globalTimezone);
+		}
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
     ?>
@@ -89,8 +95,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
                   $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+		    if (count($aircraft_array) == 0) {
+		    	print _("No data available");
+		    } else {
 
                     print '<div id="chart1" class="chart" width="100%"></div>
                     <script> 
@@ -186,8 +193,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
-	if (count($pilot_array) == 0) print _("No data available");
-	else {
+	if (count($pilot_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -232,8 +240,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
-	if (count($owner_array) == 0) print _("No data available");
-	else {
+	if (count($owner_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -279,8 +288,9 @@ 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
 <?php
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
-	if (count($flightover_array) == 0) print _("No data available");
-	else {
+	if (count($flightover_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart10" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -424,8 +434,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
                   $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+		    if (count($year_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart8" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -470,8 +481,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
                   $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
+		    if (count($month_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart9" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -516,8 +528,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
                     $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
+		    if (empty($date_array)) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart5" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -563,8 +576,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
                   $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
+		    if (empty($hour_array)) {
+		    	print _("No data available");
+		    } else {
 
                   print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
@@ -616,8 +630,9 @@ 
 		    require_once('require/class.Accident.php');
             	    $Accident = new Accident();
                   $year_array = $Accident->countFatalitiesByYear($filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+		    if (count($year_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart32" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -665,8 +680,9 @@ 
 		    require_once('require/class.Accident.php');
             	    $Accident = new Accident();
                   $year_array = $Accident->countFatalitiesLast12Months($filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+		    if (count($year_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart33" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -737,8 +753,11 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			if (!isset($polar_data)) {
+        				$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			} else {
+        	    			$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        	    		}
         		    }
         	?>
             <div class="col-md-6">
@@ -785,8 +804,11 @@ 
         		foreach ($msg as $eachmsg) {
         		    //$eachmsg = $msg[0];
         		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
+        		    if ($data > 500) {
+        		    	$max = (round(($data+100)/100))*100;
+        		    } else {
+        		    	$max = 500;
+        		    }
         	?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>

table-output.php

Indentation +18 added lines, -18 removed lines

@@ -390,17 +390,17 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (isset($spotter_item['airline_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
-                        } else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+						} else {
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -415,7 +415,7 @@ 
 		}
 	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
-		    $spotter_item['squawk'] = '-';
+			$spotter_item['squawk'] = '-';
 		}
 		if ($spotter_item['image_thumbnail'] != "")
 		{
@@ -426,7 +426,7 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -438,9 +438,9 @@ 
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
 			} else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -454,7 +454,7 @@ 
 			print '</td>'."\n";
 		} else {
 			print '<td class="aircraft_thumbnail">'."\n";
-       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
+	   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 	//}
 			if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
 				print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";
@@ -559,13 +559,13 @@ 
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
 			} else $distance = '';
 			if ($distance != '') {
-			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
-			    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-				    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
-			    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-				    echo '<br/><i>'.$distance.' km</i>';
-			    }
+				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+					echo '<br/><i>'.round($distance*0.539957).' nm</i>';
+				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+					echo '<br/><i>'.round($distance*0.621371).' mi</i>';
+				} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+					echo '<br/><i>'.$distance.' km</i>';
+				}
 			}
 		}
 		print '</td>'."\n";

Spacing +38 added lines, -38 removed lines

@@ -94,7 +94,7 @@ 
 	}
 	print '<th class="more"></th>';
 	print '</thead>';
-} else if (strtolower($current_page) == "upcoming"){
+} else if (strtolower($current_page) == "upcoming") {
 	print '<thead>';
 	if ($_GET['sort'] == "airline_name_asc")
 	{
@@ -144,7 +144,7 @@ 
 	}
 	*/
 	print '</thead>';
-} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){
+} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 	print '<thead>';
 	print '<th class="aircraft_thumbnail"></th>';
 	print '<th class="logo">'._("Airline").'</th>';
@@ -181,7 +181,7 @@ 
 	print '</thead>';
 } else {
 
-	if ($hide_th_links === true){
+	if ($hide_th_links === true) {
 		print '<thead>';
 		print '<th class="aircraft_thumbnail"></th>';
 		if ($_GET['sort'] == "airline_name_asc")
@@ -362,7 +362,7 @@ 
 }
 
 print '<tbody>'."\n";
-foreach($spotter_array as $spotter_item)
+foreach ($spotter_array as $spotter_item)
 {
 	if (isset($globalTimezone))
 	{
@@ -393,13 +393,13 @@ 
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (isset($spotter_item['airline_name'])) {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
                         } else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+                    		$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
                     		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -413,7 +413,7 @@ 
 			print '<img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" />'."\n";
 			print '</td>'."\n";
 		}
-	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
+	} elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed") {
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
 		    $spotter_item['squawk'] = '-';
 		}
@@ -429,17 +429,17 @@ 
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
 			} else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+                    		$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
                     		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -502,7 +502,7 @@ 
 	}
 	print '</td>'."\n";
 	// Aircraft type
-	if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){
+	if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") {
 		print '<td class="type">'."\n";
 		if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) {
 			print '<span class="nomobile">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</span>'."\n";
@@ -526,22 +526,22 @@ 
 		}
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 			if ($spotter_item['departure_airport_time'] > 2460) {
-				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+				$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
+			} else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
-				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+				$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
-				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+				$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
-				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
+				$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
 			} else {
-				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+				$departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 			}
 			print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n";
 		}
@@ -556,7 +556,7 @@ 
 					$latitude = $spotter_item['latitude'];
 					$longitude = $spotter_item['longitude'];
 				}
-				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
+				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude);
 			} else $distance = '';
 			if ($distance != '') {
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -597,20 +597,20 @@ 
 		}
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
-				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+				$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
-				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+				$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
-				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+				$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
-				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+				$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 		}
@@ -623,7 +623,7 @@ 
 					$latitude = $spotter_item['latitude'];
 					$longitude = $spotter_item['longitude'];
 				}
-				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
+				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude);
 			} else $distance = '';
 			if ($distance != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -638,7 +638,7 @@ 
 		print '</td>'."\n";
 		if ((isset($globalIvAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalVAM) && $globalVAM) || (isset($globalphpVMS) && $globalphpVMS)) {
 			// Route stop
-			if(strtolower($current_page) != "upcoming"){
+			if (strtolower($current_page) != "upcoming") {
 				print '<td class="route_stop">'."\n";
 				if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') {
 					print '<span class="nomobile">-</span>'."\n";
@@ -663,21 +663,21 @@ 
 			} else {
 				//if (!isset($globalUnitDistance) || $globalUnitDistance == 'km') {
 				if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-					print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n";
 				//} elseif ($globalUnitDistance == 'mi') {
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n";
 				//} elseif ($globalUnitDistance == 'nm') {
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n";
 				}
 			}
 			print '</td>'."\n";
 		}
-		if(strtolower($current_page) != "upcoming"){
+		if (strtolower($current_page) != "upcoming") {
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 				print '<td class="pilot">'."\n";
 				if ((!isset($spotter_item['pilot_id']) || $spotter_item['pilot_id'] == '') && (!isset($spotter_item['pilot_name']) || $spotter_item['pilot_name'] == '')) {
@@ -712,7 +712,7 @@ 
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 		if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') {
 			print '<td class="message"><p>'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</p><p class="decode">';
 			$decode_array = json_decode($spotter_item['decode']);
 			foreach ($decode_array as $key => $value) {
@@ -722,7 +722,7 @@ 
 			print '</td>'."\n";
 		} else {
 			print '<td class="message">'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</td>'."\n";
 		}
 	}
@@ -747,7 +747,7 @@ 
 		}
 		print '</td>'."\n";
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 	if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") {
@@ -773,7 +773,7 @@ 
 		print '</td>'."\n";
 		*/
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 	// Date

Braces +45 added lines, -17 removed lines

@@ -367,7 +367,9 @@ 
 	if (isset($globalTimezone))
 	{
 		date_default_timezone_set($globalTimezone);
-	} else date_default_timezone_set('UTC');
+	} else {
+		date_default_timezone_set('UTC');
+	}
 	if ($showSpecial === true)
 	{
 		print '<tr class="special">'."\n";
@@ -386,8 +388,9 @@ 
 			print '<td class="aircraft_thumbnail">'."\n";
 			
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -400,7 +403,9 @@ 
                         } else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -422,8 +427,9 @@ 
 			print '<td class="aircraft_thumbnail">'."\n";
 			//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -440,7 +446,9 @@ 
 			} else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -527,15 +535,21 @@ 
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 			if ($spotter_item['departure_airport_time'] > 2460) {
 				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+			} else {
+				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+			}
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			} else {
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			} else {
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
@@ -557,7 +571,9 @@ 
 					$longitude = $spotter_item['longitude'];
 				}
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
-			} else $distance = '';
+			} else {
+				$distance = '';
+			}
 			if ($distance != '') {
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -582,7 +598,9 @@ 
 		} else {
 			if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
 				print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
-				if (!isset($Spotter)) $Spotter = new Spotter();
+				if (!isset($Spotter)) {
+					$Spotter = new Spotter();
+				}
 				$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
 				print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
 				print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -598,20 +616,28 @@ 
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+			} else {
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
+			}
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			} else {
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			} else {
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+			} else {
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 		}
 		if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -624,7 +650,9 @@ 
 					$longitude = $spotter_item['longitude'];
 				}
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
-			} else $distance = '';
+			} else {
+				$distance = '';
+			}
 			if ($distance != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					echo '<br/><i>'.round($distance*0.539957).' nm</i>';