Completed
Push — master ( cf2135...b184e5 )
by Yannick
28:22
created
scripts/daemon-spotter.php 1 patch
Spacing   +183 added lines, -183 removed lines patch added patch discarded remove patch
@@ -50,20 +50,20 @@  discard block
 block discarded – undo
50 50
 	    die;
51 51
 	}
52 52
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
53
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
53
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
54 54
     }
55 55
 }
56 56
 
57
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
57
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
58 58
 //if (isset($options['s'])) $hosts = array($options['s']);
59 59
 //elseif (isset($options['source'])) $hosts = array($options['source']);
60 60
 if (isset($options['s'])) {
61 61
     $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
62
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
63 63
     else $globalSources[] = array('host' => $options['s']);
64 64
 } elseif (isset($options['source'])) {
65 65
     $globalSources = array();
66
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
66
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
67 67
     else $globalSources[] = array('host' => $options['source']);
68 68
 }
69 69
 if (isset($options['aprsserverhost'])) {
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
 else $id_source = 1;
105 105
 if (isset($globalServer) && $globalServer) {
106 106
     if ($globalDebug) echo "Using Server Mode\n";
107
-    $SI=new SpotterServer();
107
+    $SI = new SpotterServer();
108 108
 /*
109 109
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
110 110
     $SI = new adsb2aprs();
111 111
     $SI->connect();
112 112
 */
113
-} else $SI=new SpotterImport($Connection->db);
113
+} else $SI = new SpotterImport($Connection->db);
114 114
 
115 115
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
116 116
 if (isset($globalMarine) && $globalMarine) {
@@ -124,17 +124,17 @@  discard block
 block discarded – undo
124 124
     $MI = new MarineImport($Connection->db);
125 125
 }
126 126
 //$APRS=new APRS($Connection->db);
127
-$SBS=new SBS();
127
+$SBS = new SBS();
128 128
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
129
-	$ACARS=new ACARS($Connection->db,true);
130
-	$Source=new Source($Connection->db);
129
+	$ACARS = new ACARS($Connection->db, true);
130
+	$Source = new Source($Connection->db);
131 131
 }
132
-$Common=new Common();
132
+$Common = new Common();
133 133
 date_default_timezone_set('UTC');
134 134
 //$servertz = system('date +%Z');
135 135
 // signal handler - playing nice with sockets and dump1090
136 136
 if (function_exists('pcntl_fork')) {
137
-    pcntl_signal(SIGINT,  function() {
137
+    pcntl_signal(SIGINT, function() {
138 138
         global $sockets;
139 139
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
140 140
         die("Bye!\n");
@@ -150,30 +150,30 @@  discard block
 block discarded – undo
150 150
 
151 151
 function connect_all($hosts) {
152 152
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
153
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
153
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
154 154
     $reset++;
155 155
     if ($globalDebug) echo 'Connect to all...'."\n";
156 156
     foreach ($hosts as $id => $value) {
157 157
 	$host = $value['host'];
158 158
 	$globalSources[$id]['last_exec'] = 0;
159 159
 	// Here we check type of source(s)
160
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
161
-            if (preg_match('/deltadb.txt$/i',$host)) {
160
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
161
+            if (preg_match('/deltadb.txt$/i', $host)) {
162 162
         	//$formats[$id] = 'deltadbtxt';
163 163
         	$globalSources[$id]['format'] = 'deltadbtxt';
164 164
         	//$last_exec['deltadbtxt'] = 0;
165 165
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
166
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
166
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
167 167
         	//$formats[$id] = 'vatsimtxt';
168 168
         	$globalSources[$id]['format'] = 'vatsimtxt';
169 169
         	//$last_exec['vatsimtxt'] = 0;
170 170
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
171
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
171
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
172 172
         	//$formats[$id] = 'aircraftlistjson';
173 173
         	$globalSources[$id]['format'] = 'aircraftlistjson';
174 174
         	//$last_exec['aircraftlistjson'] = 0;
175 175
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
176
-    	    } else if (preg_match('/opensky/i',$host)) {
176
+    	    } else if (preg_match('/opensky/i', $host)) {
177 177
         	//$formats[$id] = 'aircraftlistjson';
178 178
         	$globalSources[$id]['format'] = 'opensky';
179 179
         	//$last_exec['aircraftlistjson'] = 0;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
         	    exit(0);
191 191
         	}
192 192
     	    */
193
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
193
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
194 194
         	//$formats[$id] = 'planeupdatefaa';
195 195
         	$globalSources[$id]['format'] = 'planeupdatefaa';
196 196
         	//$last_exec['planeupdatefaa'] = 0;
@@ -199,32 +199,32 @@  discard block
 block discarded – undo
199 199
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
200 200
         	    exit(0);
201 201
         	}
202
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
202
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
203 203
         	//$formats[$id] = 'phpvmacars';
204 204
         	$globalSources[$id]['format'] = 'phpvmacars';
205 205
         	//$last_exec['phpvmacars'] = 0;
206 206
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
207
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
207
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
208 208
         	//$formats[$id] = 'phpvmacars';
209 209
         	$globalSources[$id]['format'] = 'vam';
210 210
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
211
-            } else if (preg_match('/whazzup/i',$host)) {
211
+            } else if (preg_match('/whazzup/i', $host)) {
212 212
         	//$formats[$id] = 'whazzup';
213 213
         	$globalSources[$id]['format'] = 'whazzup';
214 214
         	//$last_exec['whazzup'] = 0;
215 215
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
216
-            } else if (preg_match('/blitzortung/i',$host)) {
216
+            } else if (preg_match('/blitzortung/i', $host)) {
217 217
         	$globalSources[$id]['format'] = 'blitzortung';
218 218
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
219
-            } else if (preg_match('/airwhere/i',$host)) {
219
+            } else if (preg_match('/airwhere/i', $host)) {
220 220
         	$globalSources[$id]['format'] = 'airwhere';
221 221
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
222
-            } else if (preg_match('/recentpireps/i',$host)) {
222
+            } else if (preg_match('/recentpireps/i', $host)) {
223 223
         	//$formats[$id] = 'pirepsjson';
224 224
         	$globalSources[$id]['format'] = 'pirepsjson';
225 225
         	//$last_exec['pirepsjson'] = 0;
226 226
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
227
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
227
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
228 228
         	//$formats[$id] = 'fr24json';
229 229
         	$globalSources[$id]['format'] = 'fr24json';
230 230
         	//$last_exec['fr24json'] = 0;
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
234 234
         	    exit(0);
235 235
         	}
236
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
236
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
237 237
         	//$formats[$id] = 'fr24json';
238 238
         	$globalSources[$id]['format'] = 'myshiptracking';
239 239
         	//$last_exec['fr24json'] = 0;
@@ -243,21 +243,21 @@  discard block
 block discarded – undo
243 243
         	    exit(0);
244 244
         	}
245 245
             //} else if (preg_match('/10001/',$host)) {
246
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
246
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
247 247
         	//$formats[$id] = 'tsv';
248 248
         	$globalSources[$id]['format'] = 'tsv';
249 249
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
250 250
             }
251
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
251
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
252 252
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
253
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
253
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
254 254
     		    if ($idf !== false) {
255 255
     			$httpfeeds[$id] = $idf;
256 256
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
257 257
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
258 258
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
259
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
260
-	    $hostport = explode(':',$host);
259
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
260
+	    $hostport = explode(':', $host);
261 261
 	    if (isset($hostport[1])) {
262 262
 		$port = $hostport[1];
263 263
 		$hostn = $hostport[0];
@@ -267,19 +267,19 @@  discard block
 block discarded – undo
267 267
 	    }
268 268
 	    $Common = new Common();
269 269
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
270
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
270
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
271 271
     	    } else {
272
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
272
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
273 273
 	    }
274 274
 	    if ($s) {
275 275
     	        $sockets[$id] = $s;
276 276
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
277
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
277
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
278 278
 			//$formats[$id] = 'aprs';
279 279
 			$globalSources[$id]['format'] = 'aprs';
280 280
 			//$aprs_connect = 0;
281 281
 			//$use_aprs = true;
282
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
282
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
283 283
 			$globalSources[$id]['format'] = 'vrstcp';
284 284
     		    } elseif ($port == '10001') {
285 285
         		//$formats[$id] = 'tsv';
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
319 319
 else $timeout = 20;
320 320
 $errno = '';
321
-$errstr='';
321
+$errstr = '';
322 322
 
323 323
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
324 324
 /* Initiate connections to all the hosts simultaneously */
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 //connect_all($globalSources);
327 327
 
328 328
 if (isset($globalProxy) && $globalProxy) {
329
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
329
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
330 330
 } else {
331 331
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
332 332
 }
@@ -356,16 +356,16 @@  discard block
 block discarded – undo
356 356
 
357 357
 if ($use_aprs) {
358 358
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
359
-	$APRS=new APRS();
359
+	$APRS = new APRS();
360 360
 	$aprs_connect = 0;
361 361
 	$aprs_keep = 120;
362 362
 	$aprs_last_tx = time();
363 363
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
364
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
364
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
365 365
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
366
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
366
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
367 367
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
368
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
368
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
369 369
 	if ($aprs_full) $aprs_filter = '';
370 370
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
371 371
 	else $aprs_pass = '-1';
@@ -379,12 +379,12 @@  discard block
 block discarded – undo
379 379
 sleep(1);
380 380
 if ($globalDebug) echo "SCAN MODE \n\n";
381 381
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
382
-$endtime = time()+$globalCronEnd;
382
+$endtime = time() + $globalCronEnd;
383 383
 $i = 1;
384 384
 $tt = array();
385 385
 // Delete all ATC
386 386
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
387
-	$ATC=new ATC($Connection->db);
387
+	$ATC = new ATC($Connection->db);
388 388
 }
389 389
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
390 390
 	$ATC->deleteAll();
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 
393 393
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
394 394
 while ($i > 0) {
395
-    if (!$globalDaemon) $i = $endtime-time();
395
+    if (!$globalDaemon) $i = $endtime - time();
396 396
     // Delete old ATC
397 397
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
398 398
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 	}
407 407
 	if ($max != $globalMinFetch) {
408 408
 	    if ($globalDebug) echo 'Sleeping...'."\n";
409
-	    sleep($globalMinFetch-$max+2);
409
+	    sleep($globalMinFetch - $max + 2);
410 410
 	}
411 411
     }
412 412
 
@@ -425,8 +425,8 @@  discard block
 block discarded – undo
425 425
 	    //$buffer = $Common->getData($hosts[$id]);
426 426
 	    $buffer = $Common->getData($value['host']);
427 427
 	    if ($buffer != '') $reset = 0;
428
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
429
-	    $buffer = explode('\n',$buffer);
428
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
429
+	    $buffer = explode('\n', $buffer);
430 430
 	    foreach ($buffer as $line) {
431 431
     		if ($line != '' && count($line) > 7) {
432 432
     		    $line = explode(',', $line);
@@ -459,11 +459,11 @@  discard block
 block discarded – undo
459 459
 	    )
460 460
 	) {
461 461
 	    date_default_timezone_set('CET');
462
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
462
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
463 463
 	    date_default_timezone_set('UTC');
464 464
 	    if ($buffer != '') $reset = 0;
465
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
466
-	    $buffer = explode('\n',$buffer);
465
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
466
+	    $buffer = explode('\n', $buffer);
467 467
 	    foreach ($buffer as $line) {
468 468
 		if ($line != '') {
469 469
 		    //echo "'".$line."'\n";
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
482 482
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
483 483
 		    if (isset($ais_data['timestamp'])) {
484
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
484
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
485 485
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
486 486
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
487 487
 			    $add = true;
@@ -504,15 +504,15 @@  discard block
 block discarded – undo
504 504
 	    $w = $e = null;
505 505
 	    
506 506
 	    if (isset($arr[$id])) {
507
-		$nn = stream_select($arr,$w,$e,$timeout);
507
+		$nn = stream_select($arr, $w, $e, $timeout);
508 508
 		if ($nn > 0) {
509 509
 		    foreach ($httpfeeds as $feed) {
510
-			$buffer = stream_get_line($feed,2000,"\n");
510
+			$buffer = stream_get_line($feed, 2000, "\n");
511 511
 			if ($buffer === FALSE) {
512 512
 			    connect_all($globalSources);
513 513
 			}
514
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
515
-			$buffer = explode('\n',$buffer);
514
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
515
+			$buffer = explode('\n', $buffer);
516 516
 			foreach ($buffer as $line) {
517 517
 			    if ($line != '') {
518 518
 				$ais_data = $AIS->parse_line(trim($line));
@@ -530,9 +530,9 @@  discard block
 block discarded – undo
530 530
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
531 531
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
532 532
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
533
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
533
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
534 534
 				if (isset($ais_data['timestamp'])) {
535
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
535
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
536 536
 				} else {
537 537
 				    $data['datetime'] = date('Y-m-d H:i:s');
538 538
 				}
@@ -564,10 +564,10 @@  discard block
 block discarded – undo
564 564
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
565 565
 	    )
566 566
 	) {
567
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
567
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
568 568
 	    if ($buffer != '') {
569 569
 		//echo $buffer;
570
-		$all_data = json_decode($buffer,true);
570
+		$all_data = json_decode($buffer, true);
571 571
 		//print_r($all_data);
572 572
 		if (isset($all_data[0]['DATA'])) {
573 573
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
 			    $data['ident'] = $line['NAME'];
577 577
 			    $data['mmsi'] = $line['MMSI'];
578 578
 			    if (strlen($data['mmsi']) > 9) {
579
-				$data['mmsi'] = substr($data['mmsi'],-9);
579
+				$data['mmsi'] = substr($data['mmsi'], -9);
580 580
 			    }
581 581
 			    $data['speed'] = $line['SOG'];
582 582
 			    $data['heading'] = $line['COG'];
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
586 586
 			    $data['imo'] = $line['IMO'];
587 587
 			    //$data['arrival_code'] = $ais_data['destination'];
588
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
588
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
589 589
 			    $data['format_source'] = 'myshiptracking';
590 590
 			    $data['id_source'] = $id_source;
591 591
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -602,9 +602,9 @@  discard block
 block discarded – undo
602 602
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
603 603
 	    )
604 604
 	) {
605
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
605
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
606 606
 	    if ($buffer != '') {
607
-		$all_data = json_decode($buffer,true);
607
+		$all_data = json_decode($buffer, true);
608 608
 		if (isset($all_data[0]['mmsi'])) {
609 609
 		    foreach ($all_data as $line) {
610 610
 			if ($line != '') {
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 	) {
639 639
 	    $buffer = $Common->getData($value['host']);
640 640
 	    if ($buffer != '') {
641
-		$all_data = json_decode($buffer,true);
641
+		$all_data = json_decode($buffer, true);
642 642
 		if (isset($all_data['features'][0]['id'])) {
643 643
 		    foreach ($all_data['features'] as $line) {
644 644
 			$data = array();
@@ -671,27 +671,27 @@  discard block
 block discarded – undo
671 671
 	    )
672 672
 	) {
673 673
 	    echo 'download...';
674
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
674
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
675 675
 	    echo 'done !'."\n";
676 676
 	    if ($buffer != '') $reset = 0;
677
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
678
-	    $buffer = explode('\n',$buffer);
677
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
678
+	    $buffer = explode('\n', $buffer);
679 679
 	    foreach ($buffer as $line) {
680 680
 		if ($line != '') {
681 681
 		    $data = array();
682
-		    $data['mmsi'] = (int)substr($line,0,9);
683
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
682
+		    $data['mmsi'] = (int) substr($line, 0, 9);
683
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
684 684
 		    //$data['status'] = substr($line,21,2);
685 685
 		    //$data['type'] = substr($line,24,3);
686
-		    $data['latitude'] = substr($line,29,9);
687
-		    $data['longitude'] = substr($line,41,9);
688
-		    $data['speed'] = round(substr($line,51,5));
686
+		    $data['latitude'] = substr($line, 29, 9);
687
+		    $data['longitude'] = substr($line, 41, 9);
688
+		    $data['speed'] = round(substr($line, 51, 5));
689 689
 		    //$data['course'] = substr($line,57,5);
690
-		    $data['heading'] = round(substr($line,63,3));
690
+		    $data['heading'] = round(substr($line, 63, 3));
691 691
 		    //$data['draft'] = substr($line,67,4);
692 692
 		    //$data['length'] = substr($line,72,3);
693 693
 		    //$data['beam'] = substr($line,76,2);
694
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
694
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
695 695
 		    //$data['callsign'] = trim(substr($line,100,7);
696 696
 		    //$data['dest'] = substr($line,108,20);
697 697
 		    //$data['etaDate'] = substr($line,129,5);
@@ -724,8 +724,8 @@  discard block
 block discarded – undo
724 724
 	) {
725 725
 	    //$buffer = $Common->getData($hosts[$id]);
726 726
 	    $buffer = $Common->getData($value['host']);
727
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
728
-	    $buffer = explode('\n',$buffer);
727
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
728
+	    $buffer = explode('\n', $buffer);
729 729
 	    $reset = 0;
730 730
 	    foreach ($buffer as $line) {
731 731
     		if ($line != '') {
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
736 736
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
737 737
 			$data['pilot_id'] = $line[1];
738 738
 			$data['pilot_name'] = $line[2];
739
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
739
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
740 740
 			$data['ident'] = $line[0]; // ident
741 741
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
742 742
 			$data['speed'] = $line[8]; // speed
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
753 753
 			//if (isset($line[37])) $data['last_update'] = $line[37];
754 754
 		        $data['departure_airport_icao'] = $line[11];
755
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
755
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
756 756
 		        $data['arrival_airport_icao'] = $line[13];
757 757
 			$data['frequency'] = $line[4];
758 758
 			$data['type'] = $line[18];
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
     			$data['id_source'] = $id_source;
762 762
 	    		//$data['arrival_airport_time'] = ;
763 763
 	    		if ($line[9] != '') {
764
-	    		    $aircraft_data = explode('/',$line[9]);
764
+	    		    $aircraft_data = explode('/', $line[9]);
765 765
 	    		    if (isset($aircraft_data[1])) {
766 766
 	    			$data['aircraft_icao'] = $aircraft_data[1];
767 767
 	    		    }
@@ -776,9 +776,9 @@  discard block
 block discarded – undo
776 776
     			if ($line[3] == 'PILOT') $SI->add($data);
777 777
 			elseif ($line[3] == 'ATC') {
778 778
 				//print_r($data);
779
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
780
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
781
-				$typec = substr($data['ident'],-3);
779
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
780
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
781
+				$typec = substr($data['ident'], -3);
782 782
 				if ($typec == 'APP') $data['type'] = 'Approach';
783 783
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
784 784
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -790,8 +790,8 @@  discard block
 block discarded – undo
790 790
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
791 791
 				if (!isset($data['source_name'])) $data['source_name'] = '';
792 792
 				if (isset($ATC)) {
793
-					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']);
794
-					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']);
793
+					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']);
794
+					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']);
795 795
 				}
796 796
 			}
797 797
     			unset($data);
@@ -807,24 +807,24 @@  discard block
 block discarded – undo
807 807
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
808 808
     	    )
809 809
     	) {
810
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
810
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
811 811
 	    if ($buffer != '') {
812 812
 		$all_data = simplexml_load_string($buffer);
813
-		foreach($all_data->children() as $childdata) {
813
+		foreach ($all_data->children() as $childdata) {
814 814
 			$data = array();
815 815
 			$line = $childdata;
816 816
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
817
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
818
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
819
-			$data['latitude'] = (float)$line['pktLatitude'];
820
-			$data['longitude'] = (float)$line['pktLongitude'];
821
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
822
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
823
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
817
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
818
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
819
+			$data['latitude'] = (float) $line['pktLatitude'];
820
+			$data['longitude'] = (float) $line['pktLongitude'];
821
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
822
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
823
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
824 824
 			$data['altitude_relative'] = 'AMSL';
825
-			$data['pilot_id'] = (int)$line['pktPilotID'];
825
+			$data['pilot_id'] = (int) $line['pktPilotID'];
826 826
 			$data['aircraft_icao'] = 'PARAGLIDER';
827
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
827
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
828 828
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
829 829
 			$data['format_source'] = $value['format'];
830 830
 			$SI->add($data);
@@ -832,22 +832,22 @@  discard block
 block discarded – undo
832 832
 		}
833 833
 	    }
834 834
 	    $Source->deleteOldLocationByType('gs');
835
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
835
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
836 836
 	    if ($buffer != '') {
837 837
 		$all_data = simplexml_load_string($buffer);
838
-		foreach($all_data->children() as $childdata) {
838
+		foreach ($all_data->children() as $childdata) {
839 839
 			$data = array();
840 840
 			$line = $childdata;
841
-			$data['id'] = (int)$line['gsID'];
842
-			$data['latitude'] = (float)$line['gsLatitude'];
843
-			$data['longitude'] = (float)$line['gsLongitude'];
844
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
841
+			$data['id'] = (int) $line['gsID'];
842
+			$data['latitude'] = (float) $line['gsLatitude'];
843
+			$data['longitude'] = (float) $line['gsLongitude'];
844
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
845 845
 			$data['altitude_relative'] = 'AMSL';
846
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
846
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
847 847
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
848
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
848
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
849 849
 			} else {
850
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
850
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
851 851
 			}
852 852
 			unset($data);
853 853
 		}
@@ -865,9 +865,9 @@  discard block
 block discarded – undo
865 865
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
866 866
 	    )
867 867
 	) {
868
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
868
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
869 869
 	    if ($buffer != '') {
870
-	        $all_data = json_decode($buffer,true);
870
+	        $all_data = json_decode($buffer, true);
871 871
 		if (isset($all_data['acList'])) {
872 872
 		    $reset = 0;
873 873
 		    foreach ($all_data['acList'] as $line) {
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
883 883
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
884 884
 			$data['emergency'] = ''; // emergency
885 885
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
886
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
886
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
887 887
 			else $data['datetime'] = date('Y-m-d H:i:s');
888 888
 			//$data['datetime'] = date('Y-m-d H:i:s');
889 889
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
 			$data['verticalrate'] = $line['vrt']; // verticale rate
909 909
 			$data['squawk'] = $line['squawk']; // squawk
910 910
 			$data['emergency'] = ''; // emergency
911
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
911
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
912 912
 			else $data['datetime'] = date('Y-m-d H:i:s');
913 913
 			$data['format_source'] = 'aircraftlistjson';
914 914
 			$data['id_source'] = $id_source;
@@ -929,7 +929,7 @@  discard block
 block discarded – undo
929 929
     	    )
930 930
     	) {
931 931
 	    $buffer = $Common->getData($value['host']);
932
-	    $all_data = json_decode($buffer,true);
932
+	    $all_data = json_decode($buffer, true);
933 933
 	    if (isset($all_data['planes'])) {
934 934
 		$reset = 0;
935 935
 		foreach ($all_data['planes'] as $key => $line) {
@@ -946,12 +946,12 @@  discard block
 block discarded – undo
946 946
 		    $data['emergency'] = ''; // emergency
947 947
 		    $data['registration'] = $line[2];
948 948
 		    $data['aircraft_icao'] = $line[0];
949
-		    $deparr = explode('-',$line[1]);
949
+		    $deparr = explode('-', $line[1]);
950 950
 		    if (count($deparr) == 2) {
951 951
 			$data['departure_airport_icao'] = $deparr[0];
952 952
 			$data['arrival_airport_icao'] = $deparr[1];
953 953
 		    }
954
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
954
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
955 955
 	    	    $data['format_source'] = 'planeupdatefaa';
956 956
     		    $data['id_source'] = $id_source;
957 957
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -969,7 +969,7 @@  discard block
 block discarded – undo
969 969
 	    )
970 970
 	) {
971 971
 	    $buffer = $Common->getData($value['host']);
972
-	    $all_data = json_decode($buffer,true);
972
+	    $all_data = json_decode($buffer, true);
973 973
 	    if (isset($all_data['states'])) {
974 974
 		$reset = 0;
975 975
 		foreach ($all_data['states'] as $key => $line) {
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
 		    //$data['emergency'] = ''; // emergency
987 987
 		    //$data['registration'] = $line[2];
988 988
 		    //$data['aircraft_icao'] = $line[0];
989
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
989
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
990 990
 		    $data['format_source'] = 'opensky';
991 991
 		    $data['id_source'] = $id_source;
992 992
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 	) {
1006 1006
 	    //$buffer = $Common->getData($hosts[$id]);
1007 1007
 	    $buffer = $Common->getData($value['host']);
1008
-	    $all_data = json_decode($buffer,true);
1008
+	    $all_data = json_decode($buffer, true);
1009 1009
 	    if (!empty($all_data)) $reset = 0;
1010 1010
 	    foreach ($all_data as $key => $line) {
1011 1011
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1043,11 +1043,11 @@  discard block
 block discarded – undo
1043 1043
 	    )
1044 1044
 	) {
1045 1045
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1046
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1046
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
1047 1047
 	    //echo $buffer;
1048
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1049
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1050
-	    $all_data = json_decode($buffer,true);
1048
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
1049
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
1050
+	    $all_data = json_decode($buffer, true);
1051 1051
 	    if (json_last_error() != JSON_ERROR_NONE) {
1052 1052
 		die(json_last_error_msg());
1053 1053
 	    }
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
1070 1070
 			//$data['departure_airport_iata'] = $line[11];
1071 1071
 			//$data['arrival_airport_iata'] = $line[12];
1072 1072
 	    		//$data['emergency'] = ''; // emergency
1073
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1073
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
1074 1074
 	    		$data['format_source'] = 'radarvirtueljson';
1075 1075
     			$data['id_source'] = $id_source;
1076 1076
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1091,14 +1091,14 @@  discard block
 block discarded – undo
1091 1091
 	) {
1092 1092
 	    //$buffer = $Common->getData($hosts[$id]);
1093 1093
 	    $buffer = $Common->getData($value['host'].'?'.time());
1094
-	    $all_data = json_decode(utf8_encode($buffer),true);
1094
+	    $all_data = json_decode(utf8_encode($buffer), true);
1095 1095
 	    
1096 1096
 	    if (isset($all_data['pireps'])) {
1097 1097
 		$reset = 0;
1098 1098
 	        foreach ($all_data['pireps'] as $line) {
1099 1099
 		    $data = array();
1100 1100
 		    $data['id'] = $line['id'];
1101
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1101
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
1102 1102
 		    $data['ident'] = $line['callsign']; // ident
1103 1103
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1104 1104
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1128,9 +1128,9 @@  discard block
 block discarded – undo
1128 1128
 			$SI->add($data);
1129 1129
 		    //    print_r($data);
1130 1130
     		    } elseif ($line['icon'] == 'ct') {
1131
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1132
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1133
-			$typec = substr($data['ident'],-3);
1131
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
1132
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
1133
+			$typec = substr($data['ident'], -3);
1134 1134
 			$data['type'] = '';
1135 1135
 			if ($typec == 'APP') $data['type'] = 'Approach';
1136 1136
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -1141,7 +1141,7 @@  discard block
 block discarded – undo
1141 1141
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
1142 1142
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
1143 1143
 			else $data['type'] = 'Observer';
1144
-			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']);
1144
+			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']);
1145 1145
 		    }
1146 1146
 		    unset($data);
1147 1147
 		}
@@ -1158,14 +1158,14 @@  discard block
 block discarded – undo
1158 1158
 	    //$buffer = $Common->getData($hosts[$id]);
1159 1159
 	    if ($globalDebug) echo 'Get Data...'."\n";
1160 1160
 	    $buffer = $Common->getData($value['host']);
1161
-	    $all_data = json_decode($buffer,true);
1161
+	    $all_data = json_decode($buffer, true);
1162 1162
 	    if ($buffer != '' && is_array($all_data)) {
1163 1163
 		$reset = 0;
1164 1164
 		foreach ($all_data as $line) {
1165 1165
 	    	    $data = array();
1166 1166
 	    	    //$data['id'] = $line['id']; // id not usable
1167 1167
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1168
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1168
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
1169 1169
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1170 1170
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1171 1171
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1180,7 +1180,7 @@  discard block
 block discarded – undo
1180 1180
 	    	    //$data['datetime'] = $line['lastupdate'];
1181 1181
 	    	    //$data['last_update'] = $line['lastupdate'];
1182 1182
 	    	    if (isset($value['timezone'])) {
1183
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1183
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
1184 1184
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1185 1185
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1186 1186
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1193,14 +1193,14 @@  discard block
 block discarded – undo
1193 1193
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1194 1194
 		    if (isset($line['aircraftname'])) {
1195 1195
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1196
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1197
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1196
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
1197
+	    		$aircraft_data = explode('-', $line['aircraftname']);
1198 1198
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1199 1199
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1200 1200
 	    		else {
1201
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1202
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1203
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1201
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
1202
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
1203
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
1204 1204
 	    		}
1205 1205
 	    	    }
1206 1206
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1225,14 +1225,14 @@  discard block
 block discarded – undo
1225 1225
 	    //$buffer = $Common->getData($hosts[$id]);
1226 1226
 	    if ($globalDebug) echo 'Get Data...'."\n";
1227 1227
 	    $buffer = $Common->getData($value['host']);
1228
-	    $all_data = json_decode($buffer,true);
1228
+	    $all_data = json_decode($buffer, true);
1229 1229
 	    if ($buffer != '' && is_array($all_data)) {
1230 1230
 		$reset = 0;
1231 1231
 		foreach ($all_data as $line) {
1232 1232
 	    	    $data = array();
1233 1233
 	    	    //$data['id'] = $line['id']; // id not usable
1234 1234
 	    	    $data['id'] = trim($line['flight_id']);
1235
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1235
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1236 1236
 	    	    $data['pilot_name'] = $line['pilot_name'];
1237 1237
 	    	    $data['pilot_id'] = $line['pilot_id'];
1238 1238
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1276,24 +1276,24 @@  discard block
 block discarded – undo
1276 1276
 	    //$buffer = $Common->getData($hosts[$id]);
1277 1277
 	    if ($globalDebug) echo 'Get Data...'."\n";
1278 1278
 	    $buffer = $Common->getData($value['host']);
1279
-	    $all_data = json_decode($buffer,true);
1279
+	    $all_data = json_decode($buffer, true);
1280 1280
 	    if ($buffer != '') {
1281 1281
 		$Source->deleteLocationBySource('blitzortung');
1282
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1283
-		$buffer = explode('\n',$buffer);
1282
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
1283
+		$buffer = explode('\n', $buffer);
1284 1284
 		foreach ($buffer as $buffer_line) {
1285
-		    $line = json_decode($buffer_line,true);
1285
+		    $line = json_decode($buffer_line, true);
1286 1286
 		    if (isset($line['time'])) {
1287 1287
 			$data = array();
1288 1288
 			$data['altitude'] = $line['alt']; // altitude
1289 1289
 			$data['latitude'] = $line['lat']; // lat
1290 1290
 			$data['longitude'] = $line['lon']; // long
1291
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
1291
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
1292 1292
 			$data['id_source'] = $id_source;
1293 1293
 			$data['format_source'] = 'blitzortung';
1294 1294
 			$SI->add($data);
1295 1295
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1296
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1296
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
1297 1297
 			unset($data);
1298 1298
 		    }
1299 1299
 		}
@@ -1318,11 +1318,11 @@  discard block
 block discarded – undo
1318 1318
 		    //$value = $formats[$nb];
1319 1319
 		    $format = $globalSources[$nb]['format'];
1320 1320
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1321
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1321
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1322 1322
 		    } elseif ($format == 'vrstcp') {
1323 1323
 			$buffer = @socket_read($r, 6000);
1324 1324
 		    } else {
1325
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1325
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1326 1326
 		    }
1327 1327
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1328 1328
 		    //echo $buffer."\n";
@@ -1332,8 +1332,8 @@  discard block
 block discarded – undo
1332 1332
 		    //$SI::del();
1333 1333
 		    if ($buffer !== FALSE) {
1334 1334
 			if ($format == 'vrstcp') {
1335
-			    $buffer = explode('},{',$buffer);
1336
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1335
+			    $buffer = explode('},{', $buffer);
1336
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1337 1337
 		    }
1338 1338
 		    // SBS format is CSV format
1339 1339
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1368,13 +1368,13 @@  discard block
 block discarded – undo
1368 1368
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1369 1369
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1370 1370
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1371
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1371
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1372 1372
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1373 1373
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1374 1374
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1375 1375
 
1376 1376
 			    if (isset($ais_data['timestamp'])) {
1377
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1377
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1378 1378
 			    } else {
1379 1379
 				$data['datetime'] = date('Y-m-d H:i:s');
1380 1380
 			    }
@@ -1385,10 +1385,10 @@  discard block
 block discarded – undo
1385 1385
                         } elseif ($format == 'flightgearsp') {
1386 1386
                     	    //echo $buffer."\n";
1387 1387
                     	    if (strlen($buffer) > 5) {
1388
-				$line = explode(',',$buffer);
1388
+				$line = explode(',', $buffer);
1389 1389
 				$data = array();
1390 1390
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1391
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1391
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1392 1392
 				$data['ident'] = $line[6];
1393 1393
 				$data['aircraft_name'] = $line[7];
1394 1394
 				$data['longitude'] = $line[1];
@@ -1405,16 +1405,16 @@  discard block
 block discarded – undo
1405 1405
                         } elseif ($format == 'acars') {
1406 1406
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1407 1407
 			    $ACARS->add(trim($buffer));
1408
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1408
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1409 1409
 			    $ACARS->deleteLiveAcarsData();
1410 1410
 			} elseif ($format == 'flightgearmp') {
1411
-			    if (substr($buffer,0,1) != '#') {
1411
+			    if (substr($buffer, 0, 1) != '#') {
1412 1412
 				$data = array();
1413 1413
 				//echo $buffer."\n";
1414
-				$line = explode(' ',$buffer);
1414
+				$line = explode(' ', $buffer);
1415 1415
 				if (count($line) == 11) {
1416
-				    $userserver = explode('@',$line[0]);
1417
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1416
+				    $userserver = explode('@', $line[0]);
1417
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1418 1418
 				    $data['ident'] = $userserver[0];
1419 1419
 				    $data['registration'] = $userserver[0];
1420 1420
 				    $data['latitude'] = $line[4];
@@ -1422,8 +1422,8 @@  discard block
 block discarded – undo
1422 1422
 				    $data['altitude'] = $line[6];
1423 1423
 				    $data['datetime'] = date('Y-m-d H:i:s');
1424 1424
 				    $aircraft_type = $line[10];
1425
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1426
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1425
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1426
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1427 1427
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1428 1428
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1429 1429
 				}
@@ -1432,8 +1432,8 @@  discard block
 block discarded – undo
1432 1432
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1433 1433
 			    die;
1434 1434
 			} elseif ($format == 'vrstcp') {
1435
-			    foreach($buffer as $all_data) {
1436
-				$line = json_decode('{'.$all_data.'}',true);
1435
+			    foreach ($buffer as $all_data) {
1436
+				$line = json_decode('{'.$all_data.'}', true);
1437 1437
 				$data = array();
1438 1438
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1439 1439
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1459,16 +1459,16 @@  discard block
 block discarded – undo
1459 1459
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1460 1460
 				unset($data);
1461 1461
 			    }
1462
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1462
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
1463 1463
 			    $line = explode("\t", $buffer);
1464
-			    for($k = 0; $k < count($line); $k=$k+2) {
1464
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1465 1465
 				$key = $line[$k];
1466
-			        $lined[$key] = $line[$k+1];
1466
+			        $lined[$key] = $line[$k + 1];
1467 1467
 			    }
1468 1468
     			    if (count($lined) > 3) {
1469 1469
     				$data['hex'] = $lined['hexid'];
1470 1470
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1471
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1471
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1472 1472
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1473 1473
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1474 1474
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1487,23 +1487,23 @@  discard block
 block discarded – undo
1487 1487
     			    } else $error = true;
1488 1488
 			} elseif ($format == 'aprs' && $use_aprs) {
1489 1489
 			    if ($aprs_connect == 0) {
1490
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1490
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1491 1491
 				$aprs_connect = 1;
1492 1492
 			    }
1493 1493
 			    
1494
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1494
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1495 1495
 				$aprs_last_tx = time();
1496 1496
 				$data_aprs = "# Keep alive";
1497
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1497
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1498 1498
 			    }
1499 1499
 			    
1500 1500
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1501 1501
 			    //echo 'APRS data : '.$buffer."\n";
1502
-			    $buffer = str_replace('APRS <- ','',$buffer);
1503
-			    $buffer = str_replace('APRS -> ','',$buffer);
1502
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1503
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1504 1504
 			    //echo $buffer."\n";
1505 1505
 			    date_default_timezone_set('UTC');
1506
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1506
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1507 1507
 				$line = $APRS->parse($buffer);
1508 1508
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1509 1509
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1518,7 +1518,7 @@  discard block
 block discarded – undo
1518 1518
 				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1519 1519
 				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1520 1520
 				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1521
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1521
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1522 1522
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1523 1523
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1524 1524
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1601,29 +1601,29 @@  discard block
 block discarded – undo
1601 1601
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1602 1602
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1603 1603
 					$Source->deleteOldLocationByType('gs');
1604
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1605
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1604
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
1605
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1606 1606
 					} else {
1607
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1607
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1608 1608
 					}
1609 1609
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1610 1610
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1611 1611
 					if ($globalDebug) echo '# Weather Station added'."\n";
1612 1612
 					$Source->deleteOldLocationByType('wx');
1613 1613
 					$weather_data = json_encode($line);
1614
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
1615
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1614
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
1615
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1616 1616
 					} else {
1617
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1617
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1618 1618
 					}
1619 1619
 				    } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) {
1620 1620
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1621 1621
 					if ($globalDebug) echo '☈ Lightning added'."\n";
1622 1622
 					$Source->deleteOldLocationByType('lightning');
1623
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
1624
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1623
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
1624
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1625 1625
 					} else {
1626
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1626
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1627 1627
 					}
1628 1628
 				    } elseif ($globalDebug) {
1629 1629
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1632,7 +1632,7 @@  discard block
 block discarded – undo
1632 1632
 				    unset($data);
1633 1633
 				}
1634 1634
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1635
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
1635
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
1636 1636
 				}
1637 1637
 				/*
1638 1638
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
@@ -1641,7 +1641,7 @@  discard block
 block discarded – undo
1641 1641
 				*/
1642 1642
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1643 1643
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1644
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
1644
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
1645 1645
 					$Source->deleteOldLocationByType('lightning');
1646 1646
 					$Source->deleteOldLocationByType('wx');
1647 1647
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1726,7 +1726,7 @@  discard block
 block discarded – undo
1726 1726
 				connect_all($sourceee);
1727 1727
 				$sourceee = array();
1728 1728
 				//connect_all($globalSources);
1729
-				$tt[$format]=0;
1729
+				$tt[$format] = 0;
1730 1730
 				break;
1731 1731
 			    } 
1732 1732
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -1736,14 +1736,14 @@  discard block
 block discarded – undo
1736 1736
 	    } else {
1737 1737
 		$error = socket_strerror(socket_last_error());
1738 1738
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1739
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1739
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1740 1740
 			if (isset($globalDebug)) echo "Restarting...\n";
1741 1741
 			// Restart the script if possible
1742 1742
 			if (is_array($sockets)) {
1743 1743
 			    if ($globalDebug) echo "Shutdown all sockets...";
1744 1744
 			    
1745 1745
 			    foreach ($sockets as $sock) {
1746
-				@socket_shutdown($sock,2);
1746
+				@socket_shutdown($sock, 2);
1747 1747
 				@socket_close($sock);
1748 1748
 			    }
1749 1749
 			    
Please login to merge, or discard this patch.