Completed
Push — master ( 8c94fe...9091ef )
by Yannick
34:02 queued 02:35
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,22 +243,22 @@  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
     		    }
258 258
     		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
259 259
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
260
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
261
-	    $hostport = explode(':',$host);
260
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
261
+	    $hostport = explode(':', $host);
262 262
 	    if (isset($hostport[1])) {
263 263
 		$port = $hostport[1];
264 264
 		$hostn = $hostport[0];
@@ -268,19 +268,19 @@  discard block
 block discarded – undo
268 268
 	    }
269 269
 	    $Common = new Common();
270 270
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
271
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
271
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
272 272
     	    } else {
273
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
273
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
274 274
 	    }
275 275
 	    if ($s) {
276 276
     	        $sockets[$id] = $s;
277 277
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
278
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
278
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
279 279
 			//$formats[$id] = 'aprs';
280 280
 			$globalSources[$id]['format'] = 'aprs';
281 281
 			//$aprs_connect = 0;
282 282
 			//$use_aprs = true;
283
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
283
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
284 284
 			$globalSources[$id]['format'] = 'vrstcp';
285 285
     		    } elseif ($port == '10001') {
286 286
         		//$formats[$id] = 'tsv';
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
320 320
 else $timeout = 20;
321 321
 $errno = '';
322
-$errstr='';
322
+$errstr = '';
323 323
 
324 324
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
325 325
 /* Initiate connections to all the hosts simultaneously */
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 //connect_all($globalSources);
328 328
 
329 329
 if (isset($globalProxy) && $globalProxy) {
330
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
330
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
331 331
 } else {
332 332
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
333 333
 }
@@ -357,16 +357,16 @@  discard block
 block discarded – undo
357 357
 
358 358
 if ($use_aprs) {
359 359
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
360
-	$APRS=new APRS();
360
+	$APRS = new APRS();
361 361
 	$aprs_connect = 0;
362 362
 	$aprs_keep = 120;
363 363
 	$aprs_last_tx = time();
364 364
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
365
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
365
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
366 366
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
367
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
367
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
368 368
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
369
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
369
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
370 370
 	if ($aprs_full) $aprs_filter = '';
371 371
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
372 372
 	else $aprs_pass = '-1';
@@ -380,12 +380,12 @@  discard block
 block discarded – undo
380 380
 sleep(1);
381 381
 if ($globalDebug) echo "SCAN MODE \n\n";
382 382
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
383
-$endtime = time()+$globalCronEnd;
383
+$endtime = time() + $globalCronEnd;
384 384
 $i = 1;
385 385
 $tt = array();
386 386
 // Delete all ATC
387 387
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
388
-	$ATC=new ATC($Connection->db);
388
+	$ATC = new ATC($Connection->db);
389 389
 }
390 390
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
391 391
 	$ATC->deleteAll();
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 
394 394
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
395 395
 while ($i > 0) {
396
-    if (!$globalDaemon) $i = $endtime-time();
396
+    if (!$globalDaemon) $i = $endtime - time();
397 397
     // Delete old ATC
398 398
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
399 399
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 	}
408 408
 	if ($max != $globalMinFetch) {
409 409
 	    if ($globalDebug) echo 'Sleeping...'."\n";
410
-	    sleep($globalMinFetch-$max+2);
410
+	    sleep($globalMinFetch - $max + 2);
411 411
 	}
412 412
     }
413 413
 
@@ -426,8 +426,8 @@  discard block
 block discarded – undo
426 426
 	    //$buffer = $Common->getData($hosts[$id]);
427 427
 	    $buffer = $Common->getData($value['host']);
428 428
 	    if ($buffer != '') $reset = 0;
429
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
430
-	    $buffer = explode('\n',$buffer);
429
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
430
+	    $buffer = explode('\n', $buffer);
431 431
 	    foreach ($buffer as $line) {
432 432
     		if ($line != '' && count($line) > 7) {
433 433
     		    $line = explode(',', $line);
@@ -460,11 +460,11 @@  discard block
 block discarded – undo
460 460
 	    )
461 461
 	) {
462 462
 	    date_default_timezone_set('CET');
463
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
463
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
464 464
 	    date_default_timezone_set('UTC');
465 465
 	    if ($buffer != '') $reset = 0;
466
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
467
-	    $buffer = explode('\n',$buffer);
466
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
467
+	    $buffer = explode('\n', $buffer);
468 468
 	    foreach ($buffer as $line) {
469 469
 		if ($line != '') {
470 470
 		    //echo "'".$line."'\n";
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
483 483
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
484 484
 		    if (isset($ais_data['timestamp'])) {
485
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
485
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
486 486
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
487 487
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
488 488
 			    $add = true;
@@ -505,12 +505,12 @@  discard block
 block discarded – undo
505 505
 	    $w = $e = null;
506 506
 	    
507 507
 	    if (isset($arr[$id])) {
508
-		$nn = stream_select($arr,$w,$e,$timeout);
508
+		$nn = stream_select($arr, $w, $e, $timeout);
509 509
 		if ($nn > 0) {
510 510
 		    foreach ($httpfeeds as $feed) {
511
-			$buffer = stream_get_line($feed,2000,"\n");
512
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
513
-			$buffer = explode('\n',$buffer);
511
+			$buffer = stream_get_line($feed, 2000, "\n");
512
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
513
+			$buffer = explode('\n', $buffer);
514 514
 			foreach ($buffer as $line) {
515 515
 			    if ($line != '') {
516 516
 				$ais_data = $AIS->parse_line(trim($line));
@@ -528,9 +528,9 @@  discard block
 block discarded – undo
528 528
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
529 529
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
530 530
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
531
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
531
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
532 532
 				if (isset($ais_data['timestamp'])) {
533
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
533
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
534 534
 				} else {
535 535
 				    $data['datetime'] = date('Y-m-d H:i:s');
536 536
 				}
@@ -561,10 +561,10 @@  discard block
 block discarded – undo
561 561
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
562 562
 	    )
563 563
 	) {
564
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
564
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
565 565
 	    if ($buffer != '') {
566 566
 		//echo $buffer;
567
-		$all_data = json_decode($buffer,true);
567
+		$all_data = json_decode($buffer, true);
568 568
 		//print_r($all_data);
569 569
 		if (isset($all_data[0]['DATA'])) {
570 570
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
 			    $data['ident'] = $line['NAME'];
574 574
 			    $data['mmsi'] = $line['MMSI'];
575 575
 			    if (strlen($data['mmsi']) > 9) {
576
-				$data['mmsi'] = substr($data['mmsi'],-9);
576
+				$data['mmsi'] = substr($data['mmsi'], -9);
577 577
 			    }
578 578
 			    $data['speed'] = $line['SOG'];
579 579
 			    $data['heading'] = $line['COG'];
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
583 583
 			    $data['imo'] = $line['IMO'];
584 584
 			    //$data['arrival_code'] = $ais_data['destination'];
585
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
585
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
586 586
 			    $data['format_source'] = 'myshiptracking';
587 587
 			    $data['id_source'] = $id_source;
588 588
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -599,9 +599,9 @@  discard block
 block discarded – undo
599 599
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
600 600
 	    )
601 601
 	) {
602
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
602
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
603 603
 	    if ($buffer != '') {
604
-		$all_data = json_decode($buffer,true);
604
+		$all_data = json_decode($buffer, true);
605 605
 		if (isset($all_data[0]['mmsi'])) {
606 606
 		    foreach ($all_data as $line) {
607 607
 			if ($line != '') {
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 	) {
636 636
 	    $buffer = $Common->getData($value['host']);
637 637
 	    if ($buffer != '') {
638
-		$all_data = json_decode($buffer,true);
638
+		$all_data = json_decode($buffer, true);
639 639
 		if (isset($all_data['features'][0]['id'])) {
640 640
 		    foreach ($all_data['features'] as $line) {
641 641
 			$data = array();
@@ -668,27 +668,27 @@  discard block
 block discarded – undo
668 668
 	    )
669 669
 	) {
670 670
 	    echo 'download...';
671
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
671
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
672 672
 	    echo 'done !'."\n";
673 673
 	    if ($buffer != '') $reset = 0;
674
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
675
-	    $buffer = explode('\n',$buffer);
674
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
675
+	    $buffer = explode('\n', $buffer);
676 676
 	    foreach ($buffer as $line) {
677 677
 		if ($line != '') {
678 678
 		    $data = array();
679
-		    $data['mmsi'] = (int)substr($line,0,9);
680
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
679
+		    $data['mmsi'] = (int) substr($line, 0, 9);
680
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
681 681
 		    //$data['status'] = substr($line,21,2);
682 682
 		    //$data['type'] = substr($line,24,3);
683
-		    $data['latitude'] = substr($line,29,9);
684
-		    $data['longitude'] = substr($line,41,9);
685
-		    $data['speed'] = round(substr($line,51,5));
683
+		    $data['latitude'] = substr($line, 29, 9);
684
+		    $data['longitude'] = substr($line, 41, 9);
685
+		    $data['speed'] = round(substr($line, 51, 5));
686 686
 		    //$data['course'] = substr($line,57,5);
687
-		    $data['heading'] = round(substr($line,63,3));
687
+		    $data['heading'] = round(substr($line, 63, 3));
688 688
 		    //$data['draft'] = substr($line,67,4);
689 689
 		    //$data['length'] = substr($line,72,3);
690 690
 		    //$data['beam'] = substr($line,76,2);
691
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
691
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
692 692
 		    //$data['callsign'] = trim(substr($line,100,7);
693 693
 		    //$data['dest'] = substr($line,108,20);
694 694
 		    //$data['etaDate'] = substr($line,129,5);
@@ -721,8 +721,8 @@  discard block
 block discarded – undo
721 721
 	) {
722 722
 	    //$buffer = $Common->getData($hosts[$id]);
723 723
 	    $buffer = $Common->getData($value['host']);
724
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
725
-	    $buffer = explode('\n',$buffer);
724
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
725
+	    $buffer = explode('\n', $buffer);
726 726
 	    $reset = 0;
727 727
 	    foreach ($buffer as $line) {
728 728
     		if ($line != '') {
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
734 734
 			$data['pilot_id'] = $line[1];
735 735
 			$data['pilot_name'] = $line[2];
736
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
736
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
737 737
 			$data['ident'] = $line[0]; // ident
738 738
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
739 739
 			$data['speed'] = $line[8]; // speed
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
750 750
 			//if (isset($line[37])) $data['last_update'] = $line[37];
751 751
 		        $data['departure_airport_icao'] = $line[11];
752
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
752
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
753 753
 		        $data['arrival_airport_icao'] = $line[13];
754 754
 			$data['frequency'] = $line[4];
755 755
 			$data['type'] = $line[18];
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
     			$data['id_source'] = $id_source;
759 759
 	    		//$data['arrival_airport_time'] = ;
760 760
 	    		if ($line[9] != '') {
761
-	    		    $aircraft_data = explode('/',$line[9]);
761
+	    		    $aircraft_data = explode('/', $line[9]);
762 762
 	    		    if (isset($aircraft_data[1])) {
763 763
 	    			$data['aircraft_icao'] = $aircraft_data[1];
764 764
 	    		    }
@@ -773,9 +773,9 @@  discard block
 block discarded – undo
773 773
     			if ($line[3] == 'PILOT') $SI->add($data);
774 774
 			elseif ($line[3] == 'ATC') {
775 775
 				//print_r($data);
776
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
777
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
778
-				$typec = substr($data['ident'],-3);
776
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
777
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
778
+				$typec = substr($data['ident'], -3);
779 779
 				if ($typec == 'APP') $data['type'] = 'Approach';
780 780
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
781 781
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -787,8 +787,8 @@  discard block
 block discarded – undo
787 787
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
788 788
 				if (!isset($data['source_name'])) $data['source_name'] = '';
789 789
 				if (isset($ATC)) {
790
-					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']);
791
-					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']);
790
+					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']);
791
+					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']);
792 792
 				}
793 793
 			}
794 794
     			unset($data);
@@ -804,24 +804,24 @@  discard block
 block discarded – undo
804 804
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
805 805
     	    )
806 806
     	) {
807
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
807
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
808 808
 	    if ($buffer != '') {
809 809
 		$all_data = simplexml_load_string($buffer);
810
-		foreach($all_data->children() as $childdata) {
810
+		foreach ($all_data->children() as $childdata) {
811 811
 			$data = array();
812 812
 			$line = $childdata;
813 813
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
814
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
815
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
816
-			$data['latitude'] = (float)$line['pktLatitude'];
817
-			$data['longitude'] = (float)$line['pktLongitude'];
818
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
819
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
820
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
814
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
815
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
816
+			$data['latitude'] = (float) $line['pktLatitude'];
817
+			$data['longitude'] = (float) $line['pktLongitude'];
818
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
819
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
820
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
821 821
 			$data['altitude_relative'] = 'AMSL';
822
-			$data['pilot_id'] = (int)$line['pktPilotID'];
822
+			$data['pilot_id'] = (int) $line['pktPilotID'];
823 823
 			$data['aircraft_icao'] = 'PARAGLIDER';
824
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
824
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
825 825
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
826 826
 			$data['format_source'] = $value['format'];
827 827
 			$SI->add($data);
@@ -829,22 +829,22 @@  discard block
 block discarded – undo
829 829
 		}
830 830
 	    }
831 831
 	    $Source->deleteOldLocationByType('gs');
832
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
832
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
833 833
 	    if ($buffer != '') {
834 834
 		$all_data = simplexml_load_string($buffer);
835
-		foreach($all_data->children() as $childdata) {
835
+		foreach ($all_data->children() as $childdata) {
836 836
 			$data = array();
837 837
 			$line = $childdata;
838
-			$data['id'] = (int)$line['gsID'];
839
-			$data['latitude'] = (float)$line['gsLatitude'];
840
-			$data['longitude'] = (float)$line['gsLongitude'];
841
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
838
+			$data['id'] = (int) $line['gsID'];
839
+			$data['latitude'] = (float) $line['gsLatitude'];
840
+			$data['longitude'] = (float) $line['gsLongitude'];
841
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
842 842
 			$data['altitude_relative'] = 'AMSL';
843
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
843
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
844 844
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
845
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
845
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
846 846
 			} else {
847
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
847
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
848 848
 			}
849 849
 			unset($data);
850 850
 		}
@@ -862,9 +862,9 @@  discard block
 block discarded – undo
862 862
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
863 863
 	    )
864 864
 	) {
865
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
865
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
866 866
 	    if ($buffer != '') {
867
-	        $all_data = json_decode($buffer,true);
867
+	        $all_data = json_decode($buffer, true);
868 868
 		if (isset($all_data['acList'])) {
869 869
 		    $reset = 0;
870 870
 		    foreach ($all_data['acList'] as $line) {
@@ -880,7 +880,7 @@  discard block
 block discarded – undo
880 880
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
881 881
 			$data['emergency'] = ''; // emergency
882 882
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
883
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
883
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
884 884
 			else $data['datetime'] = date('Y-m-d H:i:s');
885 885
 			//$data['datetime'] = date('Y-m-d H:i:s');
886 886
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -905,7 +905,7 @@  discard block
 block discarded – undo
905 905
 			$data['verticalrate'] = $line['vrt']; // verticale rate
906 906
 			$data['squawk'] = $line['squawk']; // squawk
907 907
 			$data['emergency'] = ''; // emergency
908
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
908
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
909 909
 			else $data['datetime'] = date('Y-m-d H:i:s');
910 910
 			$data['format_source'] = 'aircraftlistjson';
911 911
 			$data['id_source'] = $id_source;
@@ -926,7 +926,7 @@  discard block
 block discarded – undo
926 926
     	    )
927 927
     	) {
928 928
 	    $buffer = $Common->getData($value['host']);
929
-	    $all_data = json_decode($buffer,true);
929
+	    $all_data = json_decode($buffer, true);
930 930
 	    if (isset($all_data['planes'])) {
931 931
 		$reset = 0;
932 932
 		foreach ($all_data['planes'] as $key => $line) {
@@ -943,12 +943,12 @@  discard block
 block discarded – undo
943 943
 		    $data['emergency'] = ''; // emergency
944 944
 		    $data['registration'] = $line[2];
945 945
 		    $data['aircraft_icao'] = $line[0];
946
-		    $deparr = explode('-',$line[1]);
946
+		    $deparr = explode('-', $line[1]);
947 947
 		    if (count($deparr) == 2) {
948 948
 			$data['departure_airport_icao'] = $deparr[0];
949 949
 			$data['arrival_airport_icao'] = $deparr[1];
950 950
 		    }
951
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
951
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
952 952
 	    	    $data['format_source'] = 'planeupdatefaa';
953 953
     		    $data['id_source'] = $id_source;
954 954
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
 	    )
967 967
 	) {
968 968
 	    $buffer = $Common->getData($value['host']);
969
-	    $all_data = json_decode($buffer,true);
969
+	    $all_data = json_decode($buffer, true);
970 970
 	    if (isset($all_data['states'])) {
971 971
 		$reset = 0;
972 972
 		foreach ($all_data['states'] as $key => $line) {
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
 		    //$data['emergency'] = ''; // emergency
984 984
 		    //$data['registration'] = $line[2];
985 985
 		    //$data['aircraft_icao'] = $line[0];
986
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
986
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
987 987
 		    $data['format_source'] = 'opensky';
988 988
 		    $data['id_source'] = $id_source;
989 989
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1002,7 +1002,7 @@  discard block
 block discarded – undo
1002 1002
 	) {
1003 1003
 	    //$buffer = $Common->getData($hosts[$id]);
1004 1004
 	    $buffer = $Common->getData($value['host']);
1005
-	    $all_data = json_decode($buffer,true);
1005
+	    $all_data = json_decode($buffer, true);
1006 1006
 	    if (!empty($all_data)) $reset = 0;
1007 1007
 	    foreach ($all_data as $key => $line) {
1008 1008
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1040,11 +1040,11 @@  discard block
 block discarded – undo
1040 1040
 	    )
1041 1041
 	) {
1042 1042
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1043
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1043
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
1044 1044
 	    //echo $buffer;
1045
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1046
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1047
-	    $all_data = json_decode($buffer,true);
1045
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
1046
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
1047
+	    $all_data = json_decode($buffer, true);
1048 1048
 	    if (json_last_error() != JSON_ERROR_NONE) {
1049 1049
 		die(json_last_error_msg());
1050 1050
 	    }
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
 			//$data['departure_airport_iata'] = $line[11];
1068 1068
 			//$data['arrival_airport_iata'] = $line[12];
1069 1069
 	    		//$data['emergency'] = ''; // emergency
1070
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1070
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
1071 1071
 	    		$data['format_source'] = 'radarvirtueljson';
1072 1072
     			$data['id_source'] = $id_source;
1073 1073
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1088,14 +1088,14 @@  discard block
 block discarded – undo
1088 1088
 	) {
1089 1089
 	    //$buffer = $Common->getData($hosts[$id]);
1090 1090
 	    $buffer = $Common->getData($value['host'].'?'.time());
1091
-	    $all_data = json_decode(utf8_encode($buffer),true);
1091
+	    $all_data = json_decode(utf8_encode($buffer), true);
1092 1092
 	    
1093 1093
 	    if (isset($all_data['pireps'])) {
1094 1094
 		$reset = 0;
1095 1095
 	        foreach ($all_data['pireps'] as $line) {
1096 1096
 		    $data = array();
1097 1097
 		    $data['id'] = $line['id'];
1098
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1098
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
1099 1099
 		    $data['ident'] = $line['callsign']; // ident
1100 1100
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1101 1101
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1125,9 +1125,9 @@  discard block
 block discarded – undo
1125 1125
 			$SI->add($data);
1126 1126
 		    //    print_r($data);
1127 1127
     		    } elseif ($line['icon'] == 'ct') {
1128
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1129
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1130
-			$typec = substr($data['ident'],-3);
1128
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
1129
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
1130
+			$typec = substr($data['ident'], -3);
1131 1131
 			$data['type'] = '';
1132 1132
 			if ($typec == 'APP') $data['type'] = 'Approach';
1133 1133
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
1139 1139
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
1140 1140
 			else $data['type'] = 'Observer';
1141
-			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']);
1141
+			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']);
1142 1142
 		    }
1143 1143
 		    unset($data);
1144 1144
 		}
@@ -1155,14 +1155,14 @@  discard block
 block discarded – undo
1155 1155
 	    //$buffer = $Common->getData($hosts[$id]);
1156 1156
 	    if ($globalDebug) echo 'Get Data...'."\n";
1157 1157
 	    $buffer = $Common->getData($value['host']);
1158
-	    $all_data = json_decode($buffer,true);
1158
+	    $all_data = json_decode($buffer, true);
1159 1159
 	    if ($buffer != '' && is_array($all_data)) {
1160 1160
 		$reset = 0;
1161 1161
 		foreach ($all_data as $line) {
1162 1162
 	    	    $data = array();
1163 1163
 	    	    //$data['id'] = $line['id']; // id not usable
1164 1164
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1165
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1165
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
1166 1166
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1167 1167
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1168 1168
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1177,7 +1177,7 @@  discard block
 block discarded – undo
1177 1177
 	    	    //$data['datetime'] = $line['lastupdate'];
1178 1178
 	    	    //$data['last_update'] = $line['lastupdate'];
1179 1179
 	    	    if (isset($value['timezone'])) {
1180
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1180
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
1181 1181
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1182 1182
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1183 1183
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1190,14 +1190,14 @@  discard block
 block discarded – undo
1190 1190
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1191 1191
 		    if (isset($line['aircraftname'])) {
1192 1192
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1193
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1194
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1193
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
1194
+	    		$aircraft_data = explode('-', $line['aircraftname']);
1195 1195
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1196 1196
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1197 1197
 	    		else {
1198
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1199
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1200
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1198
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
1199
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
1200
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
1201 1201
 	    		}
1202 1202
 	    	    }
1203 1203
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1222,14 +1222,14 @@  discard block
 block discarded – undo
1222 1222
 	    //$buffer = $Common->getData($hosts[$id]);
1223 1223
 	    if ($globalDebug) echo 'Get Data...'."\n";
1224 1224
 	    $buffer = $Common->getData($value['host']);
1225
-	    $all_data = json_decode($buffer,true);
1225
+	    $all_data = json_decode($buffer, true);
1226 1226
 	    if ($buffer != '' && is_array($all_data)) {
1227 1227
 		$reset = 0;
1228 1228
 		foreach ($all_data as $line) {
1229 1229
 	    	    $data = array();
1230 1230
 	    	    //$data['id'] = $line['id']; // id not usable
1231 1231
 	    	    $data['id'] = trim($line['flight_id']);
1232
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1232
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1233 1233
 	    	    $data['pilot_name'] = $line['pilot_name'];
1234 1234
 	    	    $data['pilot_id'] = $line['pilot_id'];
1235 1235
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1273,24 +1273,24 @@  discard block
 block discarded – undo
1273 1273
 	    //$buffer = $Common->getData($hosts[$id]);
1274 1274
 	    if ($globalDebug) echo 'Get Data...'."\n";
1275 1275
 	    $buffer = $Common->getData($value['host']);
1276
-	    $all_data = json_decode($buffer,true);
1276
+	    $all_data = json_decode($buffer, true);
1277 1277
 	    if ($buffer != '') {
1278 1278
 		$Source->deleteLocationBySource('blitzortung');
1279
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1280
-		$buffer = explode('\n',$buffer);
1279
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
1280
+		$buffer = explode('\n', $buffer);
1281 1281
 		foreach ($buffer as $buffer_line) {
1282
-		    $line = json_decode($buffer_line,true);
1282
+		    $line = json_decode($buffer_line, true);
1283 1283
 		    if (isset($line['time'])) {
1284 1284
 			$data = array();
1285 1285
 			$data['altitude'] = $line['alt']; // altitude
1286 1286
 			$data['latitude'] = $line['lat']; // lat
1287 1287
 			$data['longitude'] = $line['lon']; // long
1288
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
1288
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
1289 1289
 			$data['id_source'] = $id_source;
1290 1290
 			$data['format_source'] = 'blitzortung';
1291 1291
 			$SI->add($data);
1292 1292
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1293
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1293
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
1294 1294
 			unset($data);
1295 1295
 		    }
1296 1296
 		}
@@ -1315,11 +1315,11 @@  discard block
 block discarded – undo
1315 1315
 		    //$value = $formats[$nb];
1316 1316
 		    $format = $globalSources[$nb]['format'];
1317 1317
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1318
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1318
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1319 1319
 		    } elseif ($format == 'vrstcp') {
1320 1320
 			$buffer = @socket_read($r, 6000);
1321 1321
 		    } else {
1322
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1322
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1323 1323
 		    }
1324 1324
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1325 1325
 		    //echo $buffer."\n";
@@ -1328,8 +1328,8 @@  discard block
 block discarded – undo
1328 1328
 		    $error = false;
1329 1329
 		    //$SI::del();
1330 1330
 		    if ($format == 'vrstcp') {
1331
-			$buffer = explode('},{',$buffer);
1332
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1331
+			$buffer = explode('},{', $buffer);
1332
+		    } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1333 1333
 		    // SBS format is CSV format
1334 1334
 		    if ($buffer !== FALSE && $buffer != '') {
1335 1335
 			$tt[$format] = 0;
@@ -1363,13 +1363,13 @@  discard block
 block discarded – undo
1363 1363
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1364 1364
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1365 1365
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1366
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1366
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1367 1367
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1368 1368
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1369 1369
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1370 1370
 
1371 1371
 			    if (isset($ais_data['timestamp'])) {
1372
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1372
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1373 1373
 			    } else {
1374 1374
 				$data['datetime'] = date('Y-m-d H:i:s');
1375 1375
 			    }
@@ -1380,10 +1380,10 @@  discard block
 block discarded – undo
1380 1380
                         } elseif ($format == 'flightgearsp') {
1381 1381
                     	    //echo $buffer."\n";
1382 1382
                     	    if (strlen($buffer) > 5) {
1383
-				$line = explode(',',$buffer);
1383
+				$line = explode(',', $buffer);
1384 1384
 				$data = array();
1385 1385
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1386
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1386
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1387 1387
 				$data['ident'] = $line[6];
1388 1388
 				$data['aircraft_name'] = $line[7];
1389 1389
 				$data['longitude'] = $line[1];
@@ -1400,16 +1400,16 @@  discard block
 block discarded – undo
1400 1400
                         } elseif ($format == 'acars') {
1401 1401
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1402 1402
 			    $ACARS->add(trim($buffer));
1403
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1403
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1404 1404
 			    $ACARS->deleteLiveAcarsData();
1405 1405
 			} elseif ($format == 'flightgearmp') {
1406
-			    if (substr($buffer,0,1) != '#') {
1406
+			    if (substr($buffer, 0, 1) != '#') {
1407 1407
 				$data = array();
1408 1408
 				//echo $buffer."\n";
1409
-				$line = explode(' ',$buffer);
1409
+				$line = explode(' ', $buffer);
1410 1410
 				if (count($line) == 11) {
1411
-				    $userserver = explode('@',$line[0]);
1412
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1411
+				    $userserver = explode('@', $line[0]);
1412
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1413 1413
 				    $data['ident'] = $userserver[0];
1414 1414
 				    $data['registration'] = $userserver[0];
1415 1415
 				    $data['latitude'] = $line[4];
@@ -1417,8 +1417,8 @@  discard block
 block discarded – undo
1417 1417
 				    $data['altitude'] = $line[6];
1418 1418
 				    $data['datetime'] = date('Y-m-d H:i:s');
1419 1419
 				    $aircraft_type = $line[10];
1420
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1421
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1420
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1421
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1422 1422
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1423 1423
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1424 1424
 				}
@@ -1427,8 +1427,8 @@  discard block
 block discarded – undo
1427 1427
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1428 1428
 			    die;
1429 1429
 			} elseif ($format == 'vrstcp') {
1430
-			    foreach($buffer as $all_data) {
1431
-				$line = json_decode('{'.$all_data.'}',true);
1430
+			    foreach ($buffer as $all_data) {
1431
+				$line = json_decode('{'.$all_data.'}', true);
1432 1432
 				$data = array();
1433 1433
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1434 1434
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1454,16 +1454,16 @@  discard block
 block discarded – undo
1454 1454
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1455 1455
 				unset($data);
1456 1456
 			    }
1457
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1457
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
1458 1458
 			    $line = explode("\t", $buffer);
1459
-			    for($k = 0; $k < count($line); $k=$k+2) {
1459
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1460 1460
 				$key = $line[$k];
1461
-			        $lined[$key] = $line[$k+1];
1461
+			        $lined[$key] = $line[$k + 1];
1462 1462
 			    }
1463 1463
     			    if (count($lined) > 3) {
1464 1464
     				$data['hex'] = $lined['hexid'];
1465 1465
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1466
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1466
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1467 1467
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1468 1468
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1469 1469
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1482,22 +1482,22 @@  discard block
 block discarded – undo
1482 1482
     			    } else $error = true;
1483 1483
 			} elseif ($format == 'aprs' && $use_aprs) {
1484 1484
 			    if ($aprs_connect == 0) {
1485
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1485
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1486 1486
 				$aprs_connect = 1;
1487 1487
 			    }
1488 1488
 			    
1489
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1489
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1490 1490
 				$aprs_last_tx = time();
1491 1491
 				$data_aprs = "# Keep alive";
1492
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1492
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1493 1493
 			    }
1494 1494
 			    
1495 1495
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1496 1496
 			    //echo 'APRS data : '.$buffer."\n";
1497
-			    $buffer = str_replace('APRS <- ','',$buffer);
1498
-			    $buffer = str_replace('APRS -> ','',$buffer);
1497
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1498
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1499 1499
 			    //echo $buffer."\n";
1500
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1500
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1501 1501
 				$line = $APRS->parse($buffer);
1502 1502
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1503 1503
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1512,7 +1512,7 @@  discard block
 block discarded – undo
1512 1512
 				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1513 1513
 				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1514 1514
 				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1515
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1515
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1516 1516
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1517 1517
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1518 1518
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1594,29 +1594,29 @@  discard block
 block discarded – undo
1594 1594
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1595 1595
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1596 1596
 					$Source->deleteOldLocationByType('gs');
1597
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1598
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1597
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
1598
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1599 1599
 					} else {
1600
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1600
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1601 1601
 					}
1602 1602
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1603 1603
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1604 1604
 					if ($globalDebug) echo '# Weather Station added'."\n";
1605 1605
 					$Source->deleteOldLocationByType('wx');
1606 1606
 					$weather_data = json_encode($line);
1607
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
1608
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1607
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
1608
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1609 1609
 					} else {
1610
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1610
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1611 1611
 					}
1612 1612
 				    } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) {
1613 1613
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1614 1614
 					if ($globalDebug) echo '☈ Lightning added'."\n";
1615 1615
 					$Source->deleteOldLocationByType('lightning');
1616
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
1617
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1616
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
1617
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1618 1618
 					} else {
1619
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1619
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1620 1620
 					}
1621 1621
 				    } elseif ($globalDebug) {
1622 1622
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1625,7 +1625,7 @@  discard block
 block discarded – undo
1625 1625
 				    unset($data);
1626 1626
 				}
1627 1627
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1628
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
1628
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
1629 1629
 				}
1630 1630
 				/*
1631 1631
 				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')) {
@@ -1634,7 +1634,7 @@  discard block
 block discarded – undo
1634 1634
 				*/
1635 1635
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1636 1636
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1637
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
1637
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
1638 1638
 					$Source->deleteOldLocationByType('lightning');
1639 1639
 					$Source->deleteOldLocationByType('wx');
1640 1640
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1719,7 +1719,7 @@  discard block
 block discarded – undo
1719 1719
 				connect_all($sourceee);
1720 1720
 				$sourceee = array();
1721 1721
 				//connect_all($globalSources);
1722
-				$tt[$format]=0;
1722
+				$tt[$format] = 0;
1723 1723
 				break;
1724 1724
 			    }
1725 1725
 			}
@@ -1728,14 +1728,14 @@  discard block
 block discarded – undo
1728 1728
 	    } else {
1729 1729
 		$error = socket_strerror(socket_last_error());
1730 1730
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1731
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1731
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1732 1732
 			if (isset($globalDebug)) echo "Restarting...\n";
1733 1733
 			// Restart the script if possible
1734 1734
 			if (is_array($sockets)) {
1735 1735
 			    if ($globalDebug) echo "Shutdown all sockets...";
1736 1736
 			    
1737 1737
 			    foreach ($sockets as $sock) {
1738
-				@socket_shutdown($sock,2);
1738
+				@socket_shutdown($sock, 2);
1739 1739
 				@socket_close($sock);
1740 1740
 			    }
1741 1741
 			    
Please login to merge, or discard this patch.