Ysurac / FlightAirMap

scripts/daemon-spotter.php

Spacing +183 added lines, -183 removed lines

@@ -50,20 +50,20 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
     }
 }
 
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
@@ -104,13 +104,13 @@ 
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
     if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+    $SI = new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else $SI = new SpotterImport($Connection->db);
 
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
@@ -124,17 +124,17 @@ 
     $MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
+$SBS = new SBS();
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	$ACARS=new ACARS($Connection->db,true);
-	$Source=new Source($Connection->db);
+	$ACARS = new ACARS($Connection->db, true);
+	$Source = new Source($Connection->db);
 }
-$Common=new Common();
+$Common = new Common();
 date_default_timezone_set('UTC');
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
+    pcntl_signal(SIGINT, function() {
         global $sockets;
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
         die("Bye!\n");
@@ -150,30 +150,30 @@ 
 
 function connect_all($hosts) {
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
     $reset++;
     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)) {
+	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)) {
+            } 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)) {
+    	    } 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)) {
+    	    } else if (preg_match('/opensky/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
@@ -190,7 +190,7 @@ 
         	    exit(0);
         	}
     	    */
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -199,32 +199,32 @@ 
         	    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)) {
+            } 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)) {
+            } 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)) {
+            } 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('/blitzortung/i',$host)) {
+            } else if (preg_match('/blitzortung/i', $host)) {
         	$globalSources[$id]['format'] = 'blitzortung';
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
-            } else if (preg_match('/airwhere/i',$host)) {
+            } else if (preg_match('/airwhere/i', $host)) {
         	$globalSources[$id]['format'] = 'airwhere';
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
+            } 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)) {
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
@@ -233,7 +233,7 @@ 
         	    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(':myshiptracking.com/:i',$host)) {
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
@@ -243,21 +243,21 @@ 
         	    exit(0);
         	}
             //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+            } 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)) {
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
     		    if ($idf !== false) {
     			$httpfeeds[$id] = $idf;
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
+	    $hostport = explode(':', $host);
 	    if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
@@ -267,19 +267,19 @@ 
 	    }
 	    $Common = new Common();
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
     	    } else {
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+        	$s = $Common->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) || $port == '10152' || $port == '14580') {
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
 			$globalSources[$id]['format'] = 'vrstcp';
     		    } elseif ($port == '10001') {
         		//$formats[$id] = 'tsv';
@@ -318,7 +318,7 @@ 
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
 else $timeout = 20;
 $errno = '';
-$errstr='';
+$errstr = '';
 
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
 /* Initiate connections to all the hosts simultaneously */
@@ -326,7 +326,7 @@ 
 //connect_all($globalSources);
 
 if (isset($globalProxy) && $globalProxy) {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
 } else {
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
 }
@@ -356,16 +356,16 @@ 
 
 if ($use_aprs) {
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
-	$APRS=new APRS();
+	$APRS = new APRS();
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
 	if ($aprs_full) $aprs_filter = '';
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
 	else $aprs_pass = '-1';
@@ -379,12 +379,12 @@ 
 sleep(1);
 if ($globalDebug) echo "SCAN MODE \n\n";
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
-$endtime = time()+$globalCronEnd;
+$endtime = time() + $globalCronEnd;
 $i = 1;
 $tt = array();
 // Delete all ATC
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -392,7 +392,7 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) $i = $endtime - time();
     // Delete old ATC
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -406,7 +406,7 @@ 
 	}
 	if ($max != $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -425,8 +425,8 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $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);
@@ -459,11 +459,11 @@ 
 	    )
 	) {
 	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
 	    date_default_timezone_set('UTC');
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $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 != '') {
 		    //echo "'".$line."'\n";
@@ -481,7 +481,7 @@ 
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 		    if (isset($ais_data['timestamp'])) {
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
 			    $add = true;
@@ -504,15 +504,15 @@ 
 	    $w = $e = null;
 	    
 	    if (isset($arr[$id])) {
-		$nn = stream_select($arr,$w,$e,$timeout);
+		$nn = stream_select($arr, $w, $e, $timeout);
 		if ($nn > 0) {
 		    foreach ($httpfeeds as $feed) {
-			$buffer = stream_get_line($feed,2000,"\n");
+			$buffer = stream_get_line($feed, 2000, "\n");
 			if ($buffer === FALSE) {
 			    connect_all($globalSources);
 			}
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-			$buffer = explode('\n',$buffer);
+			$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 != '') {
 				$ais_data = $AIS->parse_line(trim($line));
@@ -530,9 +530,9 @@ 
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 				if (isset($ais_data['timestamp'])) {
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 				} else {
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				}
@@ -564,10 +564,10 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		//echo $buffer;
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -576,7 +576,7 @@ 
 			    $data['ident'] = $line['NAME'];
 			    $data['mmsi'] = $line['MMSI'];
 			    if (strlen($data['mmsi']) > 9) {
-				$data['mmsi'] = substr($data['mmsi'],-9);
+				$data['mmsi'] = substr($data['mmsi'], -9);
 			    }
 			    $data['speed'] = $line['SOG'];
 			    $data['heading'] = $line['COG'];
@@ -585,7 +585,7 @@ 
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
 			    $data['imo'] = $line['IMO'];
 			    //$data['arrival_code'] = $ais_data['destination'];
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
 			    $data['format_source'] = 'myshiptracking';
 			    $data['id_source'] = $id_source;
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -602,9 +602,9 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data[0]['mmsi'])) {
 		    foreach ($all_data as $line) {
 			if ($line != '') {
@@ -638,7 +638,7 @@ 
 	) {
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data['features'][0]['id'])) {
 		    foreach ($all_data['features'] as $line) {
 			$data = array();
@@ -671,27 +671,27 @@ 
 	    )
 	) {
 	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
 	    echo 'done !'."\n";
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $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 != '') {
 		    $data = array();
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
+		    $data['mmsi'] = (int) substr($line, 0, 9);
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
 		    //$data['status'] = substr($line,21,2);
 		    //$data['type'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
+		    $data['latitude'] = substr($line, 29, 9);
+		    $data['longitude'] = substr($line, 41, 9);
+		    $data['speed'] = round(substr($line, 51, 5));
 		    //$data['course'] = substr($line,57,5);
-		    $data['heading'] = round(substr($line,63,3));
+		    $data['heading'] = round(substr($line, 63, 3));
 		    //$data['draft'] = substr($line,67,4);
 		    //$data['length'] = substr($line,72,3);
 		    //$data['beam'] = substr($line,76,2);
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
 		    //$data['callsign'] = trim(substr($line,100,7);
 		    //$data['dest'] = substr($line,108,20);
 		    //$data['etaDate'] = substr($line,129,5);
@@ -724,8 +724,8 @@ 
 	) {
 	    //$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);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    $reset = 0;
 	    foreach ($buffer as $line) {
     		if ($line != '') {
@@ -736,7 +736,7 @@ 
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
 			$data['speed'] = $line[8]; // speed
@@ -752,7 +752,7 @@ 
 			//$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['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
@@ -761,7 +761,7 @@ 
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
+	    		    $aircraft_data = explode('/', $line[9]);
 	    		    if (isset($aircraft_data[1])) {
 	    			$data['aircraft_icao'] = $aircraft_data[1];
 	    		    }
@@ -776,9 +776,9 @@ 
     			if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
-				$typec = substr($data['ident'],-3);
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+				$typec = substr($data['ident'], -3);
 				if ($typec == 'APP') $data['type'] = 'Approach';
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -790,8 +790,8 @@ 
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($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']);
-					else 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']);
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($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']);
+					else 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);
@@ -807,24 +807,24 @@ 
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
     	    )
     	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
-			$data['latitude'] = (float)$line['pktLatitude'];
-			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
+			$data['latitude'] = (float) $line['pktLatitude'];
+			$data['longitude'] = (float) $line['pktLongitude'];
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['pilot_id'] = (int)$line['pktPilotID'];
+			$data['pilot_id'] = (int) $line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
@@ -832,22 +832,22 @@ 
 		}
 	    }
 	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
-			$data['id'] = (int)$line['gsID'];
-			$data['latitude'] = (float)$line['gsLatitude'];
-			$data['longitude'] = (float)$line['gsLongitude'];
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
+			$data['id'] = (int) $line['gsID'];
+			$data['latitude'] = (float) $line['gsLatitude'];
+			$data['longitude'] = (float) $line['gsLongitude'];
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			} else {
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			}
 			unset($data);
 		}
@@ -865,9 +865,9 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+	        $all_data = json_decode($buffer, true);
 		if (isset($all_data['acList'])) {
 		    $reset = 0;
 		    foreach ($all_data['acList'] as $line) {
@@ -883,7 +883,7 @@ 
 			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',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($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'];
@@ -908,7 +908,7 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
@@ -929,7 +929,7 @@ 
     	    )
     	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
@@ -946,12 +946,12 @@ 
 		    $data['emergency'] = ''; // emergency
 		    $data['registration'] = $line[2];
 		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
+		    $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['datetime'] = date('Y-m-d H:i:s', $line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -969,7 +969,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
@@ -986,7 +986,7 @@ 
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
 		    $data['format_source'] = 'opensky';
 		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1005,7 +1005,7 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (!empty($all_data)) $reset = 0;
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1043,11 +1043,11 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'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);
+	    $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());
 	    }
@@ -1070,7 +1070,7 @@ 
 			//$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['inf']['dt']); //$line[10]
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1091,14 +1091,14 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+	    $all_data = json_decode(utf8_encode($buffer), true);
 	    
 	    if (isset($all_data['pireps'])) {
 		$reset = 0;
 	        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['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
@@ -1128,9 +1128,9 @@ 
 			$SI->add($data);
 		    //    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);
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+			$typec = substr($data['ident'], -3);
 			$data['type'] = '';
 			if ($typec == 'APP') $data['type'] = 'Approach';
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -1141,7 +1141,7 @@ 
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
-			if (isset($ATC)) 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']);
+			if (isset($ATC)) 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);
 		}
@@ -1158,14 +1158,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		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
+	    	    $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
@@ -1180,7 +1180,7 @@ 
 	    	    //$data['datetime'] = $line['lastupdate'];
 	    	    //$data['last_update'] = $line['lastupdate'];
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1193,14 +1193,14 @@ 
 		    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']);
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
+	    		$aircraft_data = explode('-', $line['aircraftname']);
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
 	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
 	    		}
 	    	    }
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1225,14 +1225,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		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['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
@@ -1276,24 +1276,24 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '') {
 		$Source->deleteLocationBySource('blitzortung');
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-		$buffer = explode('\n',$buffer);
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+		$buffer = explode('\n', $buffer);
 		foreach ($buffer as $buffer_line) {
-		    $line = json_decode($buffer_line,true);
+		    $line = json_decode($buffer_line, true);
 		    if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
 			$data['longitude'] = $line['lon']; // long
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
 			if ($globalDebug) echo '☈ Lightning added'."\n";
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
 			unset($data);
 		    }
 		}
@@ -1318,11 +1318,11 @@ 
 		    //$value = $formats[$nb];
 		    $format = $globalSources[$nb]['format'];
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
 		    } elseif ($format == 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
 		    } else {
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
 		    }
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
 		    //echo $buffer."\n";
@@ -1332,8 +1332,8 @@ 
 		    //$SI::del();
 		    if ($buffer !== FALSE) {
 			if ($format == 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			    $buffer = explode('},{', $buffer);
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
 		    }
 		    // SBS format is CSV format
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1368,13 +1368,13 @@ 
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 			    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 (isset($ais_data['timestamp'])) {
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			    } else {
 				$data['datetime'] = date('Y-m-d H:i:s');
 			    }
@@ -1385,10 +1385,10 @@ 
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
                     	    if (strlen($buffer) > 5) {
-				$line = explode(',',$buffer);
+				$line = explode(',', $buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
 				$data['ident'] = $line[6];
 				$data['aircraft_name'] = $line[7];
 				$data['longitude'] = $line[1];
@@ -1405,16 +1405,16 @@ 
                         } elseif ($format == 'acars') {
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
 			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    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);
+				$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
+				    $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];
@@ -1422,8 +1422,8 @@ 
 				    $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);
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				}
@@ -1432,8 +1432,8 @@ 
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
 			    die;
 			} elseif ($format == 'vrstcp') {
-			    foreach($buffer as $all_data) {
-				$line = json_decode('{'.$all_data.'}',true);
+			    foreach ($buffer as $all_data) {
+				$line = json_decode('{'.$all_data.'}', true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1459,16 +1459,16 @@ 
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
 			    }
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
 			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
+			        $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');;
+    				$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'];
@@ -1487,23 +1487,23 @@ 
     			    } else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
 			    if ($aprs_connect == 0) {
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 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 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
 			    
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
 			    //echo 'APRS data : '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
+			    $buffer = str_replace('APRS <- ', '', $buffer);
+			    $buffer = str_replace('APRS -> ', '', $buffer);
 			    //echo $buffer."\n";
 			    date_default_timezone_set('UTC');
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+			    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'])) {
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1518,7 +1518,7 @@ 
 				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
 				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
 				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
 				    else $data['datetime'] = date('Y-m-d H:i:s');
 				    //$data['datetime'] = date('Y-m-d H:i:s');
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1601,29 +1601,29 @@ 
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
 					$Source->deleteOldLocationByType('gs');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					}
 				    } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					}
 				    } elseif ($globalDebug) {
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1632,7 +1632,7 @@ 
 				    unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
 				}
 				/*
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
@@ -1641,7 +1641,7 @@ 
 				*/
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1726,7 +1726,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    } 
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -1736,14 +1736,14 @@ 
 	    } else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
 			    if ($globalDebug) echo "Shutdown all sockets...";
 			    
 			    foreach ($sockets as $sock) {
-				@socket_shutdown($sock,2);
+				@socket_shutdown($sock, 2);
 				@socket_close($sock);
 			    }
 			    

require/class.Common.php

Spacing +86 added lines, -86 removed lines

@@ -14,12 +14,12 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -29,7 +29,7 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -39,13 +39,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -57,7 +57,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -69,13 +69,13 @@ 
 		$info = curl_getinfo($ch);
 		//var_dump($info);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 			return $result;
@@ -106,20 +106,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	public static function gunzip($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -127,19 +127,19 @@ 
 		}
 	}
 
-	public static function bunzip2($in_file,$out_file_name = '') {
+	public static function bunzip2($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
 			else {
 				echo 'bzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!feof($file)) {
+			while (!feof($file)) {
 				fwrite($out_file, bzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -157,27 +157,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('tr') as $element)
+		$tabledata = array();
+		foreach ($html->find('tr') as $element)
 		{
 			$td = array();
-			foreach( $element->find('th') as $row)
+			foreach ($element->find('th') as $row)
 			{
 				$td [] = trim($row->plaintext);
 			}
-			$td=array_filter($td);
+			$td = array_filter($td);
 			$tabledata[] = $td;
 
 			$td = array();
 			$tdi = array();
-			foreach( $element->find('td') as $row)
+			foreach ($element->find('td') as $row)
 			{
 				$td [] = trim($row->plaintext);
 				$tdi [] = trim($row->innertext);
 			}
-			$td=array_filter($td);
-			$tdi=array_filter($tdi);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -192,8 +192,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -213,11 +213,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -233,7 +233,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -249,12 +249,12 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 	    return(ctype_digit(strval($input)));
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -262,10 +262,10 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
-	public function convertDM($coord,$latlong) {
+	public function convertDM($coord, $latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
 			else $NSEW = 'N';
@@ -275,9 +275,9 @@ 
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
-		$coord = ($coord-$deg)*60;
+		$coord = ($coord - $deg)*60;
 		$min = $coord;
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
 	}
 	
 	/**
@@ -289,8 +289,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -301,9 +301,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ? true : false;
 	}
 	
 	/**
@@ -314,7 +314,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -324,7 +324,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -332,33 +332,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > pi()) {
-			if($dLon > 0) {
-				$dLon = (2 * pi() - $dLon) * -1;
+		if (abs($dLon) > pi()) {
+			if ($dLon > 0) {
+				$dLon = (2*pi() - $dLon)*-1;
 			} else {
-				$dLon = 2 * pi() + $dLon;
+				$dLon = 2*pi() + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 	
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -422,7 +422,7 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
 		global $globalMapRefresh;
 		if ($seconds == '') {
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
@@ -433,27 +433,27 @@ 
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -462,7 +462,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -476,14 +476,14 @@ 
 	 * @param integer $level GZIP compression level (default: 9)
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
 	 */
-	public function gzCompressFile($source, $level = 9){ 
-		$dest = $source . '.gz'; 
-		$mode = 'wb' . $level; 
+	public function gzCompressFile($source, $level = 9) { 
+		$dest = $source.'.gz'; 
+		$mode = 'wb'.$level; 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
-			if ($fp_in = fopen($source,'rb')) { 
+			if ($fp_in = fopen($source, 'rb')) { 
 				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+					gzwrite($fp_out, fread($fp_in, 1024*512)); 
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -499,7 +499,7 @@ 
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -556,7 +556,7 @@ 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -572,13 +572,13 @@ 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -612,7 +612,7 @@ 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
 			if (is_numeric($string[$i]) && $concat_flag) {
 				$int .= $string[$i];
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
 				$concat_flag = false;
 			}
 		}
@@ -658,7 +658,7 @@ 
 			$slice = array_slice($arr, $offset + 1, $length);
 			return implode("", $slice);
 		} else {
-			return mb_substr($string,$offset,$length,'UTF-8');
+			return mb_substr($string, $offset, $length, 'UTF-8');
 		}
 	}
 
@@ -668,14 +668,14 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
 		else if (is_dir($path))
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
+		if ($f === false)
 			return false;
 		fclose($f);
 		if (!$rm)

airline-statistics-aircraft.php

Spacing +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@ 
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 //	$spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -32,10 +32,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>────────────────</option>';
@@ -43,9 +43,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -79,12 +79,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -95,9 +95,9 @@ 
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
 	if ($alliance === false) {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	}
 
 	/*
@@ -107,7 +107,7 @@ 
 		$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
 	}
 	*/
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
 	if (!empty($aircraft_array))
 	{
 		print '<div class="table-responsive">';
@@ -120,7 +120,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

country-detailed.php

Spacing +10 added lines, -10 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['country'])){
+if (!isset($_GET['country'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 	  $limit_start = 0;
 	  $limit_end = 25;
 	  $absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -27,10 +27,10 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
+	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
 	
 	$page_url = $globalURL.'/country/'.$_GET['country'];
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($country == 'Na') {
 		$spotter_array = array();
 	} else {
@@ -43,7 +43,7 @@ 
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for Airports & Airlines from %s"),$country);
+		$title = sprintf(_("Detailed View for Airports & Airlines from %s"), $country);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -51,9 +51,9 @@ 
 		print '<select name="country" class="selectpicker" data-live-search="true">';
 		print '<option></option>';
 		$all_countries = $Spotter->getAllCountries();
-		foreach($all_countries as $all_country)
+		foreach ($all_countries as $all_country)
 		{
-			if($country == $all_country['country'])
+			if ($country == $all_country['country'])
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 			} else {
@@ -68,7 +68,7 @@ 
 		if ($_GET['country'] != "NA")
 		{
 			print '<div class="info column">';
-			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 			print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -76,7 +76,7 @@ 
 
 		include('country-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."), $country).'</p>';
 
 		include('table-output.php');
 		print '<div class="pagination">';

owner-statistics-departure-airport-country.php

Spacing +12 added lines, -12 removed lines

@@ -7,18 +7,18 @@ 
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Owner of %s"),$spotter_array[0]['aircraft_owner']);
+	$title = sprintf(_("Most Common Departure Airports by Owner of %s"), $spotter_array[0]['aircraft_owner']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
@@ -28,16 +28,16 @@ 
 	include('owner-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
 
-	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner,$filter);
+	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner, $filter);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['airport_departure_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -84,7 +84,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

airline-statistics-route.php

Spacing +18 added lines, -18 removed lines

@@ -7,21 +7,21 @@ 
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Routes from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Routes from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,12 +94,12 @@ 
 	 print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	if ($alliance) {
-		$route_array = $Spotter->countAllRoutesByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
+		$route_array = $Spotter->countAllRoutesByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
 	} else {
 		$route_array = $Spotter->countAllRoutesByAirline($airline);
 	}
@@ -117,7 +117,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

country-statistics-registration.php

Spacing +8 added lines, -8 removed lines

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

registration-sub-menu.php

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -27,7 +27,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/registration/statistics/arrival-airport-country/<?php print $registration; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

tv.php

Spacing +4 added lines, -4 removed lines

@@ -147,18 +147,18 @@
    
 <?php
 	if (isset($_GET['image']) && isset($_GET['q'])) {
-	$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
-	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+	$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>&q=<?php print $q; ?>", function( data ) {
 <?php
 	} elseif (isset($_GET['image'])) {
-	$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
+	$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>", function( data ) {
 <?php
 	} elseif (isset($_GET['q'])) {
-	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&q=<?php print $q; ?>", function( data ) {
 <?php