Ysurac / FlightAirMap

highlights-display.php

Spacing +5 added lines, -5 removed lines

@@ -7,15 +7,15 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
 } else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 	if (!ctype_digit(strval($limit_start)) || !ctype_digit(strval($limit_end))) {
 		$limit_start = 0;
 		$limit_end = 25;
@@ -39,7 +39,7 @@ 
 print '<div class="column">';	
 print '<p>'._("The view below shows all aircrafts that have been selected to have some sort of special characteristic about them, such as unique liveries, destinations etc.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	$spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort);
 } else {
@@ -48,7 +48,7 @@ 
 if (!empty($spotter_array))
 {
 	print '<div class="dispay-view">';
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		if (isset($spotter_item['image']) && $spotter_item['image'] != "")
 		{

require/class.SpotterImport.php

Spacing +153 added lines, -153 removed lines

@@ -34,12 +34,12 @@ 
 		$currentdate = date('Y-m-d');
 		$sourcestat = $Stats->getStatsSource($currentdate);
 		if (!empty($sourcestat)) {
-		    foreach($sourcestat as $srcst) {
+		    foreach ($sourcestat as $srcst) {
 		    	$type = $srcst['stats_type'];
 			if ($type == 'polar' || $type == 'hist') {
 			    $source = $srcst['source_name'];
 			    $data = $srcst['source_data'];
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
 	    		}
 		    }
 		}
@@ -51,14 +51,14 @@ 
 	if (isset($globalGeoid) && $globalGeoid) {
 		try {
 			$GeoidClass = new GeoidHeight();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php \n";
 			$GeoidClass = FALSE;
 		}
 	}
     }
 
-    public function get_Schedule($id,$ident) {
+    public function get_Schedule($id, $ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -83,8 +83,8 @@ 
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
 		    // Should also check if route schedule = route from DB
 		    if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -104,7 +104,7 @@ 
 			    }
 			}
 		    }
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
 		}
 	    } else $scheduleexist = true;
 	} else $scheduleexist = true;
@@ -112,7 +112,7 @@ 
        if ($scheduleexist) {
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
     		$sch = $Schedule->getSchedule($operator);
-		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
+		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time']));
        }
 	$Spotter->db = null;
 	$Schedule->db = null;
@@ -139,7 +139,7 @@ 
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
     		    $Spotter = new Spotter($this->db);
         	    $real_arrival = $this->arrival($key);
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
         	}
 	    }
 	}
@@ -153,7 +153,7 @@ 
         $airport_time = '';
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
     	    if (isset($closestAirports[0])) {
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -168,7 +168,7 @@ 
         		    break;
         		}
         	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
@@ -181,7 +181,7 @@ 
         } else {
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
         }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
     }
 
 
@@ -192,7 +192,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_flights as $key => $flight) {
 	    if (isset($flight['lastupdate'])) {
-		if ($flight['lastupdate'] < (time()-5900)) {
+		if ($flight['lastupdate'] < (time() - 5900)) {
 		    $this->delKey($key);
 		}
 	    }
@@ -208,7 +208,7 @@ 
 			$real_arrival = $this->arrival($key);
 			$Spotter = new Spotter($this->db);
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 		}
@@ -241,7 +241,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
 	    //print_r($line);
 	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
   	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
@@ -277,25 +277,25 @@ 
 		if (!isset($this->all_flights[$id])) {
 		    if ($globalDebug) echo 'New flight...'."\n";
 		    $this->all_flights[$id] = array();
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => ''));
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		if (isset($line['source_type']) && $line['source_type'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
 		}
 		
 		//print_r($this->all_flights);
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -304,27 +304,27 @@ 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			    $Spotter = new Spotter($this->db);
 			    if (isset($this->all_flights[$id]['source_type'])) {
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
 			    } else {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 			}
 		    }
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
 		}
 	        if (isset($line['id']) && !isset($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => ''));
 	        }
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
 			$icao = $line['aircraft_icao'];
 			$Spotter = new Spotter($this->db);
 			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
 			$Spotter->db = null;
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -332,7 +332,7 @@ 
 				$Spotter = new Spotter($this->db);
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
 				$Spotter->db = null;
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 			}
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -340,15 +340,15 @@ 
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
 		}
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
@@ -359,31 +359,31 @@ 
 				*/
 				return '';
 		    }
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n";
 			return '';
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
 			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n";
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
 		} else {
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
 			return '';
 		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id'])));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name'])));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
@@ -391,13 +391,13 @@ 
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
+				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 			} else {
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$timeelapsed = microtime(true);
             			$Spotter = new Spotter($this->db);
@@ -407,13 +407,13 @@ 
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
+            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			    }
 			}
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
 		    
 /*
 		    if (!isset($line['id'])) {
@@ -423,25 +423,25 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 
 		    //$putinarchive = true;
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
 		    }
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
 		    }
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
                         }
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -455,35 +455,35 @@ 
 				$Translation->db = null;
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
                     	}
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop']));
 		    	    }
 			}
 			if (!isset($globalFork)) $globalFork = TRUE;
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
 			}
 		    }
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
 		    //$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
 		    if ($distance > 1000 && $distance < 10000) {
 		    // use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) {
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
 	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
 	  		} else {
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
@@ -498,9 +498,9 @@ 
 	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
 	    	    	return false;
 	    	    }
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']);
 	    	    else unset($timediff_archive);
 	    	    if ($this->tmd > 5
 	    	        || (isset($line['format_source']) 
@@ -524,14 +524,14 @@ 
 	    	    	|| ($timediff > 30 
 	    	    	    && isset($this->all_flights[$id]['latitude']) 
 	    	    	    && isset($this->all_flights[$id]['longitude']) 
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
+	    	    	    && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'))
 	    	    	    )
 	    	    	) {
 
 			if ((isset($timediff) && !isset($timediff_archive)) || (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude']))) {
 			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
-				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -541,11 +541,11 @@ 
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 					else $this->all_flights[$id]['over_country'] = '';
 					$Spotter->db = null;
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
 				    }
 				}
@@ -571,13 +571,13 @@ 
 					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				//if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) {
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -599,13 +599,13 @@ 
 					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				//if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) {
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -623,46 +623,46 @@ 
 		    } else if ($globalDebug && $timediff > 30) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
 		    //$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
 		    //$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// Here we force archive of flight because after ground it's a new one (or should be)
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
+			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		    }
 		    if ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
 		    //$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 			    $highlight = '';
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -671,66 +671,66 @@ 
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Spotter = new Spotter($this->db);
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
 				    $Spotter->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 				//$putinarchive = true;
 				//$highlight = '';
 			    }
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) {
 				if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') {
-					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2);
+					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2);
 					//if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n";
 					$line['altitude'] = $line['altitude'] - $geoid;
 				}
 			}
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
+				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 			}
 		    }
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude']));
 		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
   		    // If not enough messages and ACARS set heading to 0
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
   		}
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
+		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
 
 //		print_r($this->all_flights[$id]);
 		//gets the callsign from the last hour
@@ -741,7 +741,7 @@ 
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
 		    $this->all_flights[$id]['lastupdate'] = time();
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    //print_r($this->all_flights);
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -752,61 +752,61 @@ 
 				    $SpotterLive = new SpotterLive($this->db);
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($line['id'])) {
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } else $recent_ident = '';
-				    $SpotterLive->db=null;
+				    $SpotterLive->db = null;
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
 			    } else {
 				$recent_ident = '';
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
 				$ignoreImport = false;
-				foreach($globalAirportIgnore as $airportIgnore) {
+				foreach ($globalAirportIgnore as $airportIgnore) {
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
 				    }
 				}
 				if (count($globalAirportAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+				    foreach ($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 					    $ignoreImport = true;
 					}
 				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				    foreach ($globalAirlineAccept as $airlineAccept) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 					    $ignoreImport = false;
 					}
@@ -818,32 +818,32 @@ 
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
+					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']);
 					    $Spotter->db = null;
 					    if ($globalDebug && isset($result)) echo $result."\n";
 					}
 				    }
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        foreach ($this->stats as $date => $data) {
+					    foreach ($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -881,14 +881,14 @@ 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $SpotterLive = new SpotterLive($this->db);
 					    $SpotterLive->deleteLiveSpotterData();
-					    $SpotterLive->db=null;
+					    $SpotterLive->db = null;
 					}
 				    }
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
 			    } else {
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
 				    $this->all_flights[$id]['id'] = $recent_ident;
 				    $this->all_flights[$id]['addedSpotter'] = 1;
 				}
@@ -896,7 +896,7 @@ 
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
 					    $Spotter->db = null;
 					}
 				    }
@@ -922,37 +922,37 @@ 
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
+		    foreach ($globalAirportIgnore as $airportIgnore) {
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 			    $ignoreImport = true;
 			}
 		    }
 		    if (count($globalAirportAccept) > 0) {
 		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
+		        foreach ($globalAirportIgnore as $airportIgnore) {
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 				$ignoreImport = true;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+			foreach ($globalAirlineAccept as $airlineAccept) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 			        $ignoreImport = false;
 			    }
@@ -960,23 +960,23 @@ 
 		    }
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 					$SpotterLive = new SpotterLive($this->db);
-					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
+					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
 					$SpotterLive->db = null;
 					if ($globalDebug) echo $result."\n";
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
-					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
+					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
 				}
 				$this->all_flights[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				// Put statistics in $this->stats variable
 				//if ($line['format_source'] != 'aprs') {
@@ -995,19 +995,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -1022,9 +1022,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -1037,7 +1037,7 @@ 
 				$this->all_flights[$id]['lastupdate'] = time();
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {

require/class.Image.php

Spacing +114 added lines, -114 removed lines

@@ -17,22 +17,22 @@ 
 	* @return Array the images list
 	*
 	*/
-	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 		$reg = $registration;
 		if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
 		$reg = trim($reg);
-		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
+		$query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
 			FROM spotter_image 
 			WHERE spotter_image.registration = :registration LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $reg));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (!empty($result)) return $result;
-		elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
+		elseif ($registration != '') return $this->getSpotterImage('', $aircraft_icao, $airline_icao);
 		else return array();
 	}
 
@@ -42,23 +42,23 @@ 
 	* @return Array the images list
 	*
 	*/
-	public function getMarineImage($mmsi,$imo = '',$name = '')
+	public function getMarineImage($mmsi, $imo = '', $name = '')
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		$query  = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name 
+		$query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name 
 			FROM marine_image 
 			WHERE marine_image.mmsi = :mmsi";
 		$query_data = array(':mmsi' => $mmsi);
 		if ($imo != '') {
 			$query .= " AND marine_image.imo = :imo";
-			$query_data = array_merge($query_data,array(':imo' => $imo));
+			$query_data = array_merge($query_data, array(':imo' => $imo));
 		}
 		if ($name != '') {
 			$query .= " AND marine_image.name = :name";
-			$query_data = array_merge($query_data,array(':name' => $name));
+			$query_data = array_merge($query_data, array(':name' => $name));
 		}
 		$query .= " LIMIT 1";
 		$sth = $this->db->prepare($query);
@@ -79,9 +79,9 @@ 
 		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
 		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
 		if ($copyright != '') {
-			$copyright = str_replace('Copyright ','',$copyright);
-			$copyright = str_replace('© ','',$copyright);
-			$copyright = str_replace('(c) ','',$copyright);
+			$copyright = str_replace('Copyright ', '', $copyright);
+			$copyright = str_replace('© ', '', $copyright);
+			$copyright = str_replace('(c) ', '', $copyright);
 		}
 		return $copyright;
 	}
@@ -92,25 +92,25 @@ 
 	* @return String either success or error
 	*
 	*/
-	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		global $globalDebug,$globalAircraftImageFetch;
+		global $globalDebug, $globalAircraftImageFetch;
 		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
 		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
 		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
 		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
-		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
+		$image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao);
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 		if ($image_url['original'] != '') {
 			if ($globalDebug) echo 'Found !'."\n";
-			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
+			$query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-			} catch(PDOException $e) {
+				$sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
+			} catch (PDOException $e) {
 				echo $e->getMessage()."\n";
 				return "error";
 			}
@@ -124,13 +124,13 @@ 
 	* @return String either success or error
 	*
 	*/
-	public function addMarineImage($mmsi,$imo = '',$name = '')
+	public function addMarineImage($mmsi, $imo = '', $name = '')
 	{
-		global $globalDebug,$globalMarineImageFetch;
+		global $globalDebug, $globalMarineImageFetch;
 		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return '';
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
 		$name = trim($name);
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -144,14 +144,14 @@ 
 
 		//getting the aircraft image
 		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
-		$image_url = $this->findMarineImage($mmsi,$imo,$name);
+		$image_url = $this->findMarineImage($mmsi, $imo, $name);
 		if ($image_url['original'] != '') {
 			if ($globalDebug) echo 'Found !'."\n";
-			$query  = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)";
+			$query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':name' => $name,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-			} catch(PDOException $e) {
+				$sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':name' => $name, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
+			} catch (PDOException $e) {
 				echo $e->getMessage()."\n";
 				return "error";
 			}
@@ -171,9 +171,9 @@ 
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
 		$Spotter = new Spotter($this->db);
 		if (!isset($globalIVAO)) $globalIVAO = FALSE;
-		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
+		$aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '' && (!isset($globalVA) || $globalVA !== TRUE)) {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
 			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
@@ -187,25 +187,25 @@ 
 			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
 			else $aircraft_name = '';
 			$aircraft_registration = $aircraft_icao;
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		} else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		unset($Spotter);
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft', $aircraft_icao, $airline_icao);
+			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'bing') $images_array = $this->fromBing('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft', $aircraft_registration, $aircraft_name);
+			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft', $aircraft_registration, $aircraft_name);
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
 		}
 		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -217,14 +217,14 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function findMarineImage($mmsi,$imo = '',$name = '')
+	public function findMarineImage($mmsi, $imo = '', $name = '')
 	{
 		global $globalMarineImageSources;
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$name = filter_var($name,FILTER_SANITIZE_STRING);
+		$name = filter_var($name, FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		if (strlen($name) < 4) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 		/*
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -236,17 +236,17 @@ 
 		}
 		unset($Marine);
 		*/
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia', 'deviantart', 'flickr', 'bing');
 		foreach ($globalMarineImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
+			if ($source == 'flickr') $images_array = $this->fromFlickr('marine', $mmsi, $name);
+			if ($source == 'bing') $images_array = $this->fromBing('marine', $mmsi, $name);
+			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine', $mmsi, $name);
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine', $mmsi, $name);
+			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine', $mmsi, $name);
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -257,24 +257,24 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
+	public function fromPlanespotters($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
 		} else {
 			//$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$image_url['original'] = str_replace('thumbnail','original',$thumbnail_url);
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'planespotters';
 				return $image_url;
 			}
@@ -290,30 +290,30 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromDeviantart($type,$registration, $name='') {
+	public function fromDeviantart($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			// If aircraft registration is only number, also check with aircraft model
-			if (preg_match('/^[[:digit]]+$/',$registration) && $name != '') {
-				$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name);
+			if (preg_match('/^[[:digit]]+$/', $registration) && $name != '') {
+				$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name);
 			} else {
-				$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration;
+				$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration;
 			}
 		} elseif ($type == 'marine') {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"';
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"';
 		} else {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
 		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item->link)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'deviantart';
 				return $image_url;
 			}
@@ -329,32 +329,32 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
+	public function fromJetPhotos($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
+		$url = 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			if ($image->getAttribute('itemprop') == "http://schema.org/image") {
 				$all_pics[] = $image->getAttribute('src');
 			}
 		}
 		$all_authors = array();
-		foreach($dom->getElementsByTagName('meta') as $author) {
+		foreach ($dom->getElementsByTagName('meta') as $author) {
 			if ($author->getAttribute('itemprop') == "http://schema.org/author") {
 				$all_authors[] = $author->getAttribute('content');
 			}
 		}
 		$all_ref = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
+		foreach ($dom->getElementsByTagName('a') as $link) {
 			$all_ref[] = $link->getAttribute('href');
 		}
 		if (isset($all_pics[0])) {
 			$image_url = array();
 			$image_url['thumbnail'] = $all_pics[0];
-			$image_url['original'] = str_replace('_tb','',$all_pics[0]);
+			$image_url['original'] = str_replace('_tb', '', $all_pics[0]);
 			$image_url['copyright'] = $all_authors[0];
 			$image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8];
 			$image_url['source'] = 'JetPhotos';
@@ -371,24 +371,24 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
+	public function fromPlanePictures($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
+		$url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			$all_pics[] = $image->getAttribute('src');
 		}
 		$all_links = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
-			$all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
+		foreach ($dom->getElementsByTagName('a') as $link) {
+			$all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href'));
 		}
-		if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1]) && !preg_match('/flagge/',$all_pics[1])) {
+		if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1]) && !preg_match('/flagge/', $all_pics[1])) {
 			$image_url = array();
 			$image_url['thumbnail'] = 'http://www.planepictures.net/'.$all_pics[1];
-			$image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN','',$all_pics[1]);
+			$image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN', '', $all_pics[1]);
 			$image_url['copyright'] = $all_links[6]['text'];
 			$image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href'];
 			$image_url['source'] = 'PlanePictures';
@@ -405,7 +405,7 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromFlickr($type,$registration,$name='') {
+	public function fromFlickr($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
@@ -417,12 +417,12 @@ 
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
-				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->enclosure->attributes()->url);
 				$image_url = array();
 				$image_url['thumbnail'] = $original_url;
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'flickr';
 				return $image_url;
 			}
@@ -430,7 +430,7 @@ 
 		return false;
 	}
 
-	public function fromIvaoMtl($type,$aircraft_icao,$airline_icao) {
+	public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) {
 		$Common = new Common();
 		//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
 		if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
@@ -454,7 +454,7 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
+	public function fromBing($type, $aircraft_registration, $aircraft_name = '') {
 		global $globalImageBingKey;
 		$Common = new Common();
 		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
@@ -465,8 +465,8 @@ 
 			if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27';
 			else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27';
 		}
-		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
-		$data = $Common->getData($url,'get','',$headers);
+		$headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey));
+		$data = $Common->getData($url, 'get', '', $headers);
 		$result = json_decode($data);
 		if (isset($result->d->results[0]->MediaUrl)) {
 			$image_url = array();
@@ -491,14 +491,14 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromAirportData($type,$aircraft_registration,$aircraft_name='') {
+	public function fromAirportData($type, $aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->count) && $result->count > 0) {
 			$image_url = array();
-			$image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
+			$image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image);
 			$image_url['source_website'] = $result->data[0]->link;
 			$image_url['thumbnail'] = $result->data[0]->image;
 			$image_url['copyright'] = $result->data[0]->photographer;
@@ -516,7 +516,7 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromWikimedia($type,$registration,$name='') {
+	public function fromWikimedia($type, $registration, $name = '') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
 			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
@@ -529,7 +529,7 @@ 
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo, -3) == 'pdf') return false;
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -554,11 +554,11 @@ 
 				if (isset($result2->query->pages)) {
 					foreach ($result2->query->pages as $page) {
 						if (isset($page->imageinfo[0]->extmetadata->Artist)) {
-							$image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
+							$image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
 							if (isset($page->imageinfo[0]->extmetadata->License->value)) {
 								$image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
 							}
-							$image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
+							$image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright']));
 							return $image_url;
 						}
 					}
@@ -577,7 +577,7 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromCustomSource($type,$registration,$name='') {
+	public function fromCustomSource($type, $registration, $name = '') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 		if (!empty($globalAircraftImageCustomSources) && $type == 'aircraft') {
@@ -594,15 +594,15 @@ 
 					print_r($source);
 					print_r($customsources);
 				}
-				$url = str_replace('{registration}',$registration,$source['original']);
-				$url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']);
+				$url = str_replace('{registration}', $registration, $source['original']);
+				$url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']);
 				if ($Common->urlexist($url)) {
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
 					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
 					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
 					else $image_url['copyright'] = $source['source_website'];
 					$image_url['source_website'] = $source['source_website'];
@@ -626,19 +626,19 @@ 
 					print_r($source);
 					print_r($customsources);
 				}
-				$url = str_replace('{registration}',$registration,$source['original']);
-				$url = str_replace('{mmsi}',$registration,$url);
-				$url = str_replace('{name}',$name,$url);
-				$url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']);
-				$url_thumbnail = str_replace('{mmsi}',$registration,$url_thumbnail);
-				$url_thumbnail = str_replace('{name}',$name,$url_thumbnail);
+				$url = str_replace('{registration}', $registration, $source['original']);
+				$url = str_replace('{mmsi}', $registration, $url);
+				$url = str_replace('{name}', $name, $url);
+				$url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']);
+				$url_thumbnail = str_replace('{mmsi}', $registration, $url_thumbnail);
+				$url_thumbnail = str_replace('{name}', $name, $url_thumbnail);
 				if ($Common->urlexist($url)) {
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
 					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
 					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
 					else $image_url['copyright'] = $source['source_website'];
 					$image_url['source_website'] = $source['source_website'];

aircraft-data.php

Spacing +14 added lines, -14 removed lines

@@ -11,14 +11,14 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -29,15 +29,15 @@ 
 	}
 }
 if (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -56,7 +56,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -77,7 +77,7 @@ 
 	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 		if ($spotter_item['departure_airport_time'] > 2460) {
-			print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+			print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 		} else {
 			print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 		}
@@ -86,7 +86,7 @@ 
 	print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 		if ($spotter_item['arrival_airport_time'] > 2460) {
-			print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+			print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 		} else {
 			print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 		}
@@ -111,8 +111,8 @@ 
 print '<div id ="altitude"><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 	try {
-		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-	} catch(Exception $e) {
+		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+	} catch (Exception $e) {
 		// If catched not exist
 	}
 }
@@ -182,7 +182,7 @@ 
 
 if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
 if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
 if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
 print '</div>';
 ?>

country-statistics-manufacturer.php

Spacing +8 added lines, -8 removed lines

@@ -7,8 +7,8 @@ 
 	die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 } else {
@@ -17,16 +17,16 @@ 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft Manufacturer from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -41,7 +41,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -50,7 +50,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>';
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByCountry($country);
 	if (!empty($manufacturers_array))
 	{
@@ -63,7 +63,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';