Ysurac / FlightAirMap

scripts/daemon-spotter.php

Braces +1028 added lines, -351 removed lines

@@ -14,13 +14,17 @@ 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -55,35 +59,62 @@ 
 //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']);
-    else $globalSources[] = array('host' => $options['s']);
-} elseif (isset($options['source'])) {
+    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']);
-    else $globalSources[] = array('host' => $options['source']);
-}
+    if (isset($options['format'])) {
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    } else {
+    	$globalSources[] = array('host' => $options['source']);
+    }
+    }
 if (isset($options['aprsserverhost'])) {
 	$globalServerAPRS = TRUE;
 	$globalServerAPRShost = $options['aprsserverhost'];
 }
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
-if (isset($options['server'])) $globalServer = TRUE;
-if (isset($options['idsource'])) $id_source = $options['idsource'];
-else $id_source = 1;
+if (isset($options['aprsserverport'])) {
+	$globalServerAPRSport = $options['aprsserverport'];
+}
+if (isset($options['aprsserverssid'])) {
+	$globalServerAPRSssid = $options['aprsserverssid'];
+}
+if (isset($options['aprsserverpass'])) {
+	$globalServerAPRSpass = $options['aprsserverpass'];
+}
+if (isset($options['noaprsserver'])) {
+	$globalServerAPRS = FALSE;
+}
+if (isset($options['nodaemon'])) {
+	$globalDaemon = FALSE;
+}
+if (isset($options['server'])) {
+	$globalServer = TRUE;
+}
+if (isset($options['idsource'])) {
+	$id_source = $options['idsource'];
+} else {
+	$id_source = 1;
+}
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
+    if ($globalDebug) {
+    	echo "Using Server Mode\n";
+    }
     $SI=new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
     $AIS = new AIS();
     $MI = new MarineImport($Connection->db);
@@ -106,7 +137,9 @@ 
 }
 
 // let's try and connect
-if ($globalDebug) echo "Connecting...\n";
+if ($globalDebug) {
+	echo "Connecting...\n";
+}
 $use_aprs = false;
 $aprs_full = false;
 $reset = 0;
@@ -115,7 +148,9 @@ 
     //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;
     $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
+    if ($globalDebug) {
+    	echo 'Connect to all...'."\n";
+    }
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
@@ -125,22 +160,30 @@ 
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to deltadb source (".$host.")...\n";
+        	}
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to vatsim source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/opensky/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to opensky source (".$host.")...\n";
+        	}
     	    /*
     	    // Disabled for now, site change source format
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
@@ -157,7 +200,9 @@ 
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -166,32 +211,46 @@ 
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to phpvmacars source (".$host.")...\n";
+        	}
             } else if (preg_match('/VAM-json.php$/i',$host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to Vam source (".$host.")...\n";
+        	}
             } else if (preg_match('/whazzup/i',$host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to whazzup source (".$host.")...\n";
+        	}
             } else if (preg_match('/blitzortung/i',$host)) {
         	$globalSources[$id]['format'] = 'blitzortung';
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to blitzortung source (".$host.")...\n";
+        	}
             } else if (preg_match('/airwhere/i',$host)) {
         	$globalSources[$id]['format'] = 'airwhere';
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to airwhere source (".$host.")...\n";
+        	}
             } else if (preg_match('/recentpireps/i',$host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to pirepsjson source (".$host.")...\n";
+        	}
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to fr24 source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -200,7 +259,9 @@ 
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to myshiptracking source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -209,17 +270,24 @@ 
             } 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";
+        	if ($globalDebug) {
+        		echo "Connect to tsv source (".$host.")...\n";
+        	}
             }
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
     		    $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";
+        		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 "Can't connect to ".$globalSources[$id]['host']."\n";
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		} elseif ($globalDebug) {
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		}
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
 	    $hostport = explode(':',$host);
 	    if (isset($hostport[1])) {
@@ -259,17 +327,25 @@ 
         		//$formats[$id] = 'beast';
         		$globalSources[$id]['format'] = 'beast';
 		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
+		    } else {
+		    	$globalSources[$id]['format'] = 'sbs';
+		    }
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		if ($globalDebug) {
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		}
             } else {
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		if ($globalDebug) {
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		}
     	    }
         }
     }
 }
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
+if (!isset($globalMinFetch)) {
+	$globalMinFetch = 15;
+}
 
 // Initialize all
 $status = array();
@@ -278,13 +354,19 @@ 
 $formats = array();
 $last_exec = array();
 $time = time();
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
-else $timeout = 20;
+if (isset($globalSourcesTimeout)) {
+	$timeout = $globalSourcesTimeOut;
+} else if (isset($globalSBS1TimeOut)) {
+	$timeout = $globalSBS1TimeOut;
+} else {
+	$timeout = 20;
+}
 $errno = '';
 $errstr='';
 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
+if (!isset($globalDaemon)) {
+	$globalDaemon = TRUE;
+}
 /* Initiate connections to all the hosts simultaneously */
 //connect_all($hosts);
 //connect_all($globalSources);
@@ -313,7 +395,9 @@ 
     if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
+	if (isset($source['port']) && $source['port'] == '10152') {
+		$aprs_full = true;
+	}
 	break;
     }
 }
@@ -324,25 +408,48 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	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';
-	if ($aprs_full) $aprs_filter = '';
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalAPRSssid)) {
+		$aprs_ssid = $globalAPRSssid;
+	} 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';
+	}
+	if ($aprs_full) {
+		$aprs_filter = '';
+	}
+	if (isset($globalAPRSpass)) {
+		$aprs_pass = $globalAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
-}
+	if ($aprs_filter != '') {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
+	} else {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
+	}
+	}
 
 // connected - lets do some work
-if ($globalDebug) echo "Connected!\n";
+if ($globalDebug) {
+	echo "Connected!\n";
+}
 sleep(1);
-if ($globalDebug) echo "SCAN MODE \n\n";
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
+if ($globalDebug) {
+	echo "SCAN MODE \n\n";
+}
+if (!isset($globalCronEnd)) {
+	$globalCronEnd = 60;
+}
 $endtime = time()+$globalCronEnd;
 $i = 1;
 $tt = array();
@@ -356,20 +463,28 @@ 
 
 // 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";
+	if ($globalDebug) {
+		echo 'Delete old ATC...'."\n";
+	}
         $ATC->deleteOldATC();
     }
     
     if (count($last_exec) == count($globalSources)) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+	    if ((time() - $last['last']) < $max) {
+	    	$max = time() - $last['last'];
+	    }
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Sleeping...'."\n";
+	    }
 	    sleep($globalMinFetch-$max+2);
 	}
     }
@@ -379,7 +494,9 @@ 
     foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
+	if (!isset($last_exec[$id]['last'])) {
+		$last_exec[$id]['last'] = 0;
+	}
 	if ($value['format'] == 'deltadbtxt' && 
 	    (
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
@@ -388,7 +505,9 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -397,20 +516,41 @@ 
 	            $data = array();
 	            $data['hex'] = $line[1]; // hex
 	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
+	            if (isset($line[3])) {
+	            	$data['altitude'] = $line[3];
+	            }
+	            // altitude
+	            if (isset($line[4])) {
+	            	$data['speed'] = $line[4];
+	            }
+	            // speed
+	            if (isset($line[5])) {
+	            	$data['heading'] = $line[5];
+	            }
+	            // heading
+	            if (isset($line[6])) {
+	            	$data['latitude'] = $line[6];
+	            }
+	            // lat
+	            if (isset($line[7])) {
+	            	$data['longitude'] = $line[7];
+	            }
+	            // long
 	            $data['verticalrate'] = ''; // vertical rate
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
 	            $data['emergency'] = ''; // emergency
 		    $data['datetime'] = date('Y-m-d H:i:s');
 		    $data['format_source'] = 'deltadbtxt';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['sourcestats'])) {
+		    	$data['sourcestats'] = $value['sourcestats'];
+		    }
     		    $SI->add($data);
 		    unset($data);
     		}
@@ -425,7 +565,9 @@ 
 	    date_default_timezone_set('CET');
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
 	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -434,16 +576,36 @@ 
 		    $add = false;
 		    $ais_data = $AIS->parse_line(trim($line));
 		    $data = array();
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+		    if (isset($ais_data['ident'])) {
+		    	$data['ident'] = $ais_data['ident'];
+		    }
+		    if (isset($ais_data['mmsi'])) {
+		    	$data['mmsi'] = $ais_data['mmsi'];
+		    }
+		    if (isset($ais_data['speed'])) {
+		    	$data['speed'] = $ais_data['speed'];
+		    }
+		    if (isset($ais_data['heading'])) {
+		    	$data['heading'] = $ais_data['heading'];
+		    }
+		    if (isset($ais_data['latitude'])) {
+		    	$data['latitude'] = $ais_data['latitude'];
+		    }
+		    if (isset($ais_data['longitude'])) {
+		    	$data['longitude'] = $ais_data['longitude'];
+		    }
+		    if (isset($ais_data['status'])) {
+		    	$data['status'] = $ais_data['status'];
+		    }
+		    if (isset($ais_data['type'])) {
+		    	$data['type'] = $ais_data['type'];
+		    }
+		    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']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -457,8 +619,12 @@ 
 		    $data['format_source'] = 'aisnmeatxt';
     		    $data['id_source'] = $id_source;
 		    //print_r($data);
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
+		    	$MI->add($data);
+		    }
 		    unset($data);
 		}
     	    }
@@ -478,20 +644,48 @@ 
 			    if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
-				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['ident'])) {
+					$data['ident'] = $ais_data['ident'];
+				}
+				if (isset($ais_data['mmsi'])) {
+					$data['mmsi'] = $ais_data['mmsi'];
+				}
+				if (isset($ais_data['speed'])) {
+					$data['speed'] = $ais_data['speed'];
+				}
+				if (isset($ais_data['heading'])) {
+					$data['heading'] = $ais_data['heading'];
+				}
+				if (isset($ais_data['latitude'])) {
+					$data['latitude'] = $ais_data['latitude'];
+				}
+				if (isset($ais_data['longitude'])) {
+					$data['longitude'] = $ais_data['longitude'];
+				}
+				if (isset($ais_data['status'])) {
+					$data['status'] = $ais_data['status'];
+				}
+				if (isset($ais_data['statusid'])) {
+					$data['status_id'] = $ais_data['statusid'];
+				}
+				if (isset($ais_data['type'])) {
+					$data['type'] = $ais_data['type'];
+				}
+				if (isset($ais_data['typeid'])) {
+					$data['type_id'] = $ais_data['typeid'];
+				}
+				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['timestamp'])) {
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 				} else {
@@ -499,18 +693,27 @@ 
 				}
 				$data['format_source'] = 'aisnmeahttp';
 				$data['id_source'] = $id_source;
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
+					$MI->add($data);
+				}
 				unset($data);
 			    }
 			}
 		    }
 		} else {
 		    $format = $value['format'];
-		    if (isset($tt[$format])) $tt[$format]++;
-		    else $tt[$format] = 0;
+		    if (isset($tt[$format])) {
+		    	$tt[$format]++;
+		    } else {
+		    	$tt[$format] = 0;
+		    }
 		    if ($tt[$format] > 30) {
-			if ($globalDebug) echo 'Reconnect...'."\n";
+			if ($globalDebug) {
+				echo 'Reconnect...'."\n";
+			}
 			sleep(2);
 			$sourceeen[] = $value;
 			connect_all($sourceeen);
@@ -545,7 +748,9 @@ 
 			    $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;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -570,7 +775,9 @@ 
 			    $data['callsign'] = $line['callsign'];
 			    $data['mmsi'] = $line['mmsi'];
 			    $data['speed'] = $line['sog'];
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
+			    if ($line['heading'] != '511') {
+			    	$data['heading'] = $line['heading'];
+			    }
 			    $data['latitude'] = $line['latitude'];
 			    $data['longitude'] = $line['longitude'];
 			    $data['type_id'] = $line['shiptype'];
@@ -578,7 +785,9 @@ 
 			    $data['datetime'] = $line['time'];
 			    $data['format_source'] = 'boatbeaconapp';
 			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -599,22 +808,44 @@ 
 		if (isset($all_data['features'][0]['id'])) {
 		    foreach ($all_data['features'] as $line) {
 			$data = array();
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = $line['properties']['mmsi'];
-			if (isset($line['properties']['imo'])) $data['mmsi'] = $line['properties']['imo'];
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
-			if (isset($line['properties']['heading'])) $data['heading'] = $line['properties']['heading'];
+			if (isset($line['properties']['name'])) {
+				$data['ident'] = $line['properties']['name'];
+			}
+			if (isset($line['properties']['callsign'])) {
+				$data['callsign'] = $line['properties']['callsign'];
+			}
+			if (isset($line['properties']['mmsi'])) {
+				$data['mmsi'] = $line['properties']['mmsi'];
+			}
+			if (isset($line['properties']['imo'])) {
+				$data['mmsi'] = $line['properties']['imo'];
+			}
+			if (isset($line['properties']['speed'])) {
+				$data['speed'] = $line['properties']['speed'];
+			}
+			if (isset($line['properties']['heading'])) {
+				$data['heading'] = $line['properties']['heading'];
+			}
 			$data['latitude'] = $line['geometry']['coordinates'][1];
 			$data['longitude'] = $line['geometry']['coordinates'][0];
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
+			if (isset($line['properties']['vesselType'])) {
+				$data['type'] = $line['properties']['vesselType'];
+			}
+			if (isset($line['properties']['destination'])) {
+				$data['arrival_code'] = $line['properties']['destination'];
+			}
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
+				$data['arrival_date'] = $line['properties']['eta'];
+			}
 			$data['format_source'] = 'boatnerd';
 			$data['id_source'] = $id_source;
 			$data['datetime'] = date('Y-m-d H:i:s');
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
+				$MI->add($data);
+			}
 			unset($data);
 		    }
 		}
@@ -630,7 +861,9 @@ 
 	    echo 'download...';
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
 	    echo 'done !'."\n";
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -655,7 +888,9 @@ 
 		    //$data['etaTime'] = substr($line,135,5);
 		    $data['format_source'] = 'shipplotter';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    //print_r($data);
 		    echo 'Add...'."\n";
 		    $MI->add($data);
@@ -689,16 +924,28 @@ 
     		    $line = explode(':', $line);
     		    if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
+			if (isset($line[37]) && $line[37] != '') {
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
+			} 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['ident'] = $line[0]; // ident
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
+			if ($line[7] != '' && $line[7] != 0) {
+				$data['altitude'] = $line[7];
+			}
+			// altitude
 			$data['speed'] = $line[8]; // speed
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
+			if (isset($line[45])) {
+				$data['heading'] = $line[45];
+			}
+			// heading
+			elseif (isset($line[38])) {
+				$data['heading'] = $line[38];
+			}
+			// heading
 			$data['latitude'] = $line[5]; // lat
 	        	$data['longitude'] = $line[6]; // long
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -714,7 +961,9 @@ 
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
-			if (isset($line[35])) $data['info'] = $line[35];
+			if (isset($line[35])) {
+				$data['info'] = $line[35];
+			}
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
@@ -728,27 +977,47 @@ 
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
 	    		$data['format_source'] = $value['format'];
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
-			elseif ($line[3] == 'ATC') {
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+    			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);
-				if ($typec == 'APP') $data['type'] = 'Approach';
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
-				if (!isset($data['source_name'])) $data['source_name'] = '';
+				if ($typec == 'APP') {
+					$data['type'] = 'Approach';
+				} elseif ($typec == 'TWR') {
+					$data['type'] = 'Tower';
+				} elseif ($typec == 'OBS') {
+					$data['type'] = 'Observer';
+				} elseif ($typec == 'GND') {
+					$data['type'] = 'Ground';
+				} elseif ($typec == 'DEL') {
+					$data['type'] = 'Delivery';
+				} elseif ($typec == 'DEP') {
+					$data['type'] = 'Departure';
+				} elseif ($typec == 'FSS') {
+					$data['type'] = 'Flight Service Station';
+				} elseif ($typec == 'CTR') {
+					$data['type'] = 'Control Radar or Centre';
+				} 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);
@@ -775,14 +1044,20 @@ 
 			$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'];
+			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['aircraft_icao'] = 'PARAGLIDER';
 			$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];
+			if (isset($pilot_data[4])) {
+				$data['pilot_name'] = $pilot_data[4];
+			}
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
 			unset($data);
@@ -830,25 +1105,59 @@ 
 		    foreach ($all_data['acList'] as $line) {
 			$data = array();
 			$data['hex'] = $line['Icao']; // hex
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			if (isset($line['Call'])) {
+				$data['ident'] = $line['Call'];
+			}
+			// ident
+			if (isset($line['Alt'])) {
+				$data['altitude'] = $line['Alt'];
+			}
+			// altitude
+			if (isset($line['Spd'])) {
+				$data['speed'] = $line['Spd'];
+			}
+			// speed
+			if (isset($line['Trak'])) {
+				$data['heading'] = $line['Trak'];
+			}
+			// heading
+			if (isset($line['Lat'])) {
+				$data['latitude'] = $line['Lat'];
+			}
+			// lat
+			if (isset($line['Long'])) {
+				$data['longitude'] = $line['Long'];
+			}
+			// long
 			//$data['verticalrate'] = $line['']; // verticale rate
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			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));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			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));
+			} 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'];
+			if (isset($line['Type'])) {
+				$data['aircraft_icao'] = $line['Type'];
+			}
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($data['latitude'])) $SI->add($data);
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($data['latitude'])) {
+				$SI->add($data);
+			}
 			unset($data);
 		    }
 		} elseif (is_array($all_data)) {
@@ -865,17 +1174,26 @@ 
 			$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));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			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;
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
 		}
-	    } elseif ($globalDebug) echo 'No data'."\n";
+	    } elseif ($globalDebug) {
+	    	echo 'No data'."\n";
+	    }
     	    //$last_exec['aircraftlistjson'] = time();
     	    $last_exec[$id]['last'] = time();
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
@@ -911,8 +1229,12 @@ 
 		    $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;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -946,7 +1268,9 @@ 
 		    $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;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -963,7 +1287,9 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
+	    if (!empty($all_data)) {
+	    	$reset = 0;
+	    }
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
 		    $data = array();
@@ -984,8 +1310,12 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
 	    	    $data['format_source'] = 'fr24json';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1014,24 +1344,42 @@ 
 		    if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
+			if (isset($line['inf']['cs'])) {
+				$data['ident'] = $line['inf']['cs'];
+			}
+			//$line[13]
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+	    		if (isset($line['inf']['gs'])) {
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
+	    		}
+	    		// speed
+	    		if (isset($line['inf']['tr'])) {
+	    			$data['heading'] = $line['inf']['tr'];
+	    		}
+	    		// heading
 	    		$data['latitude'] = $line['pt'][0]; // lat
 	    		$data['longitude'] = $line['pt'][1]; // long
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+	    		if (isset($line['inf']['sq'])) {
+	    			$data['squawk'] = $line['inf']['sq'];
+	    		}
+	    		// squawk
 	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+	    		if (isset($line['inf']['rc'])) {
+	    			$data['registration'] = $line['inf']['rc'];
+	    		}
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
 			$data['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;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
@@ -1057,30 +1405,65 @@ 
 		    $data['id'] = $line['id'];
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
 		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['pilotid'])) {
+		    	$data['pilot_id'] = $line['pilotid'];
+		    }
+		    // pilot id
+		    if (isset($line['name'])) {
+		    	$data['pilot_name'] = $line['name'];
+		    }
+		    // pilot name
+		    if (isset($line['alt'])) {
+		    	$data['altitude'] = $line['alt'];
+		    }
+		    // altitude
+		    if (isset($line['gs'])) {
+		    	$data['speed'] = $line['gs'];
+		    }
+		    // speed
+		    if (isset($line['heading'])) {
+		    	$data['heading'] = $line['heading'];
+		    }
+		    // heading
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    $data['latitude'] = $line['lat']; // lat
 		    $data['longitude'] = $line['lon']; // long
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
 		    //$data['squawk'] = $line['squawk']; // squawk
 		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+		    if (isset($line['depicao'])) {
+		    	$data['departure_airport_icao'] = $line['depicao'];
+		    }
+		    if (isset($line['deptime'])) {
+		    	$data['departure_airport_time'] = $line['deptime'];
+		    }
+		    if (isset($line['arricao'])) {
+		    	$data['arrival_airport_icao'] = $line['arricao'];
+		    }
 		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
+		    if (isset($line['aircraft'])) {
+		    	$data['aircraft_icao'] = $line['aircraft'];
+		    }
+		    if (isset($line['transponder'])) {
+		    	$data['squawk'] = $line['transponder'];
+		    }
+		    if (isset($line['atis'])) {
+		    	$data['info'] = $line['atis'];
+		    } else {
+		    	$data['info'] = '';
+		    }
 		    $data['format_source'] = 'pireps';
     		    $data['id_source'] = $id_source;
 		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    if ($line['icon'] == 'plane') {
 			$SI->add($data);
 		    //    print_r($data);
@@ -1089,16 +1472,28 @@ 
 			$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';
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
-			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 ($typec == 'APP') {
+				$data['type'] = 'Approach';
+			} elseif ($typec == 'TWR') {
+				$data['type'] = 'Tower';
+			} elseif ($typec == 'OBS') {
+				$data['type'] = 'Observer';
+			} elseif ($typec == 'GND') {
+				$data['type'] = 'Ground';
+			} elseif ($typec == 'DEL') {
+				$data['type'] = 'Delivery';
+			} elseif ($typec == 'DEP') {
+				$data['type'] = 'Departure';
+			} 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']);
+			}
 		    }
 		    unset($data);
 		}
@@ -1113,7 +1508,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1121,10 +1518,16 @@ 
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    }
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+	    	    if (isset($line['pilotname'])) {
+	    	    	$data['pilot_name'] = $line['pilotname'];
+	    	    }
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['pilot_id'] = $line['pilotid'];
+	    	    }
 	    	    $data['ident'] = $line['flightnum']; // ident
 	    	    $data['altitude'] = $line['alt']; // altitude
 	    	    $data['speed'] = $line['gs']; // speed
@@ -1140,34 +1543,52 @@ 
 	    		$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');
+	    	    } else {
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
+	    	    }
 	    	    $data['departure_airport_icao'] = $line['depicao'];
 	    	    $data['departure_airport_time'] = $line['deptime'];
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
     		    $data['arrival_airport_time'] = $line['arrtime'];
     		    $data['registration'] = $line['aircraft'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
 	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 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 {
+	    		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']);
+	    		    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'];
+    		    if (isset($line['route'])) {
+    		    	$data['waypoints'] = $line['route'];
+    		    }
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1180,7 +1601,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1209,16 +1632,25 @@ 
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
     		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 	    	    $data['aircraft_icao'] = $line['plane_type'];
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'vam';
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1231,7 +1663,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '') {
@@ -1249,18 +1683,24 @@ 
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
-			if ($globalDebug) echo '☈ Lightning added'."\n";
+			if ($globalDebug) {
+				echo '☈ Lightning added'."\n";
+			}
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
 			unset($data);
 		    }
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 	    }
 	    $last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+	    if (function_exists('pcntl_fork')) {
+	    	pcntl_signal_dispatch();
+	    }
     	    //$last_exec[$id]['last'] = time();
 
 	    //$read = array( $sockets[$id] );
@@ -1268,7 +1708,9 @@ 
 	    $write = NULL;
 	    $e = NULL;
 	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
+	    if ($e != NULL) {
+	    	var_dump($e);
+	    }
 	    if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
@@ -1289,12 +1731,16 @@ 
 		    //$SI::del();
 		    if ($format == 'vrstcp') {
 			$buffer = explode('},{',$buffer);
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$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 != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+			    if ($globalDebug) {
+			    	echo 'ACARS : '.$buffer."\n";
+			    }
 			    $ACARS->add(trim($buffer));
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
@@ -1303,30 +1749,70 @@ 
 			    if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				if (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);
+				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($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);
+				}
 			    }
 			} elseif ($format == 'ais') {
 			    $ais_data = $AIS->parse_line(trim($buffer));
 			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    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($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['ident'])) {
+			    	$data['ident'] = $ais_data['ident'];
+			    }
+			    if (isset($ais_data['mmsi'])) {
+			    	$data['mmsi'] = $ais_data['mmsi'];
+			    }
+			    if (isset($ais_data['speed'])) {
+			    	$data['speed'] = $ais_data['speed'];
+			    }
+			    if (isset($ais_data['heading'])) {
+			    	$data['heading'] = $ais_data['heading'];
+			    }
+			    if (isset($ais_data['latitude'])) {
+			    	$data['latitude'] = $ais_data['latitude'];
+			    }
+			    if (isset($ais_data['longitude'])) {
+			    	$data['longitude'] = $ais_data['longitude'];
+			    }
+			    if (isset($ais_data['status'])) {
+			    	$data['status'] = $ais_data['status'];
+			    }
+			    if (isset($ais_data['statusid'])) {
+			    	$data['status_id'] = $ais_data['statusid'];
+			    }
+			    if (isset($ais_data['type'])) {
+			    	$data['type'] = $ais_data['type'];
+			    }
+			    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($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']);
@@ -1335,7 +1821,9 @@ 
 			    }
 			    $data['format_source'] = 'aisnmea';
     			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
+			    	$MI->add($data);
+			    }
 			    unset($data);
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
@@ -1353,12 +1841,18 @@ 
 				$data['speed'] = round($line[5]*1.94384);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
-				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);
+				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);
+				}
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
 			    }
                         } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+                    	    if ($globalDebug) {
+                    	    	echo 'ACARS : '.$buffer."\n";
+                    	    }
 			    $ACARS->add(trim($buffer));
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
 			    $ACARS->deleteLiveAcarsData();
@@ -1379,8 +1873,12 @@ 
 				    $aircraft_type = $line[10];
 				    $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);
+				    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);
+				    }
 				}
 			    }
 			} elseif ($format == 'beast') {
@@ -1390,28 +1888,62 @@ 
 			    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
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+				if (isset($line['Icao'])) {
+					$data['hex'] = $line['Icao'];
+				}
+				// hex
+				if (isset($line['Call'])) {
+					$data['ident'] = $line['Call'];
+				}
+				// ident
+				if (isset($line['Alt'])) {
+					$data['altitude'] = $line['Alt'];
+				}
+				// altitude
+				if (isset($line['Spd'])) {
+					$data['speed'] = $line['Spd'];
+				}
+				// speed
+				if (isset($line['Trak'])) {
+					$data['heading'] = $line['Trak'];
+				}
+				// heading
+				if (isset($line['Lat'])) {
+					$data['latitude'] = $line['Lat'];
+				}
+				// lat
+				if (isset($line['Long'])) {
+					$data['longitude'] = $line['Long'];
+				}
+				// long
 				//$data['verticalrate'] = $line['']; // verticale rate
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+				if (isset($line['Sqk'])) {
+					$data['squawk'] = $line['Sqk'];
+				}
+				// squawk
 				$data['emergency'] = ''; // emergency
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+				if (isset($line['Reg'])) {
+					$data['registration'] = $line['Reg'];
+				}
 				/*
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 				else $data['datetime'] = date('Y-m-d H:i:s');
 				*/
 				$data['datetime'] = date('Y-m-d H:i:s');
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				if (isset($line['Type'])) {
+					$data['aircraft_icao'] = $line['Type'];
+				}
 		    		$data['format_source'] = 'vrstcp';
 				$data['id_source'] = $id_source;
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (isset($value['name']) && $value['name'] != '') {
+					$data['source_name'] = $value['name'];
+				}
+				if (isset($data['latitude']) && isset($data['hex'])) {
+					$SI->add($data);
+				}
 				unset($data);
 			    }
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
@@ -1424,22 +1956,46 @@ 
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
     				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+    				if (isset($lined['ident'])) {
+    					$data['ident'] = $lined['ident'];
+    				}
+    				if (isset($lined['lat'])) {
+    					$data['latitude'] = $lined['lat'];
+    				}
+    				if (isset($lined['lon'])) {
+    					$data['longitude'] = $lined['lon'];
+    				}
+    				if (isset($lined['speed'])) {
+    					$data['speed'] = $lined['speed'];
+    				}
+    				if (isset($lined['squawk'])) {
+    					$data['squawk'] = $lined['squawk'];
+    				}
+    				if (isset($lined['alt'])) {
+    					$data['altitude'] = $lined['alt'];
+    				}
+    				if (isset($lined['heading'])) {
+    					$data['heading'] = $lined['heading'];
+    				}
     				$data['id_source'] = $id_source;
     				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				if (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);
+    				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($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);
+    				}
     				unset($lined);
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			} elseif ($format == 'aprs' && $use_aprs) {
 			    if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1464,59 +2020,117 @@ 
 				    $aprs_last_tx = time();
 				    $data = array();
 				    //print_r($line);
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
-				    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']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
+				    if (isset($line['address'])) {
+				    	$data['hex'] = $line['address'];
+				    }
+				    if (isset($line['mmsi'])) {
+				    	$data['mmsi'] = $line['mmsi'];
+				    }
+				    if (isset($line['imo'])) {
+				    	$data['imo'] = $line['imo'];
+				    }
+				    if (isset($line['squawk'])) {
+				    	$data['squawk'] = $line['squawk'];
+				    }
+				    if (isset($line['arrival_code'])) {
+				    	$data['arrical_code'] = $line['arrival_code'];
+				    }
+				    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']);
+				    } 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'];
+				    if (isset($line['ident'])) {
+				    	$data['ident'] = $line['ident'];
+				    }
 				    $data['latitude'] = $line['latitude'];
 				    $data['longitude'] = $line['longitude'];
 				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
+				    if (isset($line['speed'])) {
+				    	$data['speed'] = $line['speed'];
+				    }
 				    //else $data['speed'] = 0;
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
+				    if (isset($line['altitude'])) {
+				    	$data['altitude'] = $line['altitude'];
+				    }
+				    if (isset($line['comment'])) {
+				    	$data['comment'] = $line['comment'];
+				    }
+				    if (isset($line['symbol'])) {
+				    	$data['type'] = $line['symbol'];
+				    }
+				    if (isset($line['heading'])) {
+				    	$data['heading'] = $line['heading'];
+				    }
 				    //else $data['heading'] = 0;
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
+				    if (isset($line['stealth'])) {
+				    	$data['aircraft_type'] = $line['stealth'];
+				    }
 				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
+				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) {
+				    	$data['noarchive'] = true;
+				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) {
+				    	$data['noarchive'] = false;
+				    }
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+				    	$data['noarchive'] = true;
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
+				    	$data['noarchive'] = false;
+				    }
     				    $data['id_source'] = $id_source;
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
-				    else $data['format_source'] = 'aprs';
+    				    if (isset($line['format_source'])) {
+    				    	$data['format_source'] = $line['format_source'];
+    				    } else {
+				    	$data['format_source'] = 'aprs';
+				    }
 				    $data['source_name'] = $line['source'];
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
-				    else $data['source_type'] = 'flarm';
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				    if (isset($line['source_type'])) {
+				    	$data['source_type'] = $line['source_type'];
+				    } else {
+				    	$data['source_type'] = 'flarm';
+				    }
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    }
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
+				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') {
+				    	$data['altitude_relative'] = 'AMSL';
+				    }
 				    // Accept data if time <= system time + 20s
 				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
 				    } elseif ($data['source_type'] == 'ais') {
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
+					if (isset($globalMarine) && $globalMarine) {
+						$send = $MI->add($data);
+					}
 				    } elseif (isset($line['stealth'])) {
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					if ($line['stealth'] != 0) {
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
+					} else {
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					}
 				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
 					    //$line['symbol'] == 'Balloon' ||
 					    $line['symbol'] == 'Glider' || 
 					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
-					    if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';
-					    if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
+					    if ($line['symbol'] == 'Ballon') {
+					    	$data['aircraft_icao'] = 'BALL';
+					    }
+					    if ($line['symbol'] == 'Glider') {
+					    	$data['aircraft_icao'] = 'PARAGLIDER';
+					    }
 					    $send = $SI->add($data);
 				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
 					    $line['symbol'] == 'Yacht (Sail)' || 
@@ -1547,9 +2161,13 @@ 
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
+					if (isset($globalTracker) && $globalTracker) {
+						$send = $TI->add($data);
+					}
 				    } 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;
+					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']);
@@ -1558,7 +2176,9 @@ 
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
-					if ($globalDebug) echo '# Weather Station added'."\n";
+					if ($globalDebug) {
+						echo '# Weather Station added'."\n";
+					}
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
@@ -1568,7 +2188,9 @@ 
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Lightning') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
-					if ($globalDebug) echo '☈ Lightning added'."\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']);
@@ -1580,8 +2202,7 @@ 
 				    	print_r($line);
 				    }
 				    unset($data);
-				}
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
 				}
 				/*
@@ -1590,7 +2211,9 @@ 
 				}
 				*/
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
-				elseif ($line == true && $globalDebug) echo '!! Failed : '.$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) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
@@ -1626,26 +2249,45 @@ 
     				$data['ground'] = $line[21];
     				$data['emergency'] = $line[19];
     				$data['format_source'] = 'sbs';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				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($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
     				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+    					$send = $SI->add($data);
+    				} else {
+    					$error = true;
+    				}
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			    if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Not a message. Ignoring... \n";
+					}
 				} else {
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Wrong line format. Ignoring... \n";
+					}
 					if ($globalDebug) {
 						echo $buffer;
 						//print_r($line);
 					}
 					//socket_close($r);
-					if ($globalDebug) echo "Reconnect after an error...\n";
-					if ($format == 'aprs') $aprs_connect = 0;
+					if ($globalDebug) {
+						echo "Reconnect after an error...\n";
+					}
+					if ($format == 'aprs') {
+						$aprs_connect = 0;
+					}
 					$sourceer[$nb] = $globalSources[$nb];
 					connect_all($sourceer);
 					$sourceer = array();
@@ -1653,10 +2295,14 @@ 
 			    }
 			}
 			// Sleep for xxx microseconds
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
+			if (isset($globalSBSSleep)) {
+				usleep($globalSBSSleep);
+			}
 		    } else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+			    	if ($globalDebug) {
+			    		echo "Reconnect FlightGear MP...";
+			    	}
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1665,10 +2311,15 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
+			    if (isset($tt[$format])) {
+			    	$tt[$format]++;
+			    } else {
+			    	$tt[$format] = 0;
+			    }
 			    if ($tt[$format] > 30) {
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
+				if ($globalDebug) {
+					echo "ERROR : Reconnect ".$format."...";
+				}
 				//@socket_close($r);
 				sleep(2);
 				$aprs_connect = 0;
@@ -1685,11 +2336,17 @@ 
 	    } 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 (isset($globalDebug)) echo "Restarting...\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...";
+			    if ($globalDebug) {
+			    	echo "Shutdown all sockets...";
+			    }
 			    
 			    foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
@@ -1697,25 +2354,45 @@ 
 			    }
 			    
 			}
-			if ($globalDebug) echo "Waiting...";
+			if ($globalDebug) {
+				echo "Waiting...";
+			}
 			sleep(2);
 			$time = time();
 			//connect_all($hosts);
 			$aprs_connect = 0;
-			if ($reset%5 == 0) sleep(20);
-			if ($reset%10 == 0) sleep(100);
-			if ($reset%20 == 0) sleep(200);
-			if ($reset > 100) exit('Too many attempts...');
-			if ($globalDebug) echo "Restart all connections...";
+			if ($reset%5 == 0) {
+				sleep(20);
+			}
+			if ($reset%10 == 0) {
+				sleep(100);
+			}
+			if ($reset%20 == 0) {
+				sleep(200);
+			}
+			if ($reset > 100) {
+				exit('Too many attempts...');
+			}
+			if ($globalDebug) {
+				echo "Restart all connections...";
+			}
 			connect_all($globalSources);
 		}
 	    }
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    if (isset($SI)) $SI->checkAll();
-	    if (isset($TI)) $TI->checkAll();
-	    if (isset($MI)) $MI->checkAll();
+	    if ($globalDebug) {
+	    	echo 'Check all...'."\n";
+	    }
+	    if (isset($SI)) {
+	    	$SI->checkAll();
+	    }
+	    if (isset($TI)) {
+	    	$TI->checkAll();
+	    }
+	    if (isset($MI)) {
+	    	$MI->checkAll();
+	    }
 	}
     }
 }

require/class.APRS.php

Braces +307 added lines, -110 removed lines

@@ -184,17 +184,23 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+	    if ($globalDebug) {
+	    	echo '!!! APRS invalid : '.$input."\n";
+	    }
 	    return false;
 	}
 	
-	if ($debug) echo 'input : '.$input."\n";
+	if ($debug) {
+		echo 'input : '.$input."\n";
+	}
 	/* Save header and body. */
 	$body = substr($input,$splitpos+1,$input_len);
 	$body_len = strlen($body);
 	$header = substr($input,0,$splitpos);
 	//$header_len = strlen($header);
-	if ($debug) echo 'header : '.$header."\n";
+	if ($debug) {
+		echo 'header : '.$header."\n";
+	}
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -208,11 +214,15 @@ 
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
 	    } else {
-		if ($debug) echo 'ident : '.$ident."\n";
+		if ($debug) {
+			echo 'ident : '.$ident."\n";
+		}
 		$result['ident'] = $ident;
 	    }
 	} else {
-	    if ($debug) 'No ident'."\n";
+	    if ($debug) {
+	    	'No ident'."\n";
+	    }
 	    return false;
 	}
 	$elements = explode(',',$all_elements);
@@ -223,7 +233,9 @@ 
 	        //echo "ok";
 	        //if ($element == 'TCPIP*') return false;
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
-		if ($debug) echo 'element : '.$element."\n";
+		if ($debug) {
+			echo 'element : '.$element."\n";
+		}
 		return false;
 	    }
 	    /*
@@ -236,13 +248,17 @@ 
 	}
 	
 	$type = substr($body,0,1);
-	if ($debug) echo 'type : '.$type."\n";
+	if ($debug) {
+		echo 'type : '.$type."\n";
+	}
 	if ($type == ';') {
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
 			$result['address'] = trim(substr($body,1,9));
 		} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
 			$result['mmsi'] = trim(substr($body,1,9));
-		} else $result['ident'] = trim(substr($body,1,9));
+		} else {
+			$result['ident'] = trim(substr($body,1,9));
+		}
 	} elseif ($type == ',') {
 		// Invalid data or test data
 		return false;
@@ -311,7 +327,9 @@ 
 		//$symbol_table = $matches[4];
 		$lat = intval($lat_deg);
 		$lon = intval($lon_deg);
-		if ($lat > 89 || $lon > 179) return false;
+		if ($lat > 89 || $lon > 179) {
+			return false;
+		}
 	    
 	    /*
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -321,8 +339,12 @@ 
 	    */
 		$latitude = $lat + floatval($lat_min)/60;
 		$longitude = $lon + floatval($lon_min)/60;
-		if ($sind == 'S') $latitude = 0-$latitude;
-		if ($wind == 'W') $longitude = 0-$longitude;
+		if ($sind == 'S') {
+			$latitude = 0-$latitude;
+		}
+		if ($wind == 'W') {
+			$longitude = 0-$longitude;
+		}
 		$result['latitude'] = $latitude;
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
@@ -350,8 +372,11 @@ 
 			//echo 'find'."\n";
 			$body_split = str_split($body_parse);
 			$symbol_code = $body_split[0];
-			if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code;
-			else $symbol_code = '\\'.$symbol_code;
+			if (!isset($symbolll) || $symbolll == '/') {
+				$symbol_code = '/'.$symbol_code;
+			} else {
+				$symbol_code = '\\'.$symbol_code;
+			}
 		//'
 		//}
 		//echo $body_parse;
@@ -360,7 +385,9 @@ 
 			$body_parse = substr($body_parse,1);
 			$body_parse_len = strlen($body_parse);
 			$result['symbol_code'] = $symbol_code;
-			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
+			if (isset($this->symbols[$symbol_code])) {
+				$result['symbol'] = $this->symbols[$symbol_code];
+			}
 			if ($symbol_code != '_') {
 			}
 		    //$body_parse = substr($body_parse,1);
@@ -371,7 +398,9 @@ 
 		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
 		    	    $course = substr($body_parse,0,3);
 		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
+		    	    	$result['heading'] = intval($course);
+		    	    }
 		    	    $speed = substr($body_parse,4,3);
 		    	    if ($speed != '...') {
 		    		//$result['speed'] = round($speed*1.852);
@@ -412,10 +441,16 @@ 
 			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
 			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
-				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-				else $result['latitude'] += $lat_off;
-				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-				else $result['longitude'] += $lon_off;
+				if ($result['latitude'] < 0) {
+					$result['latitude'] -= $lat_off;
+				} else {
+					$result['latitude'] += $lat_off;
+				}
+				if ($result['longitude'] < 0) {
+					$result['longitude'] -= $lon_off;
+				} else {
+					$result['longitude'] += $lon_off;
+				}
 			    }
 			    
 		            $body_parse = substr($body_parse,6);
@@ -457,27 +492,48 @@ 
 			$address = substr($id,2);
 			//print_r($matches);
 			$addressType = (intval(substr($id,0,2),16))&3;
-			if ($addressType == 0) $result['addresstype'] = "RANDOM";
-			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
-			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
-			elseif ($addressType == 3) $result['addresstype'] = "OGN";
+			if ($addressType == 0) {
+				$result['addresstype'] = "RANDOM";
+			} elseif ($addressType == 1) {
+				$result['addresstype'] = "ICAO";
+			} elseif ($addressType == 2) {
+				$result['addresstype'] = "FLARM";
+			} elseif ($addressType == 3) {
+				$result['addresstype'] = "OGN";
+			}
 			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
 			$result['aircrafttype_code'] = $aircraftType;
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+			if ($aircraftType == 0) {
+				$result['aircrafttype'] = "UNKNOWN";
+			} elseif ($aircraftType == 1) {
+				$result['aircrafttype'] = "GLIDER";
+			} elseif ($aircraftType == 2) {
+				$result['aircrafttype'] = "TOW_PLANE";
+			} elseif ($aircraftType == 3) {
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+			} elseif ($aircraftType == 4) {
+				$result['aircrafttype'] = "PARACHUTE";
+			} elseif ($aircraftType == 5) {
+				$result['aircrafttype'] = "DROP_PLANE";
+			} elseif ($aircraftType == 6) {
+				$result['aircrafttype'] = "HANG_GLIDER";
+			} elseif ($aircraftType == 7) {
+				$result['aircrafttype'] = "PARA_GLIDER";
+			} elseif ($aircraftType == 8) {
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
+			} elseif ($aircraftType == 9) {
+				$result['aircrafttype'] = "JET_AIRCRAFT";
+			} elseif ($aircraftType == 10) {
+				$result['aircrafttype'] = "UFO";
+			} elseif ($aircraftType == 11) {
+				$result['aircrafttype'] = "BALLOON";
+			} elseif ($aircraftType == 12) {
+				$result['aircrafttype'] = "AIRSHIP";
+			} elseif ($aircraftType == 13) {
+				$result['aircrafttype'] = "UAV";
+			} elseif ($aircraftType == 15) {
+				$result['aircrafttype'] = "STATIC_OBJECT";
+			}
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
@@ -517,79 +573,183 @@ 
 		    //g012t088r000p000P000h38b10110
 		    //g011t086r000p000P000h29b10198
 		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[5] != '...') {
+				$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+			}
+			if ($matches[6] != '...') {
+				$result['humidity'] = intval($matches[6]);
+			}
+			if ($matches[7] != '...') {
+				$result['pressure'] = round((intval($matches[7])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[5] != '...') {
+				$result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[6] != '...') {
+				$result['humidity'] = intval($matches[6]);
+			}
+			if ($matches[7] != '...') {
+				$result['pressure'] = round((intval($matches[7])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[5] != '...') {
+				$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+			}
+			if ($matches[7] != '...') {
+				$result['humidity'] = intval($matches[7]);
+			}
+			if ($matches[6] != '...') {
+				$result['pressure'] = round((intval($matches[6])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[6] != '...') {
+				$result['humidity'] = intval($matches[6]);
+			}
+			if ($matches[5] != '...') {
+				$result['pressure'] = round((intval($matches[5])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[6] != '...') {
+				$result['humidity'] = intval($matches[6]);
+			}
+			if ($matches[5] != '...') {
+				$result['pressure'] = round((intval($matches[5])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+			}
+			if ($matches[5] != '...') {
+				$result['humidity'] = intval($matches[5]);
+			}
+			if ($matches[6] != '...') {
+				$result['pressure'] = round((intval($matches[6])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[2] != '...') {
+				$result['humidity'] = intval($matches[3]);
+			}
+			if ($matches[4] != '...') {
+				$result['pressure'] = round((intval($matches[4])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+			if ($matches[1] != '...') {
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
+			}
+			if ($matches[2] != '...') {
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+			}
+			if ($matches[3] != '...') {
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+			}
+			if ($matches[4] != '...') {
+				$result['humidity'] = intval($matches[4]);
+			}
+			if ($matches[5] != '...') {
+				$result['pressure'] = round((intval($matches[5])/10),1);
+			}
 		        $body_parse = substr($body_parse,strlen($matches[0]));
 		    }
 		    $result['comment'] = trim($body_parse);
 		}
-		} else $result['comment'] = trim($body_parse);
+		} else {
+			$result['comment'] = trim($body_parse);
+		}
 
 	    }
 	//}
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
-	if ($debug) print_r($result);
+	if (isset($result['latitude'])) {
+		$result['latitude'] = round($result['latitude'],4);
+	}
+	if (isset($result['longitude'])) {
+		$result['longitude'] = round($result['longitude'],4);
+	}
+	if ($debug) {
+		print_r($result);
+	}
 	return $result;
     }
     
@@ -598,12 +758,21 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalServerAPRSssid)) {
+		$aprs_ssid = $globalServerAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalServerAPRSpass)) {
+		$aprs_pass = $globalServerAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 	
 	$aprs_filter  = '';
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
@@ -636,10 +805,14 @@ 
     
     public function send($data) {
 	global $globalDebug;
-	if ($this->connected === false) $this->connect();
+	if ($this->connected === false) {
+		$this->connect();
+	}
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) {
-		if ($globalDebug) echo 'Reconnect...';
+		if ($globalDebug) {
+			echo 'Reconnect...';
+		}
 		socket_close($this->socket);
 		$this->connect();
 	}
@@ -661,22 +834,32 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($squawk != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SQ='.$squawk;
 			}
 			if ($verticalrate != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'VR='.$verticalrate;
 			}
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AI='.$aircraft_icao;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			/*
 			// Use AMSL altitude
 			$GeoidClass = new GeoidHeight();
@@ -700,30 +883,44 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.str_replace(' ','_',$ident);
 			}
 			if ($typeid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'TI='.$typeid;
 			}
 			if ($statusid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SI='.$statusid;
 			}
 			if ($imo != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'IMO='.$imo;
 			}
 			if ($arrival_date != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AD='.strtotime($arrival_date);
 			}
 			if ($arrival_code != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$altitude = 0;
 			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}

require/class.Translation.php

Braces +20 added lines, -7 removed lines

@@ -28,16 +28,25 @@ 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
 				//$airline_icao = substr($ident, 0, 3);
 				return $ident;
-			} else return $ident;
-		} else return $ident;
+			} else {
+				return $ident;
+			}
+		} else {
+			return $ident;
+		}
 		if ($airline_icao == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -55,7 +64,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['operator_correct'];
-		} else return $ident;
+		} else {
+			return $ident;
+		}
 	}
 
 	public function addOperator($ident,$correct_ident,$source) {
@@ -84,7 +95,9 @@ 
 		global $globalTranslationSources, $globalTranslationFetch;
 		//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
 		$globalTranslationSources = array();
-		if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+		if (!isset($globalTranslationFetch)) {
+			$globalTranslationFetch = TRUE;
+		}
 		//echo "Check Translation for ".$ident."...";
 		$correct = $this->getOperator($ident);
 		if ($correct != '' && $correct != $ident) {

require/class.SpotterServer.php

Braces +72 added lines, -25 removed lines

@@ -36,79 +36,126 @@
 					$data['hex'] = trim($line['hex']);
 					if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 						$data['datetime'] = $line['datetime'];
-					} else $data['datetime'] = date('Y-m-d H:i:s');
+					} else {
+						$data['datetime'] = date('Y-m-d H:i:s');
+					}
 					if (!isset($line['aircraft_icao'])) {
 						$Spotter = new Spotter();
 						$aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
 						$Spotter->db = null;
 						if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-							if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-							elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-							elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-							elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+							if ($line['aircraft_type'] == 'PARA_GLIDER') {
+								$aircraft_icao = 'GLID';
+							} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+								$aircraft_icao = 'UHEL';
+							} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+								$aircraft_icao = 'TOWPLANE';
+							} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+								$aircraft_icao = 'POWAIRC';
+							}
 						}
 						$data['aircraft_icao'] = $aircraft_icao;
-					} else $data['aircraft_icao'] = $line['aircraft_icao'];
+					} else {
+						$data['aircraft_icao'] = $line['aircraft_icao'];
+					}
 					//if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 				}
 				if (isset($line['registration']) && $line['registration'] != '') {
 					$data['registration'] = $line['registration'];
-				} else $data['registration'] = null;
+				} else {
+					$data['registration'] = null;
+				}
 				if (isset($line['waypoints']) && $line['waypoints'] != '') {
 					$data['waypoints'] = $line['waypoints'];
-				} else $data['waypoints'] = null;
+				} else {
+					$data['waypoints'] = null;
+				}
 				if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
 					$data['ident'] = trim($line['ident']);
-				} else $data['ident'] = null;
+				} else {
+					$data['ident'] = null;
+				}
 				if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
 					if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 						$data['latitude'] = $line['latitude'];
-					} else $data['latitude'] = null;
+					} else {
+						$data['latitude'] = null;
+					}
 					if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-						if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+						if ($line['longitude'] > 180) {
+							$line['longitude'] = $line['longitude'] - 360;
+						}
 						$data['longitude'] = $line['longitude'];
-					} else $data['longitude'] = null;
+					} else {
+						$data['longitude'] = null;
+					}
 				} else {
 					$data['latitude'] = null;
 					$data['longitude'] = null;
 				}
 				if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
 					$data['verticalrate'] = $line['verticalrate'];
-				} else $data['verticalrate'] = null;
+				} else {
+					$data['verticalrate'] = null;
+				}
 				if (isset($line['emergency']) && $line['emergency'] != '') {
 					$data['emergency'] = $line['emergency'];
-				} else $data['emergency'] = null;
+				} else {
+					$data['emergency'] = null;
+				}
 				if (isset($line['ground']) && $line['ground'] != '') {
 					$data['ground'] = $line['ground'];
-				} else $data['ground'] = null;
+				} else {
+					$data['ground'] = null;
+				}
 				if (isset($line['speed']) && $line['speed'] != '') {
 					$data['speed'] = round($line['speed']);
-				} else $data['speed'] = null;
+				} else {
+					$data['speed'] = null;
+				}
 				if (isset($line['squawk']) && $line['squawk'] != '') {
 					$data['squawk'] = $line['squawk'];
-				} else $data['squawk'] = null;
+				} else {
+					$data['squawk'] = null;
+				}
 				if (isset($line['altitude']) && $line['altitude'] != '') {
 					$data['altitude'] = round($line['altitude']);
-		  		} else $data['altitude'] = null;
+		  		} else {
+		  			$data['altitude'] = null;
+		  		}
 				if (isset($line['heading']) && $line['heading'] != '') {
 					$data['heading'] = round($line['heading']);
-		 		} else $data['heading'] = null;
+		 		} else {
+		 			$data['heading'] = null;
+		 		}
 				if (isset($line['source_name']) && $line['source_name'] != '') {
 					$data['source_name'] = $line['source_name'];
-				} else $data['source_name'] = null;
+				} else {
+					$data['source_name'] = null;
+				}
 				if (isset($line['over_country']) && $line['over_country'] != '') {
 					$data['over_country'] = $line['over_country'];
-		 		} else $data['over_country'] = null;
+		 		} else {
+		 			$data['over_country'] = null;
+		 		}
 				if (isset($line['noarchive']) && $line['noarchive']) {
 					$data['noarchive'] = true;
-				} else $data['noarchive'] = false;
+				} else {
+					$data['noarchive'] = false;
+				}
 				$data['format_source'] = $line['format_source'];
-				if (isset($line['id_source'])) $id_source = $line['id_source'];
+				if (isset($line['id_source'])) {
+					$id_source = $line['id_source'];
+				}
 				if (isset($data['hex'])) {
 					echo '.';
 					$id_user = $globalServerUserID;
-					if ($id_user == NULL) $id_user = 1;
-					if (!isset($id_source)) $id_source = 1;
+					if ($id_user == NULL) {
+						$id_user = 1;
+					}
+					if (!isset($id_source)) {
+						$id_source = 1;
+					}
 					$query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
 					$query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
 					try {

search-json.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 
 header('Content-Type: application/json');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

search-php.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 
 header("Content-type: text/plain");
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

search-georss.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -70,8 +78,11 @@ 
 
 $date = date("c", time());
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

search-rss.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit'])) {
@@ -47,7 +55,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 header('Content-Type: application/rss+xml; charset=utf-8');
 
 $date = date("D, d M Y H:i:s T", time());
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

search-wkt.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit'])) {
@@ -47,7 +55,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -65,8 +73,11 @@ 
 
 header("Content-type: text/csv");
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);