Ysurac / FlightAirMap

scripts/daemon-spotter.php

Indentation +695 added lines, -695 removed lines

@@ -19,47 +19,47 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 if (PHP_SAPI != 'cli') {
-    echo "This script MUST be called from console, not a web browser.";
+	echo "This script MUST be called from console, not a web browser.";
 //    exit();
 }
 
 // This is to be compatible with old version of settings.php
 if (!isset($globalSources)) {
-    if (isset($globalSBS1Hosts)) {
-        //$hosts = $globalSBS1Hosts;
-        foreach ($globalSBS1Hosts as $host) {
-	    $globalSources[] = array('host' => $host);
-    	}
-    } else {
-        if (!isset($globalSBS1Host)) {
-	    echo '$globalSources MUST be defined !';
-	    die;
+	if (isset($globalSBS1Hosts)) {
+		//$hosts = $globalSBS1Hosts;
+		foreach ($globalSBS1Hosts as $host) {
+		$globalSources[] = array('host' => $host);
+		}
+	} else {
+		if (!isset($globalSBS1Host)) {
+		echo '$globalSources MUST be defined !';
+		die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
-    }
+	}
 }
 
 $options = getopt('s::',array('source::','server','idsource::'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['s']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['source']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['server'])) $globalServer = TRUE;
 if (isset($options['idsource'])) $id_source = $options['idsource'];
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+	if ($globalDebug) echo "Using Server Mode\n";
+	$SI=new SpotterServer();
 } else $SI=new SpotterImport($Connection->db);
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
@@ -69,12 +69,12 @@ 
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
-        global $sockets;
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-        die("Bye!\n");
-    });
-    pcntl_signal_dispatch();
+	pcntl_signal(SIGINT,  function() {
+		global $sockets;
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+		die("Bye!\n");
+	});
+	pcntl_signal_dispatch();
 }
 
 // let's try and connect
@@ -83,161 +83,161 @@ 
 $aprs_full = false;
 
 function create_socket($host, $port, &$errno, &$errstr) {
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_STREAM, 0);
-    $r = @socket_connect($s, $ip, $port);
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_STREAM, 0);
+	$r = @socket_connect($s, $ip, $port);
+	if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function create_socket_udp($host, $port, &$errno, &$errstr) {
-    echo "UDP !!";
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_DGRAM, 0);
-    $r = @socket_bind($s, $ip, $port);
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	echo "UDP !!";
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_DGRAM, 0);
+	$r = @socket_bind($s, $ip, $port);
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function connect_all($hosts) {
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    if ($globalDebug) echo 'Connect to all...'."\n";
-    foreach ($hosts as $id => $value) {
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	if ($globalDebug) echo 'Connect to all...'."\n";
+	foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
-        	//$formats[$id] = 'deltadbtxt';
-        	$globalSources[$id]['format'] = 'deltadbtxt';
-        	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
-        	//$formats[$id] = 'vatsimtxt';
-        	$globalSources[$id]['format'] = 'vatsimtxt';
-        	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'opensky';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
-        	//$formats[$id] = 'radarvirtueljson';
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
-        	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
-        	//$formats[$id] = 'planeupdatefaa';
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
-        	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'phpvmacars';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
-        	//$formats[$id] = 'whazzup';
-        	$globalSources[$id]['format'] = 'whazzup';
-        	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
-        	//$formats[$id] = 'pirepsjson';
-        	$globalSources[$id]['format'] = 'pirepsjson';
-        	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'fr24json';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
-        	//$formats[$id] = 'tsv';
-        	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
-            }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
-        	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
-	    if (isset($hostport[1])) {
+			if (preg_match('/deltadb.txt$/i',$host)) {
+			//$formats[$id] = 'deltadbtxt';
+			$globalSources[$id]['format'] = 'deltadbtxt';
+			//$last_exec['deltadbtxt'] = 0;
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
+			//$formats[$id] = 'vatsimtxt';
+			$globalSources[$id]['format'] = 'vatsimtxt';
+			//$last_exec['vatsimtxt'] = 0;
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'aircraftlistjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/opensky/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'opensky';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+			//$formats[$id] = 'radarvirtueljson';
+			$globalSources[$id]['format'] = 'radarvirtueljson';
+			//$last_exec['radarvirtueljson'] = 0;
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+			//$formats[$id] = 'planeupdatefaa';
+			$globalSources[$id]['format'] = 'planeupdatefaa';
+			//$last_exec['planeupdatefaa'] = 0;
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'phpvmacars';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vam';
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+			} else if (preg_match('/whazzup/i',$host)) {
+			//$formats[$id] = 'whazzup';
+			$globalSources[$id]['format'] = 'whazzup';
+			//$last_exec['whazzup'] = 0;
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+			} else if (preg_match('/recentpireps/i',$host)) {
+			//$formats[$id] = 'pirepsjson';
+			$globalSources[$id]['format'] = 'pirepsjson';
+			//$last_exec['pirepsjson'] = 0;
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'fr24json';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			//} else if (preg_match('/10001/',$host)) {
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+			//$formats[$id] = 'tsv';
+			$globalSources[$id]['format'] = 'tsv';
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+			}
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+			if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
+		$hostport = explode(':',$host);
+		if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
-	    } else {
+		} else {
 		$port = $globalSources[$id]['port'];
 		$hostn = $globalSources[$id]['host'];
-	    }
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-        	$s = create_socket_udp($hostn,$port, $errno, $errstr);
-	    }
-	    if ($s) {
-    	        $sockets[$id] = $s;
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn)) {
+		}
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$s = create_socket_udp($hostn,$port, $errno, $errstr);
+		}
+		if ($s) {
+				$sockets[$id] = $s;
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
+			if (preg_match('/aprs/',$hostn)) {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-    		    } elseif ($port == '10001') {
-        		//$formats[$id] = 'tsv';
-        		$globalSources[$id]['format'] = 'tsv';
-		    } elseif ($port == '30002') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'raw';
-		    } elseif ($port == '5001') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'flightgearmp';
-		    } elseif ($port == '30005') {
+				} elseif ($port == '10001') {
+				//$formats[$id] = 'tsv';
+				$globalSources[$id]['format'] = 'tsv';
+			} elseif ($port == '30002') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'raw';
+			} elseif ($port == '5001') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'flightgearmp';
+			} elseif ($port == '30005') {
 			// Not yet supported
-        		//$formats[$id] = 'beast';
-        		$globalSources[$id]['format'] = 'beast';
-		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
+				//$formats[$id] = 'beast';
+				$globalSources[$id]['format'] = 'beast';
+			//} else $formats[$id] = 'sbs';
+			} else $globalSources[$id]['format'] = 'sbs';
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-            } else {
+			} else {
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -264,18 +264,18 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
 }
 connect_all($globalSources);
 foreach ($globalSources as $key => $source) {
-    if (isset($source['format']) && $source['format'] == 'aprs') {
+	if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
 	break;
-    }
+	}
 }
 
 if ($use_aprs) {
@@ -315,67 +315,67 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    if (count($last_exec) > 0) {
+	if (count($last_exec) > 0) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+		if ($globalDebug) echo 'Sleeping...'."\n";
+		sleep($globalMinFetch-$max+2);
+	}
 	}
-    }
 
     
-    //foreach ($formats as $id => $value) {
-    foreach ($globalSources as $id => $value) {
+	//foreach ($formats as $id => $value) {
+	foreach ($globalSources as $id => $value) {
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '' && count($line) > 7) {
-    		    $line = explode(',', $line);
-	            $data = array();
-	            $data['hex'] = $line[1]; // hex
-	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
-	            $data['verticalrate'] = ''; // vertical rate
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
-	            $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'deltadbtxt';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
-    		    $SI->add($data);
-		    unset($data);
-    		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '' && count($line) > 7) {
+				$line = explode(',', $line);
+				$data = array();
+				$data['hex'] = $line[1]; // hex
+				$data['ident'] = $line[2]; // ident
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'deltadbtxt';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+				$SI->add($data);
+			unset($data);
+			}
+			}
+			$last_exec[$id]['last'] = time();
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '') {
-    		    $line = explode(':', $line);
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '') {
+				$line = explode(':', $line);
+				if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
 			$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
@@ -387,36 +387,36 @@ 
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
 			$data['latitude'] = $line[5]; // lat
-	        	$data['longitude'] = $line[6]; // long
-	        	$data['verticalrate'] = ''; // vertical rate
-	        	$data['squawk'] = ''; // squawk
-	        	$data['emergency'] = ''; // emergency
-	        	$data['waypoints'] = $line[30];
+				$data['longitude'] = $line[6]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			if (isset($line[37])) $data['last_update'] = $line[37];
-		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
-		        $data['arrival_airport_icao'] = $line[13];
+				$data['departure_airport_icao'] = $line[11];
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+				$data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
 			if (isset($line[35])) $data['info'] = $line[35];
-    			$data['id_source'] = $id_source;
-	    		//$data['arrival_airport_time'] = ;
-	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
-	    		    if (isset($aircraft_data[1])) {
-	    			$data['aircraft_icao'] = $aircraft_data[1];
-	    		    }
-        		}
-	    		/*
+				$data['id_source'] = $id_source;
+				//$data['arrival_airport_time'] = ;
+				if ($line[9] != '') {
+					$aircraft_data = explode('/',$line[9]);
+					if (isset($aircraft_data[1])) {
+					$data['aircraft_icao'] = $aircraft_data[1];
+					}
+				}
+				/*
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
-	    		$data['format_source'] = $value['format'];
+				$data['format_source'] = $value['format'];
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
+				if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -434,240 +434,240 @@ 
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
 			}
-    			unset($data);
-    		    }
-    		}
-    	    }
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['acList'])) {
+				unset($data);
+				}
+			}
+			}
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['acList'])) {
 		foreach ($all_data['acList'] as $line) {
-		    $data = array();
-		    $data['hex'] = $line['Icao']; // hex
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
-		    //$data['verticalrate'] = $line['']; // verticale rate
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-		    /*
+			$data = array();
+			$data['hex'] = $line['Icao']; // hex
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			//$data['verticalrate'] = $line['']; // verticale rate
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			$data['emergency'] = ''; // emergency
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+			/*
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 		    else $data['datetime'] = date('Y-m-d H:i:s');
 		    */
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-	    	    $data['format_source'] = 'aircraftlistjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($data['datetime'])) $SI->add($data);
-		    unset($data);
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				$data['format_source'] = 'aircraftlistjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($data['datetime'])) $SI->add($data);
+			unset($data);
 		}
-	    } else {
+		} else {
 		foreach ($all_data as $line) {
-		    $data = array();
-		    $data['hex'] = $line['hex']; // hex
-		    $data['ident'] = $line['flight']; // ident
-		    $data['altitude'] = $line['altitude']; // altitude
-		    $data['speed'] = $line['speed']; // speed
-		    $data['heading'] = $line['track']; // heading
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
-		    $data['squawk'] = $line['squawk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['format_source'] = 'aircraftlistjson';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line['hex']; // hex
+			$data['ident'] = $line['flight']; // ident
+			$data['altitude'] = $line['altitude']; // altitude
+			$data['speed'] = $line['speed']; // speed
+			$data['heading'] = $line['track']; // heading
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			$data['verticalrate'] = $line['vrt']; // verticale rate
+			$data['squawk'] = $line['squawk']; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['format_source'] = 'aircraftlistjson';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
+		}
 		}
-	    }
-	    }
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['planes'])) {
 		foreach ($all_data['planes'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    $data['ident'] = $line[3]; // ident
-		    $data['altitude'] = $line[6]; // altitude
-		    $data['speed'] = $line[8]; // speed
-		    $data['heading'] = $line[7]; // heading
-		    $data['latitude'] = $line[4]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    //$data['verticalrate'] = $line[]; // verticale rate
-		    $data['squawk'] = $line[10]; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['registration'] = $line[2];
-		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
-		    if (count($deparr) == 2) {
+			$data = array();
+			$data['hex'] = $key; // hex
+			$data['ident'] = $line[3]; // ident
+			$data['altitude'] = $line[6]; // altitude
+			$data['speed'] = $line[8]; // speed
+			$data['heading'] = $line[7]; // heading
+			$data['latitude'] = $line[4]; // lat
+			$data['longitude'] = $line[5]; // long
+			//$data['verticalrate'] = $line[]; // verticale rate
+			$data['squawk'] = $line[10]; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['registration'] = $line[2];
+			$data['aircraft_icao'] = $line[0];
+			$deparr = explode('-',$line[1]);
+			if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
-		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
-	    	    $data['format_source'] = 'planeupdatefaa';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			}
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+				$data['format_source'] = 'planeupdatefaa';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+		}
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['states'])) {
 		foreach ($all_data['states'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $line[0]; // hex
-		    $data['ident'] = trim($line[1]); // ident
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
-		    $data['speed'] = round($line[9]*1.94384); // speed
-		    $data['heading'] = round($line[10]); // heading
-		    $data['latitude'] = $line[5]; // lat
-		    $data['longitude'] = $line[6]; // long
-		    $data['verticalrate'] = $line[11]; // verticale rate
-		    //$data['squawk'] = $line[10]; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
-	    	    $data['format_source'] = 'opensky';
-    		    $data['id_source'] = $id_source;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0]; // hex
+			$data['ident'] = trim($line[1]); // ident
+			$data['altitude'] = round($line[7]*3.28084); // altitude
+			$data['speed'] = round($line[9]*1.94384); // speed
+			$data['heading'] = round($line[10]); // heading
+			$data['latitude'] = $line[5]; // lat
+			$data['longitude'] = $line[6]; // long
+			$data['verticalrate'] = $line[11]; // verticale rate
+			//$data['squawk'] = $line[10]; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+				$data['format_source'] = 'opensky';
+				$data['id_source'] = $id_source;
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    foreach ($all_data as $key => $line) {
+		}
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
-		    $data = array();
-		    $data['hex'] = $line[0];
-		    $data['ident'] = $line[16]; //$line[13]
-	    	    $data['altitude'] = $line[4]; // altitude
-	    	    $data['speed'] = $line[5]; // speed
-	    	    $data['heading'] = $line[3]; // heading
-	    	    $data['latitude'] = $line[1]; // lat
-	    	    $data['longitude'] = $line[2]; // long
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
-	    	    $data['squawk'] = $line[6]; // squawk
-	    	    $data['aircraft_icao'] = $line[8];
-	    	    $data['registration'] = $line[9];
-		    $data['departure_airport_iata'] = $line[11];
-		    $data['arrival_airport_iata'] = $line[12];
-	    	    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
-	    	    $data['format_source'] = 'fr24json';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0];
+			$data['ident'] = $line[16]; //$line[13]
+				$data['altitude'] = $line[4]; // altitude
+				$data['speed'] = $line[5]; // speed
+				$data['heading'] = $line[3]; // heading
+				$data['latitude'] = $line[1]; // lat
+				$data['longitude'] = $line[2]; // long
+				$data['verticalrate'] = $line[15]; // verticale rate
+				$data['squawk'] = $line[6]; // squawk
+				$data['aircraft_icao'] = $line[8];
+				$data['registration'] = $line[9];
+			$data['departure_airport_iata'] = $line[11];
+			$data['arrival_airport_iata'] = $line[12];
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
+				$data['format_source'] = 'fr24json';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['fr24json'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
-	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
-	    if (json_last_error() != JSON_ERROR_NONE) {
+		}
+			//$last_exec['fr24json'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
+		//echo $buffer;
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
+		$all_data = json_decode($buffer,true);
+		if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
-	    }
-	    if (isset($all_data['mrkrs'])) {
+		}
+		if (isset($all_data['mrkrs'])) {
 		foreach ($all_data['mrkrs'] as $key => $line) {
-		    if (isset($line['inf'])) {
+			if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
-	    		$data['latitude'] = $line['pt'][0]; // lat
-	    		$data['longitude'] = $line['pt'][1]; // long
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
-	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+				$data['latitude'] = $line['pt'][0]; // lat
+				$data['longitude'] = $line['pt'][1]; // long
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+				//$data['aircraft_icao'] = $line[8];
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
-	    		//$data['emergency'] = ''; // emergency
+				//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
-	    		$data['format_source'] = 'radarvirtueljson';
-    			$data['id_source'] = $id_source;
+				$data['format_source'] = 'radarvirtueljson';
+				$data['id_source'] = $id_source;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
 		}
-	    }
-    	    //$last_exec['radarvirtueljson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+		}
+			//$last_exec['radarvirtueljson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host'].'?'.time());
+		$all_data = json_decode(utf8_encode($buffer),true);
 	    
-	    if (isset($all_data['pireps'])) {
-	        foreach ($all_data['pireps'] as $line) {
-		    $data = array();
-		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
-		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
-		    //$data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
-		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
-		    $data['format_source'] = 'pireps';
-    		    $data['id_source'] = $id_source;
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if ($line['icon'] == 'plane') {
+		if (isset($all_data['pireps'])) {
+			foreach ($all_data['pireps'] as $line) {
+			$data = array();
+			$data['id'] = $line['id'];
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+			$data['ident'] = $line['callsign']; // ident
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
+			//$data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+			//$data['arrival_airport_time'] = $line['arrtime'];
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
+			else $data['info'] = '';
+			$data['format_source'] = 'pireps';
+				$data['id_source'] = $id_source;
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if ($line['icon'] == 'plane') {
 			$SI->add($data);
-		    //    print_r($data);
-    		    } elseif ($line['icon'] == 'ct') {
+			//    print_r($data);
+				} elseif ($line['icon'] == 'ct') {
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
@@ -682,160 +682,160 @@ 
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
 			echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
-		    }
-		    unset($data);
+			}
+			unset($data);
 		}
-	    }
-    	    //$last_exec['pirepsjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['pirepsjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
-	    	    $data['ident'] = $line['flightnum']; // ident
-	    	    $data['altitude'] = $line['alt']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lng']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['lastupdate'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['depicao'];
-	    	    $data['departure_airport_time'] = $line['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
-    		    $data['arrival_airport_time'] = $line['arrtime'];
-    		    $data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    if (isset($line['aircraftname'])) {
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+				$data['ident'] = $line['flightnum']; // ident
+				$data['altitude'] = $line['alt']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lng']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['lastupdate'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['depicao'];
+				$data['departure_airport_time'] = $line['deptime'];
+				$data['arrival_airport_icao'] = $line['arricao'];
+				$data['arrival_airport_time'] = $line['arrtime'];
+				$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
-	    		}
-	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$aircraft_data = explode('-',$line['aircraftname']);
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
+				else {
+					$aircraft_data = explode(' ',$line['aircraftname']);
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
+					else $data['aircraft_icao'] = $line['aircraftname'];
+				}
+				}
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'phpvmacars';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    $data['pilot_name'] = $line['pilot_name'];
-	    	    $data['pilot_id'] = $line['pilot_id'];
-	    	    $data['ident'] = trim($line['callsign']); // ident
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['latitude']; // lat
-	    	    $data['longitude'] = $line['longitude']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['last_update'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['departure'];
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
-    		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-	    	    $data['aircraft_icao'] = $line['plane_type'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vam';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = trim($line['flight_id']);
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+				$data['pilot_name'] = $line['pilot_name'];
+				$data['pilot_id'] = $line['pilot_id'];
+				$data['ident'] = trim($line['callsign']); // ident
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['latitude']; // lat
+				$data['longitude'] = $line['longitude']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['last_update'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['departure'];
+				//$data['departure_airport_time'] = $line['departure_time'];
+				$data['arrival_airport_icao'] = $line['arrival'];
+				//$data['arrival_airport_time'] = $line['arrival_time'];
+				//$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+				$data['aircraft_icao'] = $line['plane_type'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vam';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-    	    //$last_exec[$id]['last'] = time();
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			//$last_exec[$id]['last'] = time();
 
-	    //$read = array( $sockets[$id] );
-	    $read = $sockets;
-	    $write = NULL;
-	    $e = NULL;
-	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
-	    if ($n > 0) {
+		//$read = array( $sockets[$id] );
+		$read = $sockets;
+		$write = NULL;
+		$e = NULL;
+		$n = socket_select($read, $write, $e, $timeout);
+		if ($e != NULL) var_dump($e);
+		if ($n > 0) {
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-        	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
-        	    } else {
-	    	        $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
-	    	    }
-        	    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
-        	    //echo $buffer."\n";
-		    // lets play nice and handle signals such as ctrl-c/kill properly
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-		    $error = false;
-		    //$SI::del();
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
-		    // SBS format is CSV format
-		    if ($buffer != '') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+				if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
+				$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
+				} else {
+					$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+				}
+				//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
+				//echo $buffer."\n";
+			// lets play nice and handle signals such as ctrl-c/kill properly
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			$error = false;
+			//$SI::del();
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			// SBS format is CSV format
+			if ($buffer != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    $ACARS->deleteLiveAcarsData();
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
-			    // AVR format
-			    $data = $SBS->parse($buffer);
-			    if (is_array($data)) {
+				// AVR format
+				$data = $SBS->parse($buffer);
+				if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-                            }
-                        } elseif ($format == 'flightgearsp') {
-                    	    //echo $buffer."\n";
-                    	    if (strlen($buffer) > 5) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+								if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+							}
+						} elseif ($format == 'flightgearsp') {
+							//echo $buffer."\n";
+							if (strlen($buffer) > 5) {
 				$line = explode(',',$buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -851,114 +851,114 @@ 
 				$data['format_source'] = 'flightgearsp';
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-                        } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-			    $ACARS->deleteLiveAcarsData();
+				}
+						} elseif ($format == 'acars') {
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+				if (substr($buffer,0,1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
 				$line = explode(' ',$buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
-				    $data['ident'] = $userserver[0];
-				    $data['registration'] = $userserver[0];
-				    $data['latitude'] = $line[4];
-				    $data['longitude'] = $line[5];
-				    $data['altitude'] = $line[6];
-				    $data['datetime'] = date('Y-m-d H:i:s');
-				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					$userserver = explode('@',$line[0]);
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+					$data['ident'] = $userserver[0];
+					$data['registration'] = $userserver[0];
+					$data['latitude'] = $line[4];
+					$data['longitude'] = $line[5];
+					$data['altitude'] = $line[6];
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$aircraft_type = $line[10];
+					$aircraft_type = preg_split(':/:',$aircraft_type);
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				}
 				}
-			    }
 			} elseif ($format == 'beast') {
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
-			    die;
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
+				die;
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
-			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+				$line = explode("\t", $buffer);
+				for($k = 0; $k < count($line); $k=$k+2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
-			    }
-    			    if (count($lined) > 3) {
-    				$data['hex'] = $lined['hexid'];
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
-    				$data['id_source'] = $id_source;
-    				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-    				unset($lined);
-    				unset($data);
-    			    } else $error = true;
+					$lined[$key] = $line[$k+1];
+				}
+					if (count($lined) > 3) {
+					$data['hex'] = $lined['hexid'];
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
+					$data['datetime'] = date('Y-m-d H:i:s');;
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+					$data['id_source'] = $id_source;
+					$data['format_source'] = 'tsv';
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					unset($lined);
+					unset($data);
+					} else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
-			    if ($aprs_connect == 0) {
+				if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 				$aprs_connect = 1;
-			    }
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+				}
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+				}
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
+				$buffer = str_replace('APRS <- ','',$buffer);
+				$buffer = str_replace('APRS -> ','',$buffer);
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
-				    $data = array();
-				    //print_r($line);
-				    $data['hex'] = $line['address'];
-				    $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    $data['ident'] = $line['ident'];
-				    $data['latitude'] = $line['latitude'];
-				    $data['longitude'] = $line['longitude'];
-				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
-				    $data['altitude'] = $line['altitude'];
-				    if (isset($line['course'])) $data['heading'] = $line['course'];
-				    //else $data['heading'] = 0;
-				    $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
-    				    $data['id_source'] = $id_source;
-				    $data['format_source'] = 'aprs';
-				    $data['source_name'] = $line['source'];
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				    $currentdate = date('Y-m-d H:i:s');
-				    $aprsdate = strtotime($data['datetime']);
-				    // Accept data if time <= system time + 20s
-				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
-				    else {
+					$data = array();
+					//print_r($line);
+					$data['hex'] = $line['address'];
+					$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+					//$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = $line['ident'];
+					$data['latitude'] = $line['latitude'];
+					$data['longitude'] = $line['longitude'];
+					//$data['verticalrate'] = $line[16];
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
+					else $data['speed'] = 0;
+					$data['altitude'] = $line['altitude'];
+					if (isset($line['course'])) $data['heading'] = $line['course'];
+					//else $data['heading'] = 0;
+					$data['aircraft_type'] = $line['stealth'];
+					if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
+						$data['id_source'] = $id_source;
+					$data['format_source'] = 'aprs';
+					$data['source_name'] = $line['source'];
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$currentdate = date('Y-m-d H:i:s');
+					$aprsdate = strtotime($data['datetime']);
+					// Accept data if time <= system time + 20s
+					if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
+					else {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
-				    }
-				    unset($data);
+					}
+					unset($data);
 				} 
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -966,29 +966,29 @@ 
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
     					date_default_timezone_set('UTC');
     				*/
-    				// Force datetime to current UTC datetime
-    				date_default_timezone_set('UTC');
-    				$data['datetime'] = date('Y-m-d H:i:s');
-    				$data['ident'] = trim($line[10]);
-    				$data['latitude'] = $line[14];
-    				$data['longitude'] = $line[15];
-    				$data['verticalrate'] = $line[16];
-    				$data['emergency'] = $line[20];
-    				$data['speed'] = $line[12];
-    				$data['squawk'] = $line[17];
-    				$data['altitude'] = $line[11];
-    				$data['heading'] = $line[13];
-    				$data['ground'] = $line[21];
-    				$data['emergency'] = $line[19];
-    				$data['format_source'] = 'sbs';
+					// Force datetime to current UTC datetime
+					date_default_timezone_set('UTC');
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = trim($line[10]);
+					$data['latitude'] = $line[14];
+					$data['longitude'] = $line[15];
+					$data['verticalrate'] = $line[16];
+					$data['emergency'] = $line[20];
+					$data['speed'] = $line[12];
+					$data['squawk'] = $line[17];
+					$data['altitude'] = $line[11];
+					$data['heading'] = $line[13];
+					$data['ground'] = $line[21];
+					$data['emergency'] = $line[19];
+					$data['format_source'] = 'sbs';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
-    				unset($data);
-    			    } else $error = true;
-			    if ($error) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$data['id_source'] = $id_source;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
+					else $error = true;
+					unset($data);
+					} else $error = true;
+				if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
 				} else {
@@ -1004,13 +1004,13 @@ 
 					connect_all($sourceer);
 					$sourceer = array();
 				}
-			    }
+				}
 			}
 			// Sleep for xxx microseconds
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
-		    } else {
+			} else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1019,9 +1019,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1032,40 +1032,40 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    }
+				}
+			}
 			}
-		    }
 		}
-	    } else {
+		} else {
 		$error = socket_strerror(socket_last_error());
 		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) {
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+				if ($globalDebug) echo "Shutdown all sockets...";
 			    
-			    foreach ($sockets as $sock) {
+				foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
 				@socket_close($sock);
-			    }
+				}
 			    
 			}
-			    if ($globalDebug) echo "Restart all connections...";
-			    sleep(2);
-			    $time = time();
-			    //connect_all($hosts);
-			    $aprs_connect = 0;
-			    connect_all($globalSources);
+				if ($globalDebug) echo "Restart all connections...";
+				sleep(2);
+				$time = time();
+				//connect_all($hosts);
+				$aprs_connect = 0;
+				connect_all($globalSources);
 
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    $SI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		$SI->checkAll();
+	}
 	}
-    }
 }
 
 ?>

require/class.SpotterImport.php

Indentation +354 added lines, -354 removed lines

@@ -9,16 +9,16 @@ 
 require_once(dirname(__FILE__).'/class.Source.php');
 
 class SpotterImport {
-    private $all_flights = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
-
-    public function __construct($dbc = null) {
+	private $all_flights = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
+
+	public function __construct($dbc = null) {
 	global $globalBeta;
 	$Connection = new Connection($dbc);
 	$this->db = $Connection->db();
@@ -29,18 +29,18 @@ 
 	$currentdate = date('Y-m-d');
 	$sourcestat = $Stats->getStatsSource($currentdate);
 	if (!empty($sourcestat)) {
-	    foreach($sourcestat as $srcst) {
-	    	$type = $srcst['stats_type'];
+		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);
-	        }
-	    }
+			$source = $srcst['source_name'];
+			$data = $srcst['source_data'];
+			$this->stats[$currentdate][$source][$type] = json_decode($data,true);
+			}
+		}
+	}
 	}
-    }
 
-    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
 	
@@ -60,42 +60,42 @@ 
 	$operator = $Spotter->getOperator($ident);
 	$scheduleexist = false;
 	if ($Schedule->checkSchedule($operator) == 0) {
-	    $operator = $Translation->checkTranslation($ident);
-	    if ($Schedule->checkSchedule($operator) == 0) {
+		$operator = $Translation->checkTranslation($ident);
+		if ($Schedule->checkSchedule($operator) == 0) {
 		$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']));
-		    // Should also check if route schedule = route from DB
-		    if ($schedule['DepartureAirportIATA'] != '') {
+			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']));
+			// Should also check if route schedule = route from DB
+			if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
+			}
 			}
-		    }
-		    if ($schedule['ArrivalAirportIATA'] != '') {
+			if ($schedule['ArrivalAirportIATA'] != '') {
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
+			}
 			}
-		    }
-		    $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;
 	} else $scheduleexist = true;
 	// close connection, at least one way will work ?
-       if ($scheduleexist) {
+	   if ($scheduleexist) {
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
-    		$sch = $Schedule->getSchedule($operator);
+			$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']));
-       }
+	   }
 	$Spotter->db = null;
 	$Schedule->db = null;
 	$Translation->db = null;
@@ -110,92 +110,92 @@ 
 	}
 	  */
 	}
-    }
+	}
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug;
 	if ($globalDebug) echo "Update last seen flights data...\n";
 	foreach ($this->all_flights as $key => $flight) {
-	    if (isset($this->all_flights[$key]['id'])) {
+		if (isset($this->all_flights[$key]['id'])) {
 		//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);
-        	$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']);
-            }
+			$Spotter = new Spotter($this->db);
+			$real_arrival = $this->arrival($key);
+			$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']);
+			}
+	}
 	}
-    }
 
-    public function arrival($key) {
+	public function arrival($key) {
 	global $globalClosestMinDist, $globalDebug;
 	if ($globalDebug) echo 'Update arrival...'."\n";
 	$Spotter = new Spotter($this->db);
-        $airport_icao = '';
-        $airport_time = '';
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
+		$airport_icao = '';
+		$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);
-    	    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'];
-        	    $airport_time = $this->all_flights[$key]['datetime'];
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
-        	    foreach ($closestAirports as $airport) {
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
-        		    $airport_icao = $airport['icao'];
-        		    $airport_time = $this->all_flights[$key]['datetime'];
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        		    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))) {
-        		$airport_icao = $closestAirports[0]['icao'];
-        		$airport_time = $this->all_flights[$key]['datetime'];
-        	} else {
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
-        	}
-    	    } else {
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
-    	    }
-
-        } 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);
-    }
-
-
-
-    public function del() {
+		$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'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
+				foreach ($closestAirports as $airport) {
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
+					$airport_icao = $airport['icao'];
+					$airport_time = $this->all_flights[$key]['datetime'];
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+					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))) {
+				$airport_icao = $closestAirports[0]['icao'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+			} else {
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+			}
+			} else {
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+			}
+
+		} 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);
+	}
+
+
+
+	public function del() {
 	global $globalDebug;
 	// Delete old infos
 	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()-3000)) {
-            	    if (isset($this->all_flights[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if (isset($this->all_flights[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
 			/*
 			$SpotterLive = new SpotterLive();
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
 			$SpotterLive->db = null;
 			*/
-            		$real_arrival = $this->arrival($key);
-            		$Spotter = new Spotter($this->db);
-            		if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
+					$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']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
 //			$Spotter->db = null;
-            	    }
-            	    unset($this->all_flights[$key]);
-    	        }
-	    }
-        }
-    }
-
-    public function add($line) {
+					}
+					unset($this->all_flights[$key]);
+				}
+		}
+		}
+	}
+
+	public function add($line) {
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights;
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -220,18 +220,18 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && isset($line['hex'])) {
-	    //print_r($line);
-  	    if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
+		//print_r($line);
+  		if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    $source = $line['source_name'];
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			$source = $line['source_name'];
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		/*
@@ -247,17 +247,17 @@ 
 		//$this->db = $dbc;
 
 		$hex = trim($line['hex']);
-	        if (!isset($line['id'])) $id = trim($line['hex']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['hex']);
+			else $id = trim($line['id']);
 		
 		//print_r($this->all_flights);
 		if (!isset($this->all_flights[$id]['hex']) && ctype_xdigit($hex)) {
-		    $this->all_flights[$id] = array('hex' => $hex);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+			$this->all_flights[$id] = array('hex' => $hex);
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
+			//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')));
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????')) {
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????')) {
 
 			$timeelapsed = microtime(true);
 			$Spotter = new Spotter($this->db);
@@ -266,38 +266,38 @@ 
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    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 ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
+				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';
 			}
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
-		    } else if (isset($line['aircraft_name'])) {
+			} else if (isset($line['aircraft_name'])) {
 			// Get aircraft ICAO from aircraft name
 			$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));
 			else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', '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));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', '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));
+			$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')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.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' => $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 ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n";
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
+			if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n";
+			if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
+			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']));
-		    } else {
+			} 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";
 				/*
@@ -306,38 +306,38 @@ 
 				print_r($line);
 				*/
 				return '';
-		    }
+			}
 		} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
 
 		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' => $line['pilot_id']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $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'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			$timeelapsed = microtime(true);
-            		$Spotter = new Spotter($this->db);
-            		$fromsource = NULL;
-            		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-            		elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
+					$Spotter = new Spotter($this->db);
+					$fromsource = NULL;
+					if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
+					elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
 			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 (!isset($line['id'])) {
@@ -347,26 +347,26 @@ 
 		        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) {
+			//$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']));
-		    }
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
+			}
+			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']));
-		    }
-		    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' => ''));
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
+			}
+			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' => ''));
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 				$timeelapsed = microtime(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' => ''));
+					$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') {
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
 			$Spotter = new Spotter($this->db);
 			$route = $Spotter->getRouteInfo(trim($line['ident']));
@@ -380,43 +380,43 @@ 
 			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']) {
+				//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 (!$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($line['speed']) && $line['speed'] != '') {
 		//    $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));
-		    //$dataFound = 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');
-		    if ($distance > 1000 && $distance < 10000) {
-		    // use datetime
+			$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)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
 
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && 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')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && 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')))) {
 			if (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 (!$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'])) {
+				if (!$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;
@@ -430,16 +430,16 @@ 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
-			    }
+				}
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				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]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$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']));
@@ -450,20 +450,20 @@ 
 				    //$putinarchive = true;
 				}
 				*/
-			    /*
+				/*
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
 			    }
 			    */
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				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]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$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']));
@@ -481,53 +481,53 @@ 
 			    */
 			}
 
-		    } else if ($globalDebug && $timediff > 20) {
+			} else if ($globalDebug && $timediff > 20) {
 			$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 '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']));
+			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']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
-		    //$dataFound = true;
+			$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']));
-		    //$dataFound = true;
+			$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) {
+			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') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+				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']));
-		    //$dataFound = true;
+			}
+			if ($line['ground'] != 1) $line['ground'] = 0;
+			$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'])) {
-			    $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';
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
-			    if ($highlight != '') {
+			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'])) {
+				$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';
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+				if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
 				$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
@@ -537,38 +537,38 @@ 
 				$this->all_flights[$id]['putinarchive'] = true;
 				//$putinarchive = true;
 				//$highlight = '';
-			    }
+				}
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
-		    //$dataFound = true;
+			} 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($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//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']) > 2) $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";
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		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'])) > 2) $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;
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $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)) > 2) $this->all_flights[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+  			$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)) > 2) $this->all_flights[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$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));
+  			// If not enough messages and ACARS set heading to 0
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
   		}
 		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -579,119 +579,119 @@ 
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
-		    $this->all_flights[$id]['lastupdate'] = time();
-		    if ($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'])) {
-			    //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']);
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
+			$this->all_flights[$id]['lastupdate'] = time();
+			if ($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'])) {
+				//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']);
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$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')) {
-				    $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
+					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";
+					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
+					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";
+					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} else $recent_ident = '';
 				$SpotterLive->db=null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-			    } else {
+				} else {
 				$recent_ident = '';
 				$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 there was no aircraft with the same callsign within the last hour and go post it into the archive
+				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) {
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $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) {
+					$ignoreImport = true;
+					foreach($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $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;
+						$ignoreImport = true;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
+					$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)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+					$ignoreImport = true;
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				
 				if (!$ignoreImport) {
-				    $highlight = '';
-				    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')));
-				    $timeelapsed = microtime(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]['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']);
-				    $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";
+					$highlight = '';
+					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')));
+					$timeelapsed = microtime(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]['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']);
+					$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";
 				    
-				    // Add source stat in DB
-				    $Stats = new Stats($this->db);
-				    if (!empty($this->stats)) {
+					// 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) {
-					        //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['msg'])) {
-				    		    if (time() - $sourced['msg']['date'] > 10) {
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
-
-				    }
-				    $Stats->db = null;
+						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['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+									unset($this->stats[$date][$source]['msg']);
+								}
+							}
+							}
+							if ($date != date('Y-m-d')) {
+							unset($this->stats[$date]);
+							}
+						}
+						if ($globalDebug) echo 'Done'."\n";
+
+					}
+					$Stats->db = null;
 				    
-				    $this->del();
+					$this->del();
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
 				//$ignoreImport = false;
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -709,18 +709,18 @@ 
 			*/
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
-				    $SpotterLive = new SpotterLive($this->db);
-				    $SpotterLive->deleteLiveSpotterData();
-				    $SpotterLive->db=null;
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
+					$SpotterLive = new SpotterLive($this->db);
+					$SpotterLive->deleteLiveSpotterData();
+					$SpotterLive->db=null;
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} 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')) {
-				    $this->all_flights[$id]['id'] = $recent_ident;
-				    $this->all_flights[$id]['addedSpotter'] = 1;
+					$this->all_flights[$id]['id'] = $recent_ident;
+					$this->all_flights[$id]['addedSpotter'] = 1;
 				}
 				if (isset($globalDaemon) && !$globalDaemon) {
 					$Spotter = new Spotter($this->db);
@@ -728,14 +728,14 @@ 
 					$Spotter->db = null;
 				}
 				
-			    }
+				}
+			}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
-		    //echo "\nAdd in Live !! \n";
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
-		    if ($globalDebug) {
+			//adds the spotter LIVE data
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
+			//echo "\nAdd in Live !! \n";
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
+			if ($globalDebug) {
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
@@ -743,49 +743,49 @@ 
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
 			}
-		    }
-		    $ignoreImport = false;
-		    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"; }
+			}
+			$ignoreImport = false;
+			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) {
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-			    $ignoreImport = true;
+			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) {
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+			if (count($globalAirportAccept) > 0) {
+				$ignoreImport = true;
+				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)) {
+			}
+			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)) {
+				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) {
+			}
+			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)) {
+				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) {
+			}
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-			        $ignoreImport = false;
-			    }
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
+					$ignoreImport = false;
+				}
+			}
 			}
-		    }
 
-		    if (!$ignoreImport) {
+			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 ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
@@ -823,7 +823,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -836,11 +836,11 @@ 
 					//var_dump($this->stats);
 					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;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
@@ -857,22 +857,22 @@ 
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
-			    $SpotterLive = new SpotterLive($this->db);
-			    $SpotterLive->deleteLiveSpotterDataNotUpdated();
-			    $SpotterLive->db = null;
-			    //SpotterLive->deleteLiveSpotterData();
-			    if ($globalDebug) echo " Done\n";
-			    $this->last_delete_hourly = time();
+				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
+				$SpotterLive = new SpotterLive($this->db);
+				$SpotterLive->deleteLiveSpotterDataNotUpdated();
+				$SpotterLive->db = null;
+				//SpotterLive->deleteLiveSpotterData();
+				if ($globalDebug) echo " Done\n";
+				$this->last_delete_hourly = time();
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_flights[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

require/class.Spotter.php

Indentation +1293 added lines, -1293 removed lines

@@ -13,10 +13,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		$filters = array();
@@ -84,14 +84,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
@@ -255,11 +255,11 @@ 
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
 					} else $temp_array['aircraft_shadow'] = 'default.png';
-                                } else {
-                            		$temp_array['aircraft_shadow'] = 'default.png';
+								} else {
+									$temp_array['aircraft_shadow'] = 'default.png';
 					$temp_array['aircraft_name'] = 'N/A';
 					$temp_array['aircraft_manufacturer'] = 'N/A';
-                            	}
+								}
 			}
 			$fromsource = NULL;
 			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
@@ -455,11 +455,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -806,11 +806,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -849,12 +849,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		date_default_timezone_set('UTC');
@@ -882,7 +882,7 @@ 
 				return false;
 			}
 		}
-    		$additional_query = '';
+			$additional_query = '';
 		if ($interval != "")
 		{
 			if (!is_string($interval))
@@ -922,12 +922,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -968,11 +968,11 @@ 
     
     
 	/**
-	* Gets all the spotter information sorted by the newest aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftRegistration($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1012,11 +1012,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1055,12 +1055,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest departure airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest departure airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByDepartureAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1102,11 +1102,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest arrival airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest arrival airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByArrivalAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1145,11 +1145,11 @@ 
 	
 
 	/**
-	* Gets all the spotter information based on the spotter id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the spotter id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByID($id = '')
 	{
 		global $global_query;
@@ -1171,11 +1171,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
 	{
 		global $global_query;
@@ -1228,11 +1228,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAircraft($aircraft_type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1286,11 +1286,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRegistration($registration = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1347,11 +1347,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1404,11 +1404,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1462,11 +1462,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the date
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the date
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
@@ -1530,11 +1530,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the country name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the country name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1588,11 +1588,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the manufacturer name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the manufacturer name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByManufacturer($aircraft_manufacturer = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1648,13 +1648,13 @@ 
   
   
 	/**
-	* Gets a list of all aircraft that take a route
-	*
-	* @param String $departure_airport_icao ICAO code of departure airport
-	* @param String $arrival_airport_icao ICAO code of arrival airport
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets a list of all aircraft that take a route
+	 *
+	 * @param String $departure_airport_icao ICAO code of departure airport
+	 * @param String $arrival_airport_icao ICAO code of arrival airport
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRoute($departure_airport_icao = '', $arrival_airport_icao = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1723,11 +1723,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the special column in the table
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the special column in the table
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByHighlight($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1766,11 +1766,11 @@ 
 	}
 
 	/**
-	* Gets all the highlight based on a aircraft registration
-	*
-	* @return String the highlight text
-	*
-	*/
+	 * Gets all the highlight based on a aircraft registration
+	 *
+	 * @return String the highlight text
+	 *
+	 */
 	public function getHighlightByRegistration($registration,$filter = array())
 	{
 		global $global_query;
@@ -1792,13 +1792,13 @@ 
 
 	
 	/**
-	* Gets the squawk usage from squawk code
-	*
-	* @param String $squawk squawk code
-	* @param String $country country
-	* @return String usage
-	*
-	*/
+	 * Gets the squawk usage from squawk code
+	 *
+	 * @param String $squawk squawk code
+	 * @param String $country country
+	 * @return String usage
+	 *
+	 */
 	public function getSquawkUsage($squawk = '',$country = 'FR')
 	{
 		
@@ -1819,12 +1819,12 @@ 
 	}
 
 	/**
-	* Gets the airport icao from the iata
-	*
-	* @param String $airport_iata the iata code of the airport
-	* @return String airport iata
-	*
-	*/
+	 * Gets the airport icao from the iata
+	 *
+	 * @param String $airport_iata the iata code of the airport
+	 * @return String airport iata
+	 *
+	 */
 	public function getAirportIcao($airport_iata = '')
 	{
 		
@@ -1844,14 +1844,14 @@ 
 	}
 
 	/**
-	* Gets the airport distance
-	*
-	* @param String $airport_icao the icao code of the airport
-	* @param Float $latitude the latitude
-	* @param Float $longitude the longitude
-	* @return Float distance to the airport
-	*
-	*/
+	 * Gets the airport distance
+	 *
+	 * @param String $airport_icao the icao code of the airport
+	 * @param Float $latitude the latitude
+	 * @param Float $longitude the longitude
+	 * @return Float distance to the airport
+	 *
+	 */
 	public function getAirportDistance($airport_icao,$latitude,$longitude)
 	{
 		
@@ -1872,12 +1872,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the icao
-	*
-	* @param String $airport the icao code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the icao
+	 *
+	 * @param String $airport the icao code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfo($airport = '')
 	{
 		
@@ -1923,12 +1923,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the country
-	*
-	* @param Array $countries Airports countries
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the country
+	 *
+	 * @param Array $countries Airports countries
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCountry($countries)
 	{
 		$lst_countries = '';
@@ -1966,12 +1966,12 @@ 
 	}
 	
 	/**
-	* Gets airports info based on the coord
-	*
-	* @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
-	* @return Array airport information
-	*
-	*/
+	 * Gets airports info based on the coord
+	 *
+	 * @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCoord($coord)
 	{
 		global $globalDBdriver;
@@ -2002,12 +2002,12 @@ 
 	}
 
 	/**
-	* Gets waypoints info based on the coord
-	*
-	* @param Array $coord waypoints coord
-	* @return Array airport information
-	*
-	*/
+	 * Gets waypoints info based on the coord
+	 *
+	 * @param Array $coord waypoints coord
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllWaypointsInfobyCoord($coord)
 	{
 		if (is_array($coord)) {
@@ -2041,12 +2041,12 @@ 
 	
 	
 	/**
-	* Gets the airline info based on the icao code or iata code
-	*
-	* @param String $airline_icao the iata code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airline info based on the icao code or iata code
+	 *
+	 * @param String $airline_icao the iata code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2077,7 +2077,7 @@ 
 			} else {
 				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
 			}
-                        /*
+						/*
 			$airline_array = array();
 			$temp_array = array();
 		
@@ -2109,12 +2109,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft info based on the aircraft type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAllAircraftInfo($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2146,12 +2146,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft icao based on the aircraft name/type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return String aircraft information
-	*
-	*/
+	 * Gets the aircraft icao based on the aircraft name/type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return String aircraft information
+	 *
+	 */
 	public function getAircraftIcao($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2176,12 +2176,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft modes
-	*
-	* @param String $aircraft_modes the aircraft ident (hex)
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft modes
+	 *
+	 * @param String $aircraft_modes the aircraft ident (hex)
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftType($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -2199,12 +2199,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftTypeByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2222,12 +2222,12 @@ 
 	}
 
 	/**
-	* Gets correct aircraft operator corde
-	*
-	* @param String $operator the aircraft operator code (callsign)
-	* @return String aircraft operator code
-	*
-	*/
+	 * Gets correct aircraft operator corde
+	 *
+	 * @param String $operator the aircraft operator code (callsign)
+	 * @return String aircraft operator code
+	 *
+	 */
 	public function getOperator($operator)
 	{
 		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
@@ -2244,16 +2244,16 @@ 
 	}
 
 	/**
-	* Gets the aircraft route based on the aircraft callsign
-	*
-	* @param String $callsign the aircraft callsign
-	* @return Array aircraft type
-	*
-	*/
+	 * Gets the aircraft route based on the aircraft callsign
+	 *
+	 * @param String $callsign the aircraft callsign
+	 * @return Array aircraft type
+	 *
+	 */
 	public function getRouteInfo($callsign)
 	{
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-                if ($callsign == '') return array();
+				if ($callsign == '') return array();
 		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
@@ -2267,12 +2267,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftInfoByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2299,12 +2299,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft owner & base based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft owner & base based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftOwnerByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2321,11 +2321,11 @@ 
 	
   
   /**
-	* Gets all flights (but with only little info)
-	*
-	* @return Array basic flight information
-	*
-	*/
+   * Gets all flights (but with only little info)
+   *
+   * @return Array basic flight information
+   *
+   */
 	public function getAllFlightsforSitemap()
 	{
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
@@ -2333,7 +2333,7 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-                  /*
+				  /*
 		$flight_array = array();
 		$temp_array = array();
 		
@@ -2355,11 +2355,11 @@ 
 	}
   
 	/**
-	* Gets a list of all aircraft manufacturers
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+	 * Gets a list of all aircraft manufacturers
+	 *
+	 * @return Array list of aircraft types
+	 *
+	 */
 	public function getAllManufacturers()
 	{
 		/*
@@ -2388,11 +2388,11 @@ 
   
   
   /**
-	* Gets a list of all aircraft types
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+   * Gets a list of all aircraft types
+   *
+   * @return Array list of aircraft types
+   *
+   */
 	public function getAllAircraftTypes($filters = array())
 	{
 		/*
@@ -2427,11 +2427,11 @@ 
 	
 	
 	/**
-	* Gets a list of all aircraft registrations
-	*
-	* @return Array list of aircraft registrations
-	*
-	*/
+	 * Gets a list of all aircraft registrations
+	 *
+	 * @return Array list of aircraft registrations
+	 *
+	 */
 	public function getAllAircraftRegistrations($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2456,12 +2456,12 @@ 
 	}
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2492,11 +2492,11 @@ 
 
 
 	/**
-	* Gets a list of all airline names
-	*
-	* @return Array list of airline names
-	*
-	*/
+	 * Gets a list of all airline names
+	 *
+	 * @return Array list of airline names
+	 *
+	 */
 	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2546,11 +2546,11 @@ 
 	
 	
 	/**
-	* Gets a list of all airline countries
-	*
-	* @return Array list of airline countries
-	*
-	*/
+	 * Gets a list of all airline countries
+	 *
+	 * @return Array list of airline countries
+	 *
+	 */
 	public function getAllAirlineCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2578,11 +2578,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival names
-	*
-	* @return Array list of airport names
-	*
-	*/
+	 * Gets a list of all departure & arrival names
+	 *
+	 * @return Array list of airport names
+	 *
+	 */
 	public function getAllAirportNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2631,11 +2631,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival airport countries
-	*
-	* @return Array list of airport countries
-	*
-	*/
+	 * Gets a list of all departure & arrival airport countries
+	 *
+	 * @return Array list of airport countries
+	 *
+	 */
 	public function getAllAirportCountries($filters = array())
 	{
 		$airport_array = array();
@@ -2683,11 +2683,11 @@ 
 	
 	
 	/**
-	* Gets a list of all countries (airline, departure airport & arrival airport)
-	*
-	* @return Array list of countries
-	*
-	*/
+	 * Gets a list of all countries (airline, departure airport & arrival airport)
+	 *
+	 * @return Array list of countries
+	 *
+	 */
 	public function getAllCountries($filters = array())
 	{
 		$Connection= new Connection($this->db);
@@ -2764,11 +2764,11 @@ 
 	
 	
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2792,9 +2792,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -2825,9 +2825,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -2857,9 +2857,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -2897,9 +2897,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -2941,9 +2941,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -2976,9 +2976,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3019,9 +3019,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3053,9 +3053,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3099,11 +3099,11 @@ 
 
 
 	/**
-	* Gets a list of all dates
-	*
-	* @return Array list of date names
-	*
-	*/
+	 * Gets a list of all dates
+	 *
+	 * @return Array list of date names
+	 *
+	 */
 	public function getAllDates()
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -3144,11 +3144,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function getAllRoutes()
 	{
 		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
@@ -3174,13 +3174,13 @@ 
 	}
 
 	/**
-	* Update ident spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
 	{
 		if (!is_numeric(substr($ident, 0, 3)))
@@ -3201,14 +3201,14 @@ 
 		} else {
 			$airline_array = $this->getAllAirlineInfo("NA");
 		}
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 
 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3221,19 +3221,19 @@ 
 
 	}
 	/**
-	* Update latest spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/	
+	 * Update latest spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
 	{
 		if ($groundspeed == '') $groundspeed = NULL;
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
+				$query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3247,32 +3247,32 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $altitude altitude of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
@@ -3487,8 +3487,8 @@ 
     
 		if ($globalIVAO && $aircraft_icao != '')
 		{
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
-            		else $airline_icao = '';
+					if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
+					else $airline_icao = '';
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
@@ -3519,53 +3519,53 @@ 
 	
 		if (count($airline_array) == 0) 
 		{
-                        $airline_array = $this->getAllAirlineInfo('NA');
-                }
-                if (count($aircraft_array) == 0) 
-                {
-                        $aircraft_array = $this->getAllAircraftInfo('NA');
-                }
-                if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
-                {
-                        $departure_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
-                {
-                        $arrival_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if ($registration == '') $registration = 'NA';
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
+						$airline_array = $this->getAllAirlineInfo('NA');
+				}
+				if (count($aircraft_array) == 0) 
+				{
+						$aircraft_array = $this->getAllAircraftInfo('NA');
+				}
+				if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
+				{
+						$departure_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
+				{
+						$arrival_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if ($registration == '') $registration = 'NA';
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				if (!isset($aircraft_owner)) $aircraft_owner = NULL;
+				$query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
 
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 		if ($airline_type == '') {
 			$timeelapsed = microtime(true);
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
 			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 		}
 		if ($airline_type == null) $airline_type = '';
-                $aircraft_type = $aircraft_array[0]['type'];
-                $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
-                $departure_airport_name = $departure_airport_array[0]['name'];
-	        $departure_airport_city = $departure_airport_array[0]['city'];
-            	$departure_airport_country = $departure_airport_array[0]['country'];
+				$aircraft_type = $aircraft_array[0]['type'];
+				$aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
+				$departure_airport_name = $departure_airport_array[0]['name'];
+			$departure_airport_city = $departure_airport_array[0]['city'];
+				$departure_airport_country = $departure_airport_array[0]['country'];
                 
-                $arrival_airport_name = $arrival_airport_array[0]['name'];
-                $arrival_airport_city = $arrival_airport_array[0]['city'];
-                $arrival_airport_country = $arrival_airport_array[0]['country'];
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
+				$arrival_airport_name = $arrival_airport_array[0]['name'];
+				$arrival_airport_city = $arrival_airport_array[0]['city'];
+				$arrival_airport_country = $arrival_airport_array[0]['country'];
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
 
 		try {
 		        
@@ -3573,7 +3573,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -3582,11 +3582,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -3602,11 +3602,11 @@ 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -3617,11 +3617,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -3665,11 +3665,11 @@ 
 	
 	
 	 /**
-	* Gets all airlines that have flown over
-	*
-	* @return Array the airline list
-	*
-	*/
+	  * Gets all airlines that have flown over
+	  *
+	  * @return Array the airline list
+	  *
+	  */
 	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -3683,7 +3683,7 @@ 
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
+				if ($sincedate != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
@@ -3710,26 +3710,26 @@ 
 	}
 
 	 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all pilots that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3757,25 +3757,25 @@ 
 	}
 	
 		 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+		  * Gets all pilots that have flown over
+		  *
+		  * @return Array the pilots list
+		  *
+		  */
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
 	{
 		global $globalDBdriver;
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3804,26 +3804,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3849,26 +3849,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3895,11 +3895,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by aircraft
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -3931,11 +3931,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -3967,11 +3967,11 @@ 
 	
 	
 	/**
-	* Gets all airlines that have flown over by airport
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by airport
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4002,11 +4002,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by airport icao
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by airport icao
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4036,11 +4036,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4071,11 +4071,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4104,11 +4104,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by date
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by date
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4152,11 +4152,11 @@ 
 	
 	
 	/**
-	* Gets all airline countries that have flown over by date
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by date
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4199,11 +4199,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by ident/callsign
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by ident/callsign
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByIdent($ident,$filters = array())
 	{
 		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
@@ -4233,11 +4233,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by route
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by route
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4269,11 +4269,11 @@ 
 	}
 
 	/**
-	* Gets all airline countries that have flown over by route
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by route
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4305,11 +4305,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by country
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by country
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByCountry($country,$filters = array())
 	{
 		$country = filter_var($country,FILTER_SANITIZE_STRING);
@@ -4339,11 +4339,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by country
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by country
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4372,11 +4372,11 @@ 
 
 
 	/**
-	* Gets all airlines countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airlines countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountries($limit = true, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4402,11 +4402,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4428,15 +4428,15 @@ 
 		$SpotterLive = new SpotterLive();
 		$filter_query = $SpotterLive->getFilter($filters,true,true);
 		$filter_query .= ' over_country IS NOT NULL';
-                if ($olderthanmonths > 0) {
+				if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
 				$filter_query .= ' AND spotter_live.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$filter_query .= " AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$filter_query .= " AND spotter_live.date > '".$sincedate."' ";
 			} else {
 				$filter_query .= " AND spotter_live.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4466,11 +4466,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4513,11 +4513,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by airline
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4560,11 +4560,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by months
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by months
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4608,11 +4608,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
 	{
 		$Image = new Image($this->db);
@@ -4651,11 +4651,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4684,11 +4684,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4726,11 +4726,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4758,11 +4758,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4791,11 +4791,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4832,11 +4832,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4862,11 +4862,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by aircraft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4893,11 +4893,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4933,11 +4933,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4979,11 +4979,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5034,11 +5034,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by date
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by date
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5080,11 +5080,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5113,11 +5113,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5157,11 +5157,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by ident/callsign
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5187,11 +5187,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5220,11 +5220,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5266,11 +5266,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by route
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by route
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5304,11 +5304,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5339,11 +5339,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5383,11 +5383,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by country
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by country
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5418,17 +5418,17 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturers that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturers that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturers($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
-                $query .= " GROUP BY spotter_output.aircraft_manufacturer
+				$query .= " GROUP BY spotter_output.aircraft_manufacturer
 					ORDER BY aircraft_manufacturer_count DESC
 					LIMIT 10";
       
@@ -5453,11 +5453,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5465,15 +5465,15 @@ 
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5482,7 +5482,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -5513,11 +5513,11 @@ 
 
 
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5525,15 +5525,15 @@ 
 		$Image = new Image($this->db);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5542,7 +5542,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -5574,35 +5574,35 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5626,35 +5626,35 @@ 
 	}
 
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5679,37 +5679,37 @@ 
 	}
 
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
-    		//echo $query;
+			//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute();
       
@@ -5730,35 +5730,35 @@ 
 	}
 	
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5783,11 +5783,11 @@ 
 	}	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5821,11 +5821,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5856,11 +5856,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5893,11 +5893,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5927,11 +5927,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5964,11 +5964,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5998,11 +5998,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6035,11 +6035,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6070,11 +6070,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6107,11 +6107,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6141,11 +6141,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -6191,11 +6191,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -6238,11 +6238,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6276,11 +6276,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6311,11 +6311,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6349,11 +6349,11 @@ 
 
 
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6383,40 +6383,40 @@ 
 	
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @param Boolean $limit Limit result to 10 or not
-	* @param Integer $olderthanmonths Only show result older than x months
-	* @param String $sincedate Only show result since x date
-	* @param Boolean $icaoaskey Show result by ICAO
-	* @param Array $filters Filter used here
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @param Boolean $limit Limit result to 10 or not
+	 * @param Integer $olderthanmonths Only show result older than x months
+	 * @param String $sincedate Only show result since x date
+	 * @param Boolean $icaoaskey Show result by ICAO
+	 * @param Array $filters Filter used here
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6445,35 +6445,35 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6504,34 +6504,34 @@ 
 
 
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6560,35 +6560,35 @@ 
 	}
 	
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6618,11 +6618,11 @@ 
 	}	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6654,11 +6654,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6689,11 +6689,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6727,11 +6727,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6761,11 +6761,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6799,11 +6799,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6834,11 +6834,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an departure airport
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an departure airport
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6871,11 +6871,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6905,11 +6905,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6943,11 +6943,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6978,11 +6978,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7028,11 +7028,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7075,11 +7075,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7112,11 +7112,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7147,11 +7147,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7184,11 +7184,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7219,11 +7219,11 @@ 
 
 
 	/**
-	* Counts all airport departure countries
-	*
-	* @return Array the airport departure list
-	*
-	*/
+	 * Counts all airport departure countries
+	 *
+	 * @return Array the airport departure list
+	 *
+	 */
 	public function countAllDepartureCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7253,11 +7253,11 @@ 
 	
 	
 	/**
-	* Counts all airport arrival countries
-	*
-	* @return Array the airport arrival list
-	*
-	*/
+	 * Counts all airport arrival countries
+	 *
+	 * @return Array the airport arrival list
+	 *
+	 */
 	public function countAllArrivalCountries($limit = true,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7290,11 +7290,11 @@ 
 
 
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutes($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7333,11 +7333,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7373,11 +7373,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft registration
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft registration
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByRegistration($registration, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7415,11 +7415,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airline
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airline
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7457,11 +7457,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airport
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airport
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7498,11 +7498,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an country
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an country
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByCountry($country, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7538,11 +7538,11 @@ 
 
 
 	/**
-	* Gets all route combinations based on an date
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an date
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7592,11 +7592,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an ident/callsign
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an ident/callsign
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7633,11 +7633,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an manufacturer
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an manufacturer
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7675,11 +7675,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations with waypoints
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations with waypoints
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesWithWaypoints($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7716,11 +7716,11 @@ 
 	}
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -7758,11 +7758,11 @@ 
 	}
 
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
@@ -7803,11 +7803,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7852,11 +7852,11 @@ 
 	}
 	
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7901,11 +7901,11 @@ 
 	}	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7927,7 +7927,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -7947,11 +7947,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7973,7 +7973,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -7994,11 +7994,11 @@ 
 
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonthByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8021,7 +8021,7 @@ 
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8043,11 +8043,11 @@ 
 	
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8089,11 +8089,11 @@ 
 	}
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8138,11 +8138,11 @@ 
 	}
 
 	/**
-	* Counts all military month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all military month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMilitaryMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8183,11 +8183,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwners($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8229,11 +8229,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwnersByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8276,11 +8276,11 @@ 
 	}
 
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilots($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8322,11 +8322,11 @@ 
 	}
 	
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilotsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8369,11 +8369,11 @@ 
 	}
 
 	/**
-	* Counts all month airline
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month airline
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8415,11 +8415,11 @@ 
 	}
 	
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircrafts($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8462,11 +8462,11 @@ 
 	
 
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircraftsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8509,11 +8509,11 @@ 
 	}
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivals($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8556,11 +8556,11 @@ 
 	
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8604,11 +8604,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8630,7 +8630,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8653,11 +8653,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8718,11 +8718,11 @@ 
 	}
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirlines($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8785,11 +8785,11 @@ 
 
 
 	/**
-	* Counts all hours by airline
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airline
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirline($airline_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8835,11 +8835,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8882,11 +8882,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft registration
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft registration
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRegistration($registration, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8929,11 +8929,11 @@ 
 	
 	
 	/**
-	* Counts all hours by airport
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airport
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirport($airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8977,11 +8977,11 @@ 
 	
 	
 	/**
-	* Counts all hours by manufacturer
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by manufacturer
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9025,11 +9025,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9073,11 +9073,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9122,11 +9122,11 @@ 
 	
 	
 	/**
-	* Counts all hours by route
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by route
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9170,11 +9170,11 @@ 
 	
 	
 	/**
-	* Counts all hours by country
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by country
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByCountry($country, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9219,11 +9219,11 @@ 
 
 
 	/**
-	* Counts all aircraft that have flown over
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all aircraft that have flown over
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallAircrafts($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9235,11 +9235,11 @@ 
 	}
 
 	/**
-	* Counts all flight that really arrival
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all flight that really arrival
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallArrival($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9252,11 +9252,11 @@ 
 	}
 
 	/**
-	* Counts all pilots that have flown over
-	*
-	* @return Integer the number of pilots
-	*
-	*/
+	 * Counts all pilots that have flown over
+	 *
+	 * @return Integer the number of pilots
+	 *
+	 */
 	public function countOverallPilots($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9268,11 +9268,11 @@ 
 	}
 
 	/**
-	* Counts all owners that have flown over
-	*
-	* @return Integer the number of owners
-	*
-	*/
+	 * Counts all owners that have flown over
+	 *
+	 * @return Integer the number of owners
+	 *
+	 */
 	public function countOverallOwners($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9285,11 +9285,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallFlights($filters = array())
 	{
 		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
@@ -9302,11 +9302,11 @@ 
 	}
 	
 	/**
-	* Counts all military flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all military flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallMilitaryFlights($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9321,11 +9321,11 @@ 
 	
 	
 	/**
-	* Counts all airlines that have flown over
-	*
-	* @return Integer the number of airlines
-	*
-	*/
+	 * Counts all airlines that have flown over
+	 *
+	 * @return Integer the number of airlines
+	 *
+	 */
 	public function countOverallAirlines($filters = array())
 	{
 		$query  = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count 
@@ -9339,11 +9339,11 @@ 
 
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9383,11 +9383,11 @@ 
 	}
     
 	/**
-	* Gets all the spotter information based on calculated upcoming flights
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on calculated upcoming flights
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
 	{
 		global $global_query, $globalDBdriver, $globalTimezone;
@@ -9462,12 +9462,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
 	{
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -9488,13 +9488,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -9530,12 +9530,12 @@ 
 	
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -9614,12 +9614,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft registration
-	*
-	* @param String $flightaware_id the flight aware id
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration
+	 *
+	 * @param String $flightaware_id the flight aware id
+	 * @return String the aircraft registration
+	 *
+	 */
 	
 	public function getAircraftRegistration($flightaware_id)
 	{
@@ -9648,12 +9648,12 @@ 
 
 
 	/**
-	* Gets the aircraft registration from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9666,19 +9666,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    //return $row['Registration'];
-		    return $row['registration'];
+			//return $row['Registration'];
+			return $row['registration'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets the aircraft type from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft type
-	*
-	*/
+	 * Gets the aircraft type from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft type
+	 *
+	 */
 	public function getAircraftTypeBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9691,19 +9691,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    if ($row['type_flight'] == null) return '';
-		    else return $row['type_flight'];
+			if ($row['type_flight'] == null) return '';
+			else return $row['type_flight'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -9740,11 +9740,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -9772,12 +9772,12 @@ 
 	}
 
 	/**
-	* converts the registration code using the country prefix
-	*
-	* @param String $registration the aircraft registration
-	* @return String the aircraft registration
-	*
-	*/
+	 * converts the registration code using the country prefix
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function convertAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9829,12 +9829,12 @@ 
 	}
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9853,8 +9853,8 @@ 
 				$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			$country = '';
 			//first get the prefix based on two characters
@@ -9890,12 +9890,12 @@ 
 	}
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistrationCode($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9912,11 +9912,11 @@ 
 	}
 	
 	/**
-	* Set a new highlight value for a flight
-	*
-	* @param String $flightaware_id flightaware_id from spotter_output table
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight
+	 *
+	 * @param String $flightaware_id flightaware_id from spotter_output table
+	 * @param String $highlight New highlight value
+	 */
 	public function setHighlightFlight($flightaware_id,$highlight) {
 		
 		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
@@ -9925,12 +9925,12 @@ 
 	}
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -10219,11 +10219,11 @@ 
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-                } else {
+				} else {
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-    		}
+			}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		return $sth->fetchAll(PDO::FETCH_ASSOC);