Completed
Push — master ( ff1a7a...c1bba6 )
by Yannick
30:23
created
aircraft-data.php 1 patch
Braces   +52 added lines, -19 removed lines patch added patch discarded remove patch
@@ -58,7 +58,9 @@  discard block
 block discarded – undo
58 58
 	{
59 59
 		if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
60 60
 			$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
61
-		} else $image = $spotter_item['image_thumbnail'];
61
+		} else {
62
+			$image = $spotter_item['image_thumbnail'];
63
+		}
62 64
 	}
63 65
 	/* else {
64 66
 		$image = "images/placeholder_thumb.png";
@@ -75,10 +77,14 @@  discard block
 block discarded – undo
75 77
 	print '<div class="callsign-details">';
76 78
 	if ($spotter_item['ident'] != 'Not Available') {
77 79
 		print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a>';
78
-		if (isset($spotter_item['blocked']) && $spotter_item['blocked'] === true) print '<img src="'.$globalURL.'/images/forbidden.png" title="'._("Callsign is in blocked FAA list").'" class="blocked" />';
80
+		if (isset($spotter_item['blocked']) && $spotter_item['blocked'] === true) {
81
+			print '<img src="'.$globalURL.'/images/forbidden.png" title="'._("Callsign is in blocked FAA list").'" class="blocked" />';
82
+		}
79 83
 		print '</div>';
80 84
 	}
81
-	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
85
+	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
86
+		print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
87
+	}
82 88
 	print '</div>';
83 89
 	if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
84 90
 		print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
@@ -110,15 +116,25 @@  discard block
 block discarded – undo
110 116
 	print '</div>';
111 117
 	print '<div id="aircraft">';
112 118
 	print '<span>'._("Aircraft").'</span>';
113
-	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
119
+	if (isset($spotter_item['aircraft_wiki'])) {
120
+		print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
121
+	}
114 122
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
115 123
 		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
116
-		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
117
-		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
118
-	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
119
-	else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
124
+		if (count($aircraft_names) == 1) {
125
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
126
+		} else {
127
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
128
+		}
129
+	} elseif (isset($spotter_item['aircraft_type'])) {
130
+		print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
131
+	} else {
132
+		print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
133
+	}
120 134
 	print '</div>';
121
-	if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
135
+	if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
136
+		print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
137
+	}
122 138
 
123 139
 	print '<div id="altitude"><span>'._("Altitude").'</span>';
124 140
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
@@ -131,11 +147,17 @@  discard block
 block discarded – undo
131 147
 
132 148
 	print '<span class="altitude">';
133 149
 	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
134
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
135
-		else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
150
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
151
+			print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
152
+		} else {
153
+			print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
154
+		}
136 155
 	} else {
137
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
138
-		else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
156
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
157
+			print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
158
+		} else {
159
+			print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
160
+		}
139 161
 	}
140 162
 	print '</span>';
141 163
 
@@ -200,8 +222,11 @@  discard block
 block discarded – undo
200 222
 	}
201 223
 	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
202 224
 		print '<div id="pilot"><span>'._("Pilot").'</span>';
203
-		if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
204
-		else print $spotter_item['pilot_name'];
225
+		if (isset($spotter_item['pilot_id'])) {
226
+			print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
227
+		} else {
228
+			print $spotter_item['pilot_name'];
229
+		}
205 230
 		print '</div>';
206 231
 	}
207 232
 	if (isset($spotter_item['aircraft_owner']) && $spotter_item['aircraft_owner'] != '') {
@@ -227,10 +252,18 @@  discard block
 block discarded – undo
227 252
 	}
228 253
 	print '</div>';
229 254
 	print '</div>';
230
-	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
231
-	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
232
-	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
233
-	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
255
+	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
256
+		print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
257
+	}
258
+	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
259
+		print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
260
+	}
261
+	if (isset($spotter_item['acars']['message'])) {
262
+		print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
263
+	}
264
+	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
265
+		print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
266
+	}
234 267
 	print '</div>';
235 268
 }
236 269
 ?>
Please login to merge, or discard this patch.
require/class.SpotterImport.php 3 patches
Indentation   +424 added lines, -424 removed lines patch added patch discarded remove patch
@@ -9,20 +9,20 @@  discard block
 block discarded – undo
9 9
 require_once(dirname(__FILE__).'/class.Source.php');
10 10
 require_once(dirname(__FILE__).'/class.GeoidHeight.php');
11 11
 if (isset($globalServerAPRS) && $globalServerAPRS) {
12
-    require_once(dirname(__FILE__).'/class.APRS.php');
12
+	require_once(dirname(__FILE__).'/class.APRS.php');
13 13
 }
14 14
 
15 15
 class SpotterImport {
16
-    private $all_flights = array();
17
-    private $last_delete_hourly = 0;
18
-    private $last_delete = 0;
19
-    private $stats = array();
20
-    private $tmd = 0;
21
-    private $source_location = array();
22
-    public $db = null;
23
-    public $nb = 0;
16
+	private $all_flights = array();
17
+	private $last_delete_hourly = 0;
18
+	private $last_delete = 0;
19
+	private $stats = array();
20
+	private $tmd = 0;
21
+	private $source_location = array();
22
+	public $db = null;
23
+	public $nb = 0;
24 24
 
25
-    public function __construct($dbc = null) {
25
+	public function __construct($dbc = null) {
26 26
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB, $GeoidClass, $globalDebug, $globalGeoid;
27 27
 	if (!(isset($globalNoDB) && $globalNoDB)) {
28 28
 		$Connection = new Connection($dbc);
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 		$currentdate = date('Y-m-d');
35 35
 		$sourcestat = $Stats->getStatsSource($currentdate);
36 36
 		if (!empty($sourcestat)) {
37
-		    foreach($sourcestat as $srcst) {
38
-		    	$type = $srcst['stats_type'];
37
+			foreach($sourcestat as $srcst) {
38
+				$type = $srcst['stats_type'];
39 39
 			if ($type == 'polar' || $type == 'hist') {
40
-			    $source = $srcst['source_name'];
41
-			    $data = $srcst['source_data'];
42
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
43
-	    		}
44
-		    }
40
+				$source = $srcst['source_name'];
41
+				$data = $srcst['source_data'];
42
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
43
+				}
44
+			}
45 45
 		}
46 46
 	}
47 47
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 			$GeoidClass = FALSE;
57 57
 		}
58 58
 	}
59
-    }
59
+	}
60 60
 
61
-    public function get_Schedule($id,$ident) {
61
+	public function get_Schedule($id,$ident) {
62 62
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
63 63
 	// Get schedule here, so it's done only one time
64 64
 	
@@ -78,43 +78,43 @@  discard block
 block discarded – undo
78 78
 	$operator = $Spotter->getOperator($ident);
79 79
 	$scheduleexist = false;
80 80
 	if ($Schedule->checkSchedule($operator) == 0) {
81
-	    $operator = $Translation->checkTranslation($ident);
82
-	    if ($Schedule->checkSchedule($operator) == 0) {
81
+		$operator = $Translation->checkTranslation($ident);
82
+		if ($Schedule->checkSchedule($operator) == 0) {
83 83
 		$schedule = $Schedule->fetchSchedule($operator);
84 84
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88
-		    // Should also check if route schedule = route from DB
89
-		    if ($schedule['DepartureAirportIATA'] != '') {
85
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88
+			// Should also check if route schedule = route from DB
89
+			if ($schedule['DepartureAirportIATA'] != '') {
90 90
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
91
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92
-			    if (trim($airport_icao) != '') {
91
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92
+				if (trim($airport_icao) != '') {
93 93
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
94 94
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
95
-			    }
95
+				}
96
+			}
96 97
 			}
97
-		    }
98
-		    if ($schedule['ArrivalAirportIATA'] != '') {
98
+			if ($schedule['ArrivalAirportIATA'] != '') {
99 99
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
100
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101
-			    if (trim($airport_icao) != '') {
100
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101
+				if (trim($airport_icao) != '') {
102 102
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
103 103
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
104
-			    }
104
+				}
105 105
 			}
106
-		    }
107
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
106
+			}
107
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
108 108
 		}
109
-	    } else $scheduleexist = true;
109
+		} else $scheduleexist = true;
110 110
 	} else $scheduleexist = true;
111 111
 	// close connection, at least one way will work ?
112
-       if ($scheduleexist) {
112
+	   if ($scheduleexist) {
113 113
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
114
-    		$sch = $Schedule->getSchedule($operator);
114
+			$sch = $Schedule->getSchedule($operator);
115 115
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
116 116
 		if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']);
117
-       }
117
+	   }
118 118
 	$Spotter->db = null;
119 119
 	$Schedule->db = null;
120 120
 	$Translation->db = null;
@@ -129,65 +129,65 @@  discard block
 block discarded – undo
129 129
 	}
130 130
 	  */
131 131
 	}
132
-    }
132
+	}
133 133
 
134
-    public function checkAll() {
134
+	public function checkAll() {
135 135
 	global $globalDebug, $globalNoImport;
136 136
 	if ($globalDebug) echo "Update last seen flights data...\n";
137 137
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
138
-	    foreach ($this->all_flights as $key => $flight) {
138
+		foreach ($this->all_flights as $key => $flight) {
139 139
 		if (isset($this->all_flights[$key]['id'])) {
140
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
141
-    		    $Spotter = new Spotter($this->db);
142
-        	    $real_arrival = $this->arrival($key);
143
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
144
-        	}
145
-	    }
140
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
141
+				$Spotter = new Spotter($this->db);
142
+				$real_arrival = $this->arrival($key);
143
+				if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
144
+			}
145
+		}
146
+	}
146 147
 	}
147
-    }
148 148
 
149
-    public function arrival($key) {
149
+	public function arrival($key) {
150 150
 	global $globalClosestMinDist, $globalDebug;
151 151
 	if ($globalDebug) echo 'Update arrival...'."\n";
152 152
 	$Spotter = new Spotter($this->db);
153
-        $airport_icao = '';
154
-        $airport_time = '';
155
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
153
+		$airport_icao = '';
154
+		$airport_time = '';
155
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
156 156
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
157
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
158
-    	    if (isset($closestAirports[0])) {
159
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
160
-        	    $airport_icao = $closestAirports[0]['icao'];
161
-        	    $airport_time = $this->all_flights[$key]['datetime'];
162
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
163
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
164
-        	    foreach ($closestAirports as $airport) {
165
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
166
-        		    $airport_icao = $airport['icao'];
167
-        		    $airport_time = $this->all_flights[$key]['datetime'];
168
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
169
-        		    break;
170
-        		}
171
-        	    }
172
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
173
-        		$airport_icao = $closestAirports[0]['icao'];
174
-        		$airport_time = $this->all_flights[$key]['datetime'];
175
-        	} else {
176
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
177
-        	}
178
-    	    } else {
179
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
180
-    	    }
157
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
158
+			if (isset($closestAirports[0])) {
159
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
160
+				$airport_icao = $closestAirports[0]['icao'];
161
+				$airport_time = $this->all_flights[$key]['datetime'];
162
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
163
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
164
+				foreach ($closestAirports as $airport) {
165
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
166
+					$airport_icao = $airport['icao'];
167
+					$airport_time = $this->all_flights[$key]['datetime'];
168
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
169
+					break;
170
+				}
171
+				}
172
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
173
+				$airport_icao = $closestAirports[0]['icao'];
174
+				$airport_time = $this->all_flights[$key]['datetime'];
175
+			} else {
176
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
177
+			}
178
+			} else {
179
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
180
+			}
181 181
 
182
-        } else {
183
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
184
-        }
185
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
186
-    }
182
+		} else {
183
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
184
+		}
185
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
186
+	}
187 187
 
188 188
 
189 189
 
190
-    public function del() {
190
+	public function del() {
191 191
 	global $globalDebug, $globalNoImport, $globalNoDB;
192 192
 	// Delete old infos
193 193
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 			}
200 200
 		}
201 201
 	}
202
-    }
202
+	}
203 203
 
204
-    public function delKey($key) {
204
+	public function delKey($key) {
205 205
 	global $globalDebug, $globalNoImport, $globalNoDB;
206 206
 	// Delete old infos
207 207
 	if (isset($this->all_flights[$key]['id'])) {
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
 		if ($globalDebug) echo "\n";
224 224
 	}
225 225
 	unset($this->all_flights[$key]);
226
-    }
226
+	}
227 227
 
228
-    public function add($line) {
228
+	public function add($line) {
229 229
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass, $globalArchive;
230 230
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
231 231
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01';
@@ -251,20 +251,20 @@  discard block
 block discarded – undo
251 251
 	
252 252
 	// SBS format is CSV format
253 253
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
254
-	    //print_r($line);
255
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
256
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
254
+		//print_r($line);
255
+		if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
256
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
257 257
 
258 258
 		// Increment message number
259 259
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
260
-		    $current_date = date('Y-m-d');
261
-		    if (isset($line['source_name'])) $source = $line['source_name'];
262
-		    else $source = '';
263
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
264
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
265
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
266
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
267
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
260
+			$current_date = date('Y-m-d');
261
+			if (isset($line['source_name'])) $source = $line['source_name'];
262
+			else $source = '';
263
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
264
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
265
+				$this->stats[$current_date][$source]['msg']['date'] = time();
266
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
267
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
268 268
 		}
269 269
 		
270 270
 		/*
@@ -280,54 +280,54 @@  discard block
 block discarded – undo
280 280
 		//$this->db = $dbc;
281 281
 
282 282
 		//$hex = trim($line['hex']);
283
-	        if (!isset($line['id'])) $id = trim($line['hex']);
284
-	        else $id = trim($line['id']);
283
+			if (!isset($line['id'])) $id = trim($line['hex']);
284
+			else $id = trim($line['id']);
285 285
 		
286 286
 		if (!isset($this->all_flights[$id])) {
287
-		    if ($globalDebug) echo 'New flight...'."\n";
288
-		    $this->all_flights[$id] = array();
289
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
290
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
291
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
292
-		    if (!isset($line['id'])) {
287
+			if ($globalDebug) echo 'New flight...'."\n";
288
+			$this->all_flights[$id] = array();
289
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
290
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
291
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
292
+			if (!isset($line['id'])) {
293 293
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
294 294
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
295 295
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
296 296
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
297
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
298
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
299
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
297
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
298
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
299
+			if ($globalAllFlights !== FALSE) $dataFound = true;
300 300
 		}
301 301
 		if (isset($line['source_type']) && $line['source_type'] != '') {
302
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
302
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
303 303
 		}
304 304
 		
305 305
 		//print_r($this->all_flights);
306 306
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
307
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
308
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
307
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
308
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
309 309
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
310
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
311
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
310
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
311
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
312 312
 			$timeelapsed = microtime(true);
313 313
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
314
-			    $Spotter = new Spotter($this->db);
315
-			    if (isset($this->all_flights[$id]['source_type'])) {
314
+				$Spotter = new Spotter($this->db);
315
+				if (isset($this->all_flights[$id]['source_type'])) {
316 316
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
317
-			    } else {
317
+				} else {
318 318
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
319
-			    }
320
-			    $Spotter->db = null;
321
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
322
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
319
+				}
320
+				$Spotter->db = null;
321
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
322
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
323 323
 			}
324
-		    }
325
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
326
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
324
+			}
325
+			if ($globalAllFlights !== FALSE) $dataFound = true;
326
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
327 327
 		}
328
-	        if (isset($line['id']) && !isset($line['hex'])) {
329
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
330
-	        }
328
+			if (isset($line['id']) && !isset($line['hex'])) {
329
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
330
+			}
331 331
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
332 332
 			$icao = $line['aircraft_icao'];
333 333
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
357 357
 		}
358 358
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
359 359
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
360
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
360
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
361 361
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
362
-		    } else {
362
+			} else {
363 363
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
364 364
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
365 365
 				/*
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 				print_r($line);
369 369
 				*/
370 370
 				return '';
371
-		    }
371
+			}
372 372
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
373 373
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
374 374
 			return '';
@@ -384,21 +384,21 @@  discard block
 block discarded – undo
384 384
 		}
385 385
 
386 386
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG' && $line['registration'] != 'NA') {
387
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
387
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
388 388
 		}
389 389
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
390
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
390
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
391 391
 		}
392 392
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
393
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
393
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
394 394
 		}
395 395
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
396
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
396
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
397 397
 		}
398 398
  
399 399
 		if (isset($line['ident']) && trim($line['ident']) != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
400 400
 
401
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
401
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
402 402
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
403 403
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
404 404
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -407,23 +407,23 @@  discard block
 block discarded – undo
407 407
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
408 408
 				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
409 409
 			} else {
410
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
411
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
410
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
411
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
412 412
 				$timeelapsed = microtime(true);
413
-            			$Spotter = new Spotter($this->db);
414
-            			$fromsource = NULL;
415
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
416
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
413
+						$Spotter = new Spotter($this->db);
414
+						$fromsource = NULL;
415
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
416
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
417 417
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
418 418
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
419 419
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
420
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
420
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
421 421
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
422 422
 				$Spotter->db = null;
423 423
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
424
-			    }
424
+				}
425 425
 			}
426
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
426
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
427 427
 		    
428 428
 /*
429 429
 		    if (!isset($line['id'])) {
@@ -433,63 +433,63 @@  discard block
 block discarded – undo
433 433
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
434 434
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
435 435
   */
436
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
436
+			if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
437 437
 
438
-		    //$putinarchive = true;
439
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
438
+			//$putinarchive = true;
439
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
440 440
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
441
-		    }
442
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
441
+			}
442
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
443 443
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
444
-		    }
445
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
446
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
447
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
444
+			}
445
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
446
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
447
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
448 448
 			$timeelapsed = microtime(true);
449 449
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
450 450
 				$Spotter = new Spotter($this->db);
451 451
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
452 452
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
453
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
453
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
454 454
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
455
-                        }
456
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
455
+						}
456
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
457 457
 			$timeelapsed = microtime(true);
458 458
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
459
-			    $Spotter = new Spotter($this->db);
460
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
461
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
459
+				$Spotter = new Spotter($this->db);
460
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
461
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
462 462
 				$Translation = new Translation($this->db);
463 463
 				$ident = $Translation->checkTranslation(trim($line['ident']));
464 464
 				$route = $Spotter->getRouteInfo($ident);
465 465
 				$Translation->db = null;
466
-			    }
467
-			    $Spotter->db = null;
468
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
469
-                    	}
466
+				}
467
+				$Spotter->db = null;
468
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
469
+						}
470 470
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
471
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
472
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
471
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
472
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
473 473
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
474
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
475
-		    	    }
474
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
475
+					}
476 476
 			}
477 477
 			if (!isset($globalFork)) $globalFork = TRUE;
478 478
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
479 479
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
480 480
 			}
481
-		    }
481
+			}
482 482
 		}
483 483
 
484 484
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
485 485
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
486
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
487
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
488
-		    //$dataFound = true;
486
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
487
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
488
+			//$dataFound = true;
489 489
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
490
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
491
-		    if ($distance > 1000 && $distance < 10000) {
492
-		    // use datetime
490
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
491
+			if ($distance > 1000 && $distance < 10000) {
492
+			// use datetime
493 493
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
494 494
 			$speed = $speed*3.6;
495 495
 			if ($speed < 1000) {
@@ -498,49 +498,49 @@  discard block
 block discarded – undo
498 498
 	  		} else {
499 499
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
500 500
 	  		}
501
-		    }
501
+			}
502 502
 		}
503 503
 
504 504
 
505 505
 
506
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
507
-	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
508
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
509
-	    	    	return false;
510
-	    	    }
511
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
512
-	    	    else unset($timediff);
513
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
514
-	    	    else unset($timediff_archive);
515
-	    	    if ($this->tmd > 5
516
-	    	        || (isset($line['format_source']) 
517
-	    	    	    && $line['format_source'] == 'airwhere' 
518
-	    	    	    && ((!isset($this->all_flights[$id]['latitude']) 
519
-	    	    		|| !isset($this->all_flights[$id]['longitude'])) 
520
-	    	    		|| (isset($this->all_flights[$id]['latitude']) 
521
-	    	    		    && isset($this->all_flights[$id]['longitude']) 
522
-	    	    		    && $this->all_flights[$id]['latitude'] != $line['latitude'] 
523
-	    	    		    && $this->all_flights[$id]['longitude'] != $line['longitude']
524
-	    	    		)
525
-	    	    	    )
526
-	    	    	)
527
-	    		|| (isset($globalVA) && $globalVA) 
528
-	    	    	|| (isset($globalIVAO) && $globalIVAO)
529
-	    	    	|| (isset($globalVATSIM) && $globalVATSIM)
530
-	    	    	|| (isset($globalphpVMS) && $globalphpVMS)
531
-	    	    	|| (isset($globalVAM) && $globalVAM)
532
-	    	    	|| !isset($timediff)
533
-	    	    	|| $timediff > $globalLiveInterval
534
-	    	    	|| $globalArchive
535
-	    	    	|| ($timediff > 30 
536
-	    	    	    && isset($this->all_flights[$id]['latitude']) 
537
-	    	    	    && isset($this->all_flights[$id]['longitude']) 
538
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
539
-	    	    	    )
540
-	    	    	) {
506
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
507
+				if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
508
+					if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
509
+					return false;
510
+				}
511
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
512
+				else unset($timediff);
513
+				if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
514
+				else unset($timediff_archive);
515
+				if ($this->tmd > 5
516
+					|| (isset($line['format_source']) 
517
+						&& $line['format_source'] == 'airwhere' 
518
+						&& ((!isset($this->all_flights[$id]['latitude']) 
519
+						|| !isset($this->all_flights[$id]['longitude'])) 
520
+						|| (isset($this->all_flights[$id]['latitude']) 
521
+							&& isset($this->all_flights[$id]['longitude']) 
522
+							&& $this->all_flights[$id]['latitude'] != $line['latitude'] 
523
+							&& $this->all_flights[$id]['longitude'] != $line['longitude']
524
+						)
525
+						)
526
+					)
527
+				|| (isset($globalVA) && $globalVA) 
528
+					|| (isset($globalIVAO) && $globalIVAO)
529
+					|| (isset($globalVATSIM) && $globalVATSIM)
530
+					|| (isset($globalphpVMS) && $globalphpVMS)
531
+					|| (isset($globalVAM) && $globalVAM)
532
+					|| !isset($timediff)
533
+					|| $timediff > $globalLiveInterval
534
+					|| $globalArchive
535
+					|| ($timediff > 30 
536
+						&& isset($this->all_flights[$id]['latitude']) 
537
+						&& isset($this->all_flights[$id]['longitude']) 
538
+						&& $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
539
+						)
540
+					) {
541 541
 
542 542
 			if ((isset($timediff) && !isset($timediff_archive)) || (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude']))) {
543
-			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
543
+				if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
544 544
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
545 545
 				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
546 546
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -548,9 +548,9 @@  discard block
 block discarded – undo
548 548
 				$this->all_flights[$id]['putinarchive'] = true;
549 549
 				$this->tmd = 0;
550 550
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
551
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
552
-				    $timeelapsed = microtime(true);
553
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
551
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
552
+					$timeelapsed = microtime(true);
553
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
554 554
 					$Spotter = new Spotter($this->db);
555 555
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
556 556
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
@@ -558,11 +558,11 @@  discard block
 block discarded – undo
558 558
 					$Spotter->db = null;
559 559
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
560 560
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
561
-				    }
561
+					}
562 562
 				}
563 563
 				$this->all_flights[$id]['time_last_archive_coord'] = time();
564
-			    } 
565
-			    /*
564
+				} 
565
+				/*
566 566
 			    else {
567 567
 				if (!isset($timediff)) echo 'NO TIMEDIFF';
568 568
 				else {
@@ -576,16 +576,16 @@  discard block
 block discarded – undo
576 576
 			}
577 577
 
578 578
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
579
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
579
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
580 580
 				if (!isset($this->all_flights[$id]['archive_latitude'])) {
581 581
 					$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
582 582
 					$this->all_flights[$id]['time_last_coord'] = time();
583 583
 				}
584 584
 				//if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
585 585
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
586
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
587
-				    $dataFound = true;
588
-				    $this->all_flights[$id]['time_last_coord'] = time();
586
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
587
+					$dataFound = true;
588
+					$this->all_flights[$id]['time_last_coord'] = time();
589 589
 				}
590 590
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
591 591
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -596,24 +596,24 @@  discard block
 block discarded – undo
596 596
 				    //$putinarchive = true;
597 597
 				}
598 598
 				*/
599
-			    /*
599
+				/*
600 600
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
601 601
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
602 602
 			    }
603 603
 			    */
604 604
 			}
605 605
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
606
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
607
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
606
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
607
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
608 608
 				if (!isset($this->all_flights[$id]['archive_longitude'])) {
609 609
 					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
610 610
 					$this->all_flights[$id]['time_last_coord'] = time();
611 611
 				}
612 612
 				//if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
613 613
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
614
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
615
-				    $dataFound = true;
616
-				    $this->all_flights[$id]['time_last_coord'] = time();
614
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
615
+					$dataFound = true;
616
+					$this->all_flights[$id]['time_last_coord'] = time();
617 617
 				}
618 618
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
619 619
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -631,67 +631,67 @@  discard block
 block discarded – undo
631 631
 			    */
632 632
 			}
633 633
 
634
-		    } else if ($globalDebug && $timediff > 30) {
634
+			} else if ($globalDebug && $timediff > 30) {
635 635
 			$this->tmd = $this->tmd + 1;
636 636
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
637 637
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
638 638
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
639 639
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
640
-		    }
640
+			}
641 641
 		}
642 642
 		if (isset($line['last_update']) && $line['last_update'] != '') {
643
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
644
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
643
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
644
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
645 645
 		}
646 646
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
647
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
648
-		    //$dataFound = true;
647
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
648
+			//$dataFound = true;
649 649
 		}
650 650
 		if (isset($line['format_source']) && $line['format_source'] != '') {
651
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
651
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
652 652
 		}
653 653
 		if (isset($line['source_name']) && $line['source_name'] != '') {
654
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
654
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
655 655
 		}
656 656
 		if (isset($line['emergency']) && $line['emergency'] != '') {
657
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
658
-		    //$dataFound = true;
657
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
658
+			//$dataFound = true;
659 659
 		}
660 660
 		if (isset($line['ground']) && $line['ground'] != '') {
661
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
661
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
662 662
 			// Here we force archive of flight because after ground it's a new one (or should be)
663 663
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
664 664
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
665 665
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
666
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
666
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
667 667
 			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
668
-		    }
669
-		    if ($line['ground'] != 1) $line['ground'] = 0;
670
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
671
-		    //$dataFound = true;
668
+			}
669
+			if ($line['ground'] != 1) $line['ground'] = 0;
670
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
671
+			//$dataFound = true;
672 672
 		}
673 673
 		if (isset($line['squawk']) && $line['squawk'] != '') {
674
-		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
675
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
676
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
677
-			    $highlight = '';
678
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
679
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
680
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
681
-			    if ($highlight != '') {
674
+			if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
675
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
676
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
677
+				$highlight = '';
678
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
679
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
680
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
681
+				if ($highlight != '') {
682 682
 				$timeelapsed = microtime(true);
683 683
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
684
-				    $Spotter = new Spotter($this->db);
685
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
686
-				    $Spotter->db = null;
687
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
684
+					$Spotter = new Spotter($this->db);
685
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
686
+					$Spotter->db = null;
687
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
688 688
 				}
689 689
 				//$putinarchive = true;
690 690
 				//$highlight = '';
691
-			    }
691
+				}
692 692
 			    
693
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
694
-		    //$dataFound = true;
693
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
694
+			//$dataFound = true;
695 695
 		}
696 696
 
697 697
 		if (isset($line['altitude']) && $line['altitude'] != '') {
@@ -702,13 +702,13 @@  discard block
 block discarded – undo
702 702
 					$line['altitude'] = $line['altitude'] - $geoid;
703 703
 				}
704 704
 			}
705
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
705
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
706 706
 			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
707 707
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
708 708
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
709 709
 			//$dataFound = true;
710
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
711
-		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
710
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
711
+			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
712 712
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
713 713
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
714 714
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -717,27 +717,27 @@  discard block
 block discarded – undo
717 717
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
718 718
 				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
719 719
 			}
720
-		    }
721
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
720
+			}
721
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
722 722
 		}
723 723
 
724 724
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
725
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
725
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
726 726
 		}
727 727
 		
728 728
 		if (isset($line['heading']) && $line['heading'] != '') {
729
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
730
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
731
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
732
-		    //$dataFound = true;
729
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
730
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
731
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
732
+			//$dataFound = true;
733 733
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
734
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
735
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
736
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
737
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
734
+  			$heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
735
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
736
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
737
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
738 738
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
739
-  		    // If not enough messages and ACARS set heading to 0
740
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
739
+  			// If not enough messages and ACARS set heading to 0
740
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
741 741
   		}
742 742
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
743 743
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -750,133 +750,133 @@  discard block
 block discarded – undo
750 750
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
751 751
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
752 752
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
753
-		    $this->all_flights[$id]['lastupdate'] = time();
754
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
755
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
756
-			    //print_r($this->all_flights);
757
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
758
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
759
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
753
+			$this->all_flights[$id]['lastupdate'] = time();
754
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
755
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
756
+				//print_r($this->all_flights);
757
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
758
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
759
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
760 760
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
761
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
762
-				    $timeelapsed = microtime(true);
763
-				    $SpotterLive = new SpotterLive($this->db);
764
-				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
761
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
762
+					$timeelapsed = microtime(true);
763
+					$SpotterLive = new SpotterLive($this->db);
764
+					if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
765 765
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
766 766
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
767
-				    } elseif (isset($line['id'])) {
767
+					} elseif (isset($line['id'])) {
768 768
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
769 769
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
770
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
770
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
771 771
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
772 772
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
773
-				    } else $recent_ident = '';
774
-				    $SpotterLive->db=null;
775
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
776
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
773
+					} else $recent_ident = '';
774
+					$SpotterLive->db=null;
775
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
776
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
777 777
 				} else $recent_ident = '';
778
-			    } else {
778
+				} else {
779 779
 				$recent_ident = '';
780 780
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
781
-			    }
782
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
783
-			    if($recent_ident == "")
784
-			    {
781
+				}
782
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
783
+				if($recent_ident == "")
784
+				{
785 785
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
786 786
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
787 787
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
788 788
 				//adds the spotter data for the archive
789 789
 				$ignoreImport = false;
790 790
 				foreach($globalAirportIgnore as $airportIgnore) {
791
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
791
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
792 792
 					$ignoreImport = true;
793
-				    }
793
+					}
794 794
 				}
795 795
 				if (count($globalAirportAccept) > 0) {
796
-				    $ignoreImport = true;
797
-				    foreach($globalAirportIgnore as $airportIgnore) {
796
+					$ignoreImport = true;
797
+					foreach($globalAirportIgnore as $airportIgnore) {
798 798
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
799
-					    $ignoreImport = false;
799
+						$ignoreImport = false;
800
+					}
800 801
 					}
801
-				    }
802 802
 				}
803 803
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
804
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
804
+					foreach($globalAirlineIgnore as $airlineIgnore) {
805 805
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
806
-					    $ignoreImport = true;
806
+						$ignoreImport = true;
807
+					}
807 808
 					}
808
-				    }
809 809
 				}
810 810
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
811
-				    $ignoreImport = true;
812
-				    foreach($globalAirlineAccept as $airlineAccept) {
811
+					$ignoreImport = true;
812
+					foreach($globalAirlineAccept as $airlineAccept) {
813 813
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
814
-					    $ignoreImport = false;
814
+						$ignoreImport = false;
815
+					}
815 816
 					}
816
-				    }
817 817
 				}
818 818
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
819
-				    $ignoreImport = true;
820
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
819
+					$ignoreImport = true;
820
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
821 821
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
822
-					    $ignoreImport = false;
822
+						$ignoreImport = false;
823
+					}
823 824
 					}
824
-				    }
825 825
 				}
826 826
 				
827 827
 				if (!$ignoreImport) {
828
-				    $highlight = '';
829
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
830
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
831
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
832
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
833
-				    $timeelapsed = microtime(true);
834
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
828
+					$highlight = '';
829
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
830
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
831
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
832
+					if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
833
+					$timeelapsed = microtime(true);
834
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
835 835
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
836
-					    $Spotter = new Spotter($this->db);
837
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
838
-					    $Spotter->db = null;
839
-					    if ($globalDebug) {
836
+						$Spotter = new Spotter($this->db);
837
+						$result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
838
+						$Spotter->db = null;
839
+						if ($globalDebug) {
840 840
 						if (isset($result['error'])) echo 'Error: '.$result['error']."\n";
841 841
 						else echo 'Success';
842
-					    }
843
-					    if (count($result) > 1) {
844
-					    // ':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,
842
+						}
843
+						if (count($result) > 1) {
844
+						// ':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,
845 845
 						if ($this->all_flights[$id]['aircraft_icao'] == '') $this->all_flights[$id]['aircraft_icao'] = $result[':aircraft_icao'];
846 846
 						if ($this->all_flights[$id]['registration'] == '') $this->all_flights[$id]['registration'] = $result[':registration'];
847
-					    }
847
+						}
848 848
 					}
849
-				    }
850
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
851
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
849
+					}
850
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
851
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
852 852
 
853
-				    // Add source stat in DB
854
-				    $Stats = new Stats($this->db);
855
-				    if (!empty($this->stats)) {
853
+					// Add source stat in DB
854
+					$Stats = new Stats($this->db);
855
+					if (!empty($this->stats)) {
856 856
 					if ($globalDebug) echo 'Add source stats : ';
857
-				        foreach($this->stats as $date => $data) {
858
-					    foreach($data as $source => $sourced) {
859
-					        //print_r($sourced);
860
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
861
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
862
-				    		if (isset($sourced['msg'])) {
863
-				    		    if (time() - $sourced['msg']['date'] > 10) {
864
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
865
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
866
-			    			        unset($this->stats[$date][$source]['msg']);
867
-			    			    }
868
-			    			}
869
-			    		    }
870
-			    		    if ($date != date('Y-m-d')) {
871
-			    			unset($this->stats[$date]);
872
-			    		    }
873
-				    	}
874
-				    	if ($globalDebug) echo 'Done'."\n";
857
+						foreach($this->stats as $date => $data) {
858
+						foreach($data as $source => $sourced) {
859
+							//print_r($sourced);
860
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
861
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
862
+							if (isset($sourced['msg'])) {
863
+								if (time() - $sourced['msg']['date'] > 10) {
864
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
865
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
866
+									unset($this->stats[$date][$source]['msg']);
867
+								}
868
+							}
869
+							}
870
+							if ($date != date('Y-m-d')) {
871
+							unset($this->stats[$date]);
872
+							}
873
+						}
874
+						if ($globalDebug) echo 'Done'."\n";
875 875
 
876
-				    }
877
-				    $Stats->db = null;
878
-				    }
879
-				    $this->del();
876
+					}
877
+					$Stats->db = null;
878
+					}
879
+					$this->del();
880 880
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
881 881
 				//$ignoreImport = false;
882 882
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -894,41 +894,41 @@  discard block
 block discarded – undo
894 894
 			*/
895 895
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
896 896
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
897
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
898
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
899
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
897
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
898
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
899
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
900 900
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
901
-					    $SpotterLive = new SpotterLive($this->db);
902
-					    $SpotterLive->deleteLiveSpotterData();
903
-					    $SpotterLive->db=null;
901
+						$SpotterLive = new SpotterLive($this->db);
902
+						$SpotterLive->deleteLiveSpotterData();
903
+						$SpotterLive->db=null;
904 904
 					}
905
-				    }
906
-				    if ($globalDebug) echo " Done\n";
907
-				    $this->last_delete = time();
905
+					}
906
+					if ($globalDebug) echo " Done\n";
907
+					$this->last_delete = time();
908 908
 				}
909
-			    } else {
909
+				} else {
910 910
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
911
-				    $this->all_flights[$id]['id'] = $recent_ident;
912
-				    $this->all_flights[$id]['addedSpotter'] = 1;
911
+					$this->all_flights[$id]['id'] = $recent_ident;
912
+					$this->all_flights[$id]['addedSpotter'] = 1;
913 913
 				}
914 914
 				if (isset($globalDaemon) && !$globalDaemon) {
915
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
915
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
916 916
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
917
-					    $Spotter = new Spotter($this->db);
918
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
919
-					    $Spotter->db = null;
917
+						$Spotter = new Spotter($this->db);
918
+						$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
919
+						$Spotter->db = null;
920
+					}
920 921
 					}
921
-				    }
922 922
 				}
923 923
 				
924
-			    }
924
+				}
925 925
 			}
926
-		    }
927
-		    //adds the spotter LIVE data
928
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
929
-		    //echo "\nAdd in Live !! \n";
930
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
931
-		    if ($globalDebug) {
926
+			}
927
+			//adds the spotter LIVE data
928
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
929
+			//echo "\nAdd in Live !! \n";
930
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
931
+			if ($globalDebug) {
932 932
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
933 933
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
934 934
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
@@ -936,60 +936,60 @@  discard block
 block discarded – undo
936 936
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
937 937
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
938 938
 			}
939
-		    }
940
-		    $ignoreImport = false;
941
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
942
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
939
+			}
940
+			$ignoreImport = false;
941
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
942
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
943 943
 
944
-		    foreach($globalAirportIgnore as $airportIgnore) {
945
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
946
-			    $ignoreImport = true;
944
+			foreach($globalAirportIgnore as $airportIgnore) {
945
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
946
+				$ignoreImport = true;
947
+			}
947 948
 			}
948
-		    }
949
-		    if (count($globalAirportAccept) > 0) {
950
-		        $ignoreImport = true;
951
-		        foreach($globalAirportIgnore as $airportIgnore) {
952
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
949
+			if (count($globalAirportAccept) > 0) {
950
+				$ignoreImport = true;
951
+				foreach($globalAirportIgnore as $airportIgnore) {
952
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
953 953
 				$ignoreImport = false;
954
-			    }
954
+				}
955 955
 			}
956
-		    }
957
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
956
+			}
957
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
958 958
 			foreach($globalAirlineIgnore as $airlineIgnore) {
959
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
959
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
960 960
 				$ignoreImport = true;
961
-			    }
961
+				}
962 962
 			}
963
-		    }
964
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
963
+			}
964
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
965 965
 			$ignoreImport = true;
966 966
 			foreach($globalAirlineAccept as $airlineAccept) {
967
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
967
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
968 968
 				$ignoreImport = false;
969
-			    }
969
+				}
970
+			}
970 971
 			}
971
-		    }
972
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
972
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
973 973
 			$ignoreImport = true;
974 974
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
975
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
976
-			        $ignoreImport = false;
977
-			    }
975
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
976
+					$ignoreImport = false;
977
+				}
978
+			}
978 979
 			}
979
-		    }
980 980
 
981
-		    if (!$ignoreImport) {
981
+			if (!$ignoreImport) {
982 982
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
983 983
 				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
984 984
 				$timeelapsed = microtime(true);
985 985
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
986
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
986
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
987 987
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
988 988
 					$SpotterLive = new SpotterLive($this->db);
989 989
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
990 990
 					$SpotterLive->db = null;
991 991
 					if ($globalDebug) echo $result."\n";
992
-				    }
992
+					}
993 993
 				}
994 994
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
995 995
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
 				//if ($line['format_source'] != 'aprs') {
1002 1002
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
1003 1003
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
1004
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
1004
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
1005 1005
 					$source = $this->all_flights[$id]['source_name'];
1006 1006
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
1007 1007
 					if (!isset($this->source_location[$source])) {
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
 					if ($stats_heading == 16) $stats_heading = 0;
1028 1028
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1029 1029
 						for ($i=0;$i<=15;$i++) {
1030
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
1030
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
1031 1031
 						}
1032 1032
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
1033 1033
 					} else {
@@ -1040,17 +1040,17 @@  discard block
 block discarded – undo
1040 1040
 					//var_dump($this->stats);
1041 1041
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
1042 1042
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1043
-						    end($this->stats[$current_date][$source]['hist']);
1044
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1043
+							end($this->stats[$current_date][$source]['hist']);
1044
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
1045 1045
 						} else $mini = 0;
1046 1046
 						for ($i=$mini;$i<=$distance;$i+=10) {
1047
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1047
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
1048 1048
 						}
1049 1049
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
1050 1050
 					} else {
1051 1051
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
1052 1052
 					}
1053
-				    }
1053
+					}
1054 1054
 				}
1055 1055
 
1056 1056
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -1060,7 +1060,7 @@  discard block
 block discarded – undo
1060 1060
 			//$this->del();
1061 1061
 			
1062 1062
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
1063
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1063
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1064 1064
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1065 1065
 				$SpotterLive = new SpotterLive($this->db);
1066 1066
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -1068,19 +1068,19 @@  discard block
 block discarded – undo
1068 1068
 				//SpotterLive->deleteLiveSpotterData();
1069 1069
 				if ($globalDebug) echo " Done\n";
1070 1070
 				$this->last_delete_hourly = time();
1071
-			    } else {
1071
+				} else {
1072 1072
 				$this->del();
1073 1073
 				$this->last_delete_hourly = time();
1074
-			    }
1074
+				}
1075 1075
 			}
1076 1076
 			
1077
-		    }
1078
-		    //$ignoreImport = false;
1077
+			}
1078
+			//$ignoreImport = false;
1079 1079
 		}
1080 1080
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
1081 1081
 		if ($send) return $this->all_flights[$id];
1082
-	    }
1082
+		}
1083
+	}
1083 1084
 	}
1084
-    }
1085 1085
 }
1086 1086
 ?>
Please login to merge, or discard this patch.
Spacing   +156 added lines, -156 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@  discard block
 block discarded – undo
34 34
 		$currentdate = date('Y-m-d');
35 35
 		$sourcestat = $Stats->getStatsSource($currentdate);
36 36
 		if (!empty($sourcestat)) {
37
-		    foreach($sourcestat as $srcst) {
37
+		    foreach ($sourcestat as $srcst) {
38 38
 		    	$type = $srcst['stats_type'];
39 39
 			if ($type == 'polar' || $type == 'hist') {
40 40
 			    $source = $srcst['source_name'];
41 41
 			    $data = $srcst['source_data'];
42
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
43 43
 	    		}
44 44
 		    }
45 45
 		}
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
 	if (isset($globalGeoid) && $globalGeoid) {
52 52
 		try {
53 53
 			$GeoidClass = new GeoidHeight();
54
-		} catch(Exception $e) {
54
+		} catch (Exception $e) {
55 55
 			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
56 56
 			$GeoidClass = FALSE;
57 57
 		}
58 58
 	}
59 59
     }
60 60
 
61
-    public function get_Schedule($id,$ident) {
61
+    public function get_Schedule($id, $ident) {
62 62
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
63 63
 	// Get schedule here, so it's done only one time
64 64
 	
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 		$schedule = $Schedule->fetchSchedule($operator);
84 84
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85 85
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
86
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
87
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
88 88
 		    // Should also check if route schedule = route from DB
89 89
 		    if ($schedule['DepartureAirportIATA'] != '') {
90 90
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 			    }
105 105
 			}
106 106
 		    }
107
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
107
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
108 108
 		}
109 109
 	    } else $scheduleexist = true;
110 110
 	} else $scheduleexist = true;
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
        if ($scheduleexist) {
113 113
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
114 114
     		$sch = $Schedule->getSchedule($operator);
115
-		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
116
-		if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']);
115
+		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time']));
116
+		if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'], $sch['departure_airport_icao'], $sch['departure_airport_time'], $sch['arrival_airport_icao'], $sch['arrival_airport_time']);
117 117
        }
118 118
 	$Spotter->db = null;
119 119
 	$Schedule->db = null;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
141 141
     		    $Spotter = new Spotter($this->db);
142 142
         	    $real_arrival = $this->arrival($key);
143
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
143
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
144 144
         	}
145 145
 	    }
146 146
 	}
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         $airport_time = '';
155 155
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
156 156
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
157
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
157
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
158 158
     	    if (isset($closestAirports[0])) {
159 159
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
160 160
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         		    break;
170 170
         		}
171 171
         	    }
172
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
172
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
173 173
         		$airport_icao = $closestAirports[0]['icao'];
174 174
         		$airport_time = $this->all_flights[$key]['datetime'];
175 175
         	} else {
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         } else {
183 183
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
184 184
         }
185
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
185
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
186 186
     }
187 187
 
188 188
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 	
195 195
 	foreach ($this->all_flights as $key => $flight) {
196 196
 		if (isset($flight['lastupdate'])) {
197
-			if ($flight['lastupdate'] < (time()-1800)) {
197
+			if ($flight['lastupdate'] < (time() - 1800)) {
198 198
 				$this->delKey($key);
199 199
 			}
200 200
 		}
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 			$Spotter = new Spotter($this->db);
212 212
 			$SpotterLive = new SpotterLive($this->db);
213 213
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
214
-				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
214
+				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
215 215
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
216 216
 				$this->all_flights[$key]['putinarchive'] = true;
217
-				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'],$this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'],$this->all_flights[$key]['route_stop'],$this->all_flights[$key]['hex'],$this->all_flights[$key]['putinarchive'],$this->all_flights[$key]['registration'],$this->all_flights[$key]['pilot_id'],$this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'],$this->all_flights[$key]['format_source'],$this->all_flights[$key]['source_name'],$this->all_flights[$key]['over_country']);
217
+				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'], $this->all_flights[$key]['route_stop'], $this->all_flights[$key]['hex'], $this->all_flights[$key]['putinarchive'], $this->all_flights[$key]['registration'], $this->all_flights[$key]['pilot_id'], $this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['format_source'], $this->all_flights[$key]['source_name'], $this->all_flights[$key]['over_country']);
218 218
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
219 219
 			}
220 220
 			$Spotter->db = null;
@@ -250,10 +250,10 @@  discard block
 block discarded – undo
250 250
 	$send = false;
251 251
 	
252 252
 	// SBS format is CSV format
253
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
253
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
254 254
 	    //print_r($line);
255 255
 	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
256
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
256
+  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'], 0, 1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
257 257
 
258 258
 		// Increment message number
259 259
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
@@ -286,25 +286,25 @@  discard block
 block discarded – undo
286 286
 		if (!isset($this->all_flights[$id])) {
287 287
 		    if ($globalDebug) echo 'New flight...'."\n";
288 288
 		    $this->all_flights[$id] = array();
289
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
290
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
291
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
289
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
290
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => ''));
291
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
292 292
 		    if (!isset($line['id'])) {
293 293
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
294 294
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
295 295
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
296
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
296
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
297 297
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
298
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
298
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
299 299
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
300 300
 		}
301 301
 		if (isset($line['source_type']) && $line['source_type'] != '') {
302
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
302
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
303 303
 		}
304 304
 		
305 305
 		//print_r($this->all_flights);
306 306
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
307
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
307
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
308 308
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
309 309
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
310 310
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -313,20 +313,20 @@  discard block
 block discarded – undo
313 313
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
314 314
 			    $Spotter = new Spotter($this->db);
315 315
 			    if (isset($this->all_flights[$id]['source_type'])) {
316
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
316
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
317 317
 			    } else {
318 318
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
319 319
 			    }
320 320
 			    $Spotter->db = null;
321
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
322
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
321
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
322
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
323 323
 			}
324 324
 		    }
325 325
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
326 326
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
327 327
 		}
328 328
 	        if (isset($line['id']) && !isset($line['hex'])) {
329
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
329
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => ''));
330 330
 	        }
331 331
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
332 332
 			$icao = $line['aircraft_icao'];
@@ -335,14 +335,14 @@  discard block
 block discarded – undo
335 335
 				if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
336 336
 				$Spotter->db = null;
337 337
 			}
338
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
338
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
339 339
 		} elseif (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
340 340
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
341 341
 				// Get aircraft ICAO from aircraft name
342 342
 				$Spotter = new Spotter($this->db);
343 343
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
344 344
 				$Spotter->db = null;
345
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
345
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
346 346
 			}
347 347
 		}
348 348
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -350,15 +350,15 @@  discard block
 block discarded – undo
350 350
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
351 351
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
352 352
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
353
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
353
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
354 354
 		}
355 355
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
356
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
356
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
357 357
 		}
358 358
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
359
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
359
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
360 360
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
361
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
361
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
362 362
 		    } else {
363 363
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
364 364
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
@@ -369,31 +369,31 @@  discard block
 block discarded – undo
369 369
 				*/
370 370
 				return '';
371 371
 		    }
372
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
372
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
373 373
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
374 374
 			return '';
375
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
375
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
376 376
 			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
377 377
 			return '';
378 378
 		} elseif (!isset($line['datetime'])) {
379 379
 			date_default_timezone_set('UTC');
380
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
380
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
381 381
 		} else {
382 382
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
383 383
 			return '';
384 384
 		}
385 385
 
386 386
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG' && $line['registration'] != 'NA') {
387
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
387
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
388 388
 		}
389 389
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
390
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
390
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
391 391
 		}
392 392
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
393
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
393
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id'])));
394 394
 		}
395 395
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
396
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
396
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name'])));
397 397
 		}
398 398
  
399 399
 		if (isset($line['ident']) && trim($line['ident']) != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
@@ -401,13 +401,13 @@  discard block
 block discarded – undo
401 401
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
402 402
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
403 403
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
404
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
405
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
406
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
407
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
408
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
404
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
405
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
406
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
407
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
408
+				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
409 409
 			} else {
410
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
410
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
411 411
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
412 412
 				$timeelapsed = microtime(true);
413 413
             			$Spotter = new Spotter($this->db);
@@ -417,13 +417,13 @@  discard block
 block discarded – undo
417 417
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
418 418
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
419 419
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
420
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
420
+            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
421 421
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
422 422
 				$Spotter->db = null;
423
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
423
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
424 424
 			    }
425 425
 			}
426
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
426
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
427 427
 		    
428 428
 /*
429 429
 		    if (!isset($line['id'])) {
@@ -433,25 +433,25 @@  discard block
 block discarded – undo
433 433
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
434 434
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
435 435
   */
436
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
436
+		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
437 437
 
438 438
 		    //$putinarchive = true;
439 439
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
440
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
440
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
441 441
 		    }
442 442
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
443
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
443
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
444 444
 		    }
445 445
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
446
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
446
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
447 447
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
448 448
 			$timeelapsed = microtime(true);
449 449
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
450 450
 				$Spotter = new Spotter($this->db);
451 451
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
452 452
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
453
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
454
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
453
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
454
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
455 455
                         }
456 456
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
457 457
 			$timeelapsed = microtime(true);
@@ -465,35 +465,35 @@  discard block
 block discarded – undo
465 465
 				$Translation->db = null;
466 466
 			    }
467 467
 			    $Spotter->db = null;
468
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
468
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
469 469
                     	}
470 470
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
471 471
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
472 472
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
473 473
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
474
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
474
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop']));
475 475
 		    	    }
476 476
 			}
477 477
 			if (!isset($globalFork)) $globalFork = TRUE;
478 478
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
479
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
479
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
480 480
 			}
481 481
 		    }
482 482
 		}
483 483
 
484 484
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
485 485
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
486
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
487
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
486
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
487
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
488 488
 		    //$dataFound = true;
489 489
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
490
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
490
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
491 491
 		    if ($distance > 1000 && $distance < 10000) {
492 492
 		    // use datetime
493 493
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
494 494
 			$speed = $speed*3.6;
495 495
 			if ($speed < 1000) {
496
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
496
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
497 497
 	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
498 498
 	  		} else {
499 499
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
@@ -508,9 +508,9 @@  discard block
 block discarded – undo
508 508
 	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
509 509
 	    	    	return false;
510 510
 	    	    }
511
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
511
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
512 512
 	    	    else unset($timediff);
513
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
513
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']);
514 514
 	    	    else unset($timediff_archive);
515 515
 	    	    if ($this->tmd > 5
516 516
 	    	        || (isset($line['format_source']) 
@@ -535,14 +535,14 @@  discard block
 block discarded – undo
535 535
 	    	    	|| ($timediff > 30 
536 536
 	    	    	    && isset($this->all_flights[$id]['latitude']) 
537 537
 	    	    	    && isset($this->all_flights[$id]['longitude']) 
538
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
538
+	    	    	    && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'))
539 539
 	    	    	    )
540 540
 	    	    	) {
541 541
 
542 542
 			if ((isset($timediff) && !isset($timediff_archive)) || (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude']))) {
543 543
 			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
544 544
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
545
-				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
545
+				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
546 546
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
547 547
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
548 548
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -552,11 +552,11 @@  discard block
 block discarded – undo
552 552
 				    $timeelapsed = microtime(true);
553 553
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
554 554
 					$Spotter = new Spotter($this->db);
555
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
555
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
556 556
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
557 557
 					else $this->all_flights[$id]['over_country'] = '';
558 558
 					$Spotter->db = null;
559
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
559
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
560 560
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
561 561
 				    }
562 562
 				}
@@ -582,13 +582,13 @@  discard block
 block discarded – undo
582 582
 					$this->all_flights[$id]['time_last_coord'] = time();
583 583
 				}
584 584
 				//if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
585
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
585
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) {
586 586
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
587 587
 				    $dataFound = true;
588 588
 				    $this->all_flights[$id]['time_last_coord'] = time();
589 589
 				}
590 590
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
591
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
591
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
592 592
 				/*
593 593
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
594 594
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -610,13 +610,13 @@  discard block
 block discarded – undo
610 610
 					$this->all_flights[$id]['time_last_coord'] = time();
611 611
 				}
612 612
 				//if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
613
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
613
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) {
614 614
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
615 615
 				    $dataFound = true;
616 616
 				    $this->all_flights[$id]['time_last_coord'] = time();
617 617
 				}
618 618
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
619
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
619
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
620 620
 				/*
621 621
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
622 622
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -634,46 +634,46 @@  discard block
 block discarded – undo
634 634
 		    } else if ($globalDebug && $timediff > 30) {
635 635
 			$this->tmd = $this->tmd + 1;
636 636
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
637
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
638
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
637
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
638
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
639 639
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
640 640
 		    }
641 641
 		}
642 642
 		if (isset($line['last_update']) && $line['last_update'] != '') {
643 643
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
644
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
644
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
645 645
 		}
646 646
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
647
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
647
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
648 648
 		    //$dataFound = true;
649 649
 		}
650 650
 		if (isset($line['format_source']) && $line['format_source'] != '') {
651
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
651
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
652 652
 		}
653 653
 		if (isset($line['source_name']) && $line['source_name'] != '') {
654
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
654
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
655 655
 		}
656 656
 		if (isset($line['emergency']) && $line['emergency'] != '') {
657
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
657
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
658 658
 		    //$dataFound = true;
659 659
 		}
660 660
 		if (isset($line['ground']) && $line['ground'] != '') {
661 661
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
662 662
 			// Here we force archive of flight because after ground it's a new one (or should be)
663
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
664
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
665
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
666
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
667
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
663
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
664
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
665
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
666
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
667
+			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
668 668
 		    }
669 669
 		    if ($line['ground'] != 1) $line['ground'] = 0;
670
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
670
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
671 671
 		    //$dataFound = true;
672 672
 		}
673 673
 		if (isset($line['squawk']) && $line['squawk'] != '') {
674 674
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
675 675
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
676
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
676
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
677 677
 			    $highlight = '';
678 678
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
679 679
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -682,66 +682,66 @@  discard block
 block discarded – undo
682 682
 				$timeelapsed = microtime(true);
683 683
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
684 684
 				    $Spotter = new Spotter($this->db);
685
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
685
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
686 686
 				    $Spotter->db = null;
687
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
687
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
688 688
 				}
689 689
 				//$putinarchive = true;
690 690
 				//$highlight = '';
691 691
 			    }
692 692
 			    
693
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
693
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
694 694
 		    //$dataFound = true;
695 695
 		}
696 696
 
697 697
 		if (isset($line['altitude']) && $line['altitude'] != '') {
698 698
 			if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) {
699 699
 				if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') {
700
-					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2);
700
+					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2);
701 701
 					//if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n";
702 702
 					$line['altitude'] = $line['altitude'] - $geoid;
703 703
 				}
704 704
 			}
705 705
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
706
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
707
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
708
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
706
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
707
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
708
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
709 709
 			//$dataFound = true;
710 710
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
711 711
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
712 712
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
713 713
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
714
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
715
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
716
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
717
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
718
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
714
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
715
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
716
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
717
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
718
+				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
719 719
 			}
720 720
 		    }
721
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
721
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude']));
722 722
 		}
723 723
 
724 724
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
725
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
725
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
726 726
 		}
727 727
 		
728 728
 		if (isset($line['heading']) && $line['heading'] != '') {
729
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
730
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
731
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
729
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
730
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
731
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
732 732
 		    //$dataFound = true;
733 733
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
734
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
735
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
736
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
734
+  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
735
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
736
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
737 737
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
738 738
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
739 739
   		    // If not enough messages and ACARS set heading to 0
740
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
740
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
741 741
   		}
742
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
743
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
744
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
742
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
743
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
744
+		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
745 745
 
746 746
 //		print_r($this->all_flights[$id]);
747 747
 		//gets the callsign from the last hour
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
753 753
 		    $this->all_flights[$id]['lastupdate'] = time();
754 754
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
755
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
755
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
756 756
 			    //print_r($this->all_flights);
757 757
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
758 758
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -763,61 +763,61 @@  discard block
 block discarded – undo
763 763
 				    $SpotterLive = new SpotterLive($this->db);
764 764
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
765 765
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
766
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
766
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
767 767
 				    } elseif (isset($line['id'])) {
768 768
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
769
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
769
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
770 770
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
771 771
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
772
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
772
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
773 773
 				    } else $recent_ident = '';
774
-				    $SpotterLive->db=null;
774
+				    $SpotterLive->db = null;
775 775
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
776 776
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
777 777
 				} else $recent_ident = '';
778 778
 			    } else {
779 779
 				$recent_ident = '';
780
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
780
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
781 781
 			    }
782 782
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
783
-			    if($recent_ident == "")
783
+			    if ($recent_ident == "")
784 784
 			    {
785 785
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
786 786
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
787 787
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
788 788
 				//adds the spotter data for the archive
789 789
 				$ignoreImport = false;
790
-				foreach($globalAirportIgnore as $airportIgnore) {
790
+				foreach ($globalAirportIgnore as $airportIgnore) {
791 791
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
792 792
 					$ignoreImport = true;
793 793
 				    }
794 794
 				}
795 795
 				if (count($globalAirportAccept) > 0) {
796 796
 				    $ignoreImport = true;
797
-				    foreach($globalAirportIgnore as $airportIgnore) {
797
+				    foreach ($globalAirportIgnore as $airportIgnore) {
798 798
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
799 799
 					    $ignoreImport = false;
800 800
 					}
801 801
 				    }
802 802
 				}
803 803
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
804
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
805
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
804
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
805
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
806 806
 					    $ignoreImport = true;
807 807
 					}
808 808
 				    }
809 809
 				}
810 810
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
811 811
 				    $ignoreImport = true;
812
-				    foreach($globalAirlineAccept as $airlineAccept) {
813
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
812
+				    foreach ($globalAirlineAccept as $airlineAccept) {
813
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
814 814
 					    $ignoreImport = false;
815 815
 					}
816 816
 				    }
817 817
 				}
818 818
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
819 819
 				    $ignoreImport = true;
820
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
820
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
821 821
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
822 822
 					    $ignoreImport = false;
823 823
 					}
@@ -829,12 +829,12 @@  discard block
 block discarded – undo
829 829
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
830 830
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
831 831
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
832
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
832
+				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
833 833
 				    $timeelapsed = microtime(true);
834 834
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
835 835
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
836 836
 					    $Spotter = new Spotter($this->db);
837
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
837
+					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']);
838 838
 					    $Spotter->db = null;
839 839
 					    if ($globalDebug) {
840 840
 						if (isset($result['error'])) echo 'Error: '.$result['error']."\n";
@@ -847,22 +847,22 @@  discard block
 block discarded – undo
847 847
 					    }
848 848
 					}
849 849
 				    }
850
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
850
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
851 851
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
852 852
 
853 853
 				    // Add source stat in DB
854 854
 				    $Stats = new Stats($this->db);
855 855
 				    if (!empty($this->stats)) {
856 856
 					if ($globalDebug) echo 'Add source stats : ';
857
-				        foreach($this->stats as $date => $data) {
858
-					    foreach($data as $source => $sourced) {
857
+				        foreach ($this->stats as $date => $data) {
858
+					    foreach ($data as $source => $sourced) {
859 859
 					        //print_r($sourced);
860
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
861
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
860
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
861
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
862 862
 				    		if (isset($sourced['msg'])) {
863 863
 				    		    if (time() - $sourced['msg']['date'] > 10) {
864 864
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
865
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
865
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
866 866
 			    			        unset($this->stats[$date][$source]['msg']);
867 867
 			    			    }
868 868
 			    			}
@@ -900,14 +900,14 @@  discard block
 block discarded – undo
900 900
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
901 901
 					    $SpotterLive = new SpotterLive($this->db);
902 902
 					    $SpotterLive->deleteLiveSpotterData();
903
-					    $SpotterLive->db=null;
903
+					    $SpotterLive->db = null;
904 904
 					}
905 905
 				    }
906 906
 				    if ($globalDebug) echo " Done\n";
907 907
 				    $this->last_delete = time();
908 908
 				}
909 909
 			    } else {
910
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
910
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
911 911
 				    $this->all_flights[$id]['id'] = $recent_ident;
912 912
 				    $this->all_flights[$id]['addedSpotter'] = 1;
913 913
 				}
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
916 916
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
917 917
 					    $Spotter = new Spotter($this->db);
918
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
918
+					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
919 919
 					    $Spotter->db = null;
920 920
 					}
921 921
 				    }
@@ -941,37 +941,37 @@  discard block
 block discarded – undo
941 941
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
942 942
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
943 943
 
944
-		    foreach($globalAirportIgnore as $airportIgnore) {
944
+		    foreach ($globalAirportIgnore as $airportIgnore) {
945 945
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
946 946
 			    $ignoreImport = true;
947 947
 			}
948 948
 		    }
949 949
 		    if (count($globalAirportAccept) > 0) {
950 950
 		        $ignoreImport = true;
951
-		        foreach($globalAirportIgnore as $airportIgnore) {
951
+		        foreach ($globalAirportIgnore as $airportIgnore) {
952 952
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
953 953
 				$ignoreImport = false;
954 954
 			    }
955 955
 			}
956 956
 		    }
957 957
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
958
-			foreach($globalAirlineIgnore as $airlineIgnore) {
959
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
958
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
959
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
960 960
 				$ignoreImport = true;
961 961
 			    }
962 962
 			}
963 963
 		    }
964 964
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
965 965
 			$ignoreImport = true;
966
-			foreach($globalAirlineAccept as $airlineAccept) {
967
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
966
+			foreach ($globalAirlineAccept as $airlineAccept) {
967
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
968 968
 				$ignoreImport = false;
969 969
 			    }
970 970
 			}
971 971
 		    }
972 972
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
973 973
 			$ignoreImport = true;
974
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
974
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
975 975
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
976 976
 			        $ignoreImport = false;
977 977
 			    }
@@ -979,23 +979,23 @@  discard block
 block discarded – undo
979 979
 		    }
980 980
 
981 981
 		    if (!$ignoreImport) {
982
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
983
-				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
982
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
983
+				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
984 984
 				$timeelapsed = microtime(true);
985 985
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
986 986
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
987 987
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
988 988
 					$SpotterLive = new SpotterLive($this->db);
989
-					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
989
+					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
990 990
 					$SpotterLive->db = null;
991 991
 					if ($globalDebug) echo $result."\n";
992 992
 				    }
993 993
 				}
994 994
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
995
-					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
995
+					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
996 996
 				}
997 997
 				$this->all_flights[$id]['putinarchive'] = false;
998
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
998
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
999 999
 
1000 1000
 				// Put statistics in $this->stats variable
1001 1001
 				//if ($line['format_source'] != 'aprs') {
@@ -1014,19 +1014,19 @@  discard block
 block discarded – undo
1014 1014
 							$latitude = $globalCenterLatitude;
1015 1015
 							$longitude = $globalCenterLongitude;
1016 1016
 						}
1017
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
1017
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
1018 1018
 					} else {
1019 1019
 						$latitude = $this->source_location[$source]['latitude'];
1020 1020
 						$longitude = $this->source_location[$source]['longitude'];
1021 1021
 					}
1022
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1022
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
1023 1023
 					//$stats_heading = $stats_heading%22.5;
1024 1024
 					$stats_heading = round($stats_heading/22.5);
1025
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1025
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
1026 1026
 					$current_date = date('Y-m-d');
1027 1027
 					if ($stats_heading == 16) $stats_heading = 0;
1028 1028
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1029
-						for ($i=0;$i<=15;$i++) {
1029
+						for ($i = 0; $i <= 15; $i++) {
1030 1030
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
1031 1031
 						}
1032 1032
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -1041,9 +1041,9 @@  discard block
 block discarded – undo
1041 1041
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
1042 1042
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1043 1043
 						    end($this->stats[$current_date][$source]['hist']);
1044
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1044
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
1045 1045
 						} else $mini = 0;
1046
-						for ($i=$mini;$i<=$distance;$i+=10) {
1046
+						for ($i = $mini; $i <= $distance; $i += 10) {
1047 1047
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1048 1048
 						}
1049 1049
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -1056,7 +1056,7 @@  discard block
 block discarded – undo
1056 1056
 				$this->all_flights[$id]['lastupdate'] = time();
1057 1057
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
1058 1058
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1059
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1059
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
1060 1060
 			//$this->del();
1061 1061
 			
1062 1062
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
Please login to merge, or discard this patch.
Braces   +418 added lines, -149 removed lines patch added patch discarded remove patch
@@ -52,7 +52,9 @@  discard block
 block discarded – undo
52 52
 		try {
53 53
 			$GeoidClass = new GeoidHeight();
54 54
 		} catch(Exception $e) {
55
-			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
55
+			if ($globalDebug) {
56
+				echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
57
+			}
56 58
 			$GeoidClass = FALSE;
57 59
 		}
58 60
 	}
@@ -71,7 +73,9 @@  discard block
 block discarded – undo
71 73
 	$dbc = $this->db;
72 74
 	$this->all_flights[$id]['schedule_check'] = true;
73 75
 	if ($globalSchedulesFetch) {
74
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
76
+	if ($globalDebug) {
77
+		echo 'Getting schedule info...'."\n";
78
+	}
75 79
 	$Spotter = new Spotter($dbc);
76 80
 	$Schedule = new Schedule($dbc);
77 81
 	$Translation = new Translation($dbc);
@@ -82,7 +86,9 @@  discard block
 block discarded – undo
82 86
 	    if ($Schedule->checkSchedule($operator) == 0) {
83 87
 		$schedule = $Schedule->fetchSchedule($operator);
84 88
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
89
+		    if ($globalDebug) {
90
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
91
+		    }
86 92
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87 93
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88 94
 		    // Should also check if route schedule = route from DB
@@ -91,7 +97,9 @@  discard block
 block discarded – undo
91 97
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92 98
 			    if (trim($airport_icao) != '') {
93 99
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
94
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
100
+				if ($globalDebug) {
101
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
102
+				}
95 103
 			    }
96 104
 			}
97 105
 		    }
@@ -100,20 +108,30 @@  discard block
 block discarded – undo
100 108
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101 109
 			    if (trim($airport_icao) != '') {
102 110
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
103
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
111
+				if ($globalDebug) {
112
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
113
+				}
104 114
 			    }
105 115
 			}
106 116
 		    }
107 117
 		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
108 118
 		}
109
-	    } else $scheduleexist = true;
110
-	} else $scheduleexist = true;
119
+	    } else {
120
+	    	$scheduleexist = true;
121
+	    }
122
+	} else {
123
+		$scheduleexist = true;
124
+	}
111 125
 	// close connection, at least one way will work ?
112 126
        if ($scheduleexist) {
113
-		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
127
+		if ($globalDebug) {
128
+			echo "-> get arrival/departure airport info for ".$ident."\n";
129
+		}
114 130
     		$sch = $Schedule->getSchedule($operator);
115 131
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
116
-		if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']);
132
+		if ($this->all_flights[$id]['addedSpotter'] == 1) {
133
+			$Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']);
134
+		}
117 135
        }
118 136
 	$Spotter->db = null;
119 137
 	$Schedule->db = null;
@@ -133,14 +151,18 @@  discard block
 block discarded – undo
133 151
 
134 152
     public function checkAll() {
135 153
 	global $globalDebug, $globalNoImport;
136
-	if ($globalDebug) echo "Update last seen flights data...\n";
154
+	if ($globalDebug) {
155
+		echo "Update last seen flights data...\n";
156
+	}
137 157
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
138 158
 	    foreach ($this->all_flights as $key => $flight) {
139 159
 		if (isset($this->all_flights[$key]['id'])) {
140 160
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
141 161
     		    $Spotter = new Spotter($this->db);
142 162
         	    $real_arrival = $this->arrival($key);
143
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
163
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) {
164
+        	    	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
165
+        	    }
144 166
         	}
145 167
 	    }
146 168
 	}
@@ -148,24 +170,32 @@  discard block
 block discarded – undo
148 170
 
149 171
     public function arrival($key) {
150 172
 	global $globalClosestMinDist, $globalDebug;
151
-	if ($globalDebug) echo 'Update arrival...'."\n";
173
+	if ($globalDebug) {
174
+		echo 'Update arrival...'."\n";
175
+	}
152 176
 	$Spotter = new Spotter($this->db);
153 177
         $airport_icao = '';
154 178
         $airport_time = '';
155
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
179
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
180
+        	$globalClosestMinDist = 50;
181
+        }
156 182
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
157 183
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
158 184
     	    if (isset($closestAirports[0])) {
159 185
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
160 186
         	    $airport_icao = $closestAirports[0]['icao'];
161 187
         	    $airport_time = $this->all_flights[$key]['datetime'];
162
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
188
+        	    if ($globalDebug) {
189
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
190
+        	    }
163 191
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
164 192
         	    foreach ($closestAirports as $airport) {
165 193
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
166 194
         		    $airport_icao = $airport['icao'];
167 195
         		    $airport_time = $this->all_flights[$key]['datetime'];
168
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
196
+        		    if ($globalDebug) {
197
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
198
+        		    }
169 199
         		    break;
170 200
         		}
171 201
         	    }
@@ -173,14 +203,20 @@  discard block
 block discarded – undo
173 203
         		$airport_icao = $closestAirports[0]['icao'];
174 204
         		$airport_time = $this->all_flights[$key]['datetime'];
175 205
         	} else {
176
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
206
+        		if ($globalDebug) {
207
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
208
+        		}
177 209
         	}
178 210
     	    } else {
179
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
211
+    		    if ($globalDebug) {
212
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
213
+    		    }
180 214
     	    }
181 215
 
182 216
         } else {
183
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
217
+        	if ($globalDebug) {
218
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
219
+        	}
184 220
         }
185 221
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
186 222
     }
@@ -190,7 +226,9 @@  discard block
 block discarded – undo
190 226
     public function del() {
191 227
 	global $globalDebug, $globalNoImport, $globalNoDB;
192 228
 	// Delete old infos
193
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
229
+	if ($globalDebug) {
230
+		echo 'Delete old values and update latest data...'."\n";
231
+	}
194 232
 	
195 233
 	foreach ($this->all_flights as $key => $flight) {
196 234
 		if (isset($flight['lastupdate'])) {
@@ -205,22 +243,30 @@  discard block
 block discarded – undo
205 243
 	global $globalDebug, $globalNoImport, $globalNoDB;
206 244
 	// Delete old infos
207 245
 	if (isset($this->all_flights[$key]['id'])) {
208
-		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
246
+		if ($globalDebug) {
247
+			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
248
+		}
209 249
 		if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
210 250
 			$real_arrival = $this->arrival($key);
211 251
 			$Spotter = new Spotter($this->db);
212 252
 			$SpotterLive = new SpotterLive($this->db);
213 253
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
214 254
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
215
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
255
+				if ($globalDebug && $result != 'success') {
256
+					echo '!!! ERROR : '.$result."\n";
257
+				}
216 258
 				$this->all_flights[$key]['putinarchive'] = true;
217 259
 				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'],$this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'],$this->all_flights[$key]['route_stop'],$this->all_flights[$key]['hex'],$this->all_flights[$key]['putinarchive'],$this->all_flights[$key]['registration'],$this->all_flights[$key]['pilot_id'],$this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'],$this->all_flights[$key]['format_source'],$this->all_flights[$key]['source_name'],$this->all_flights[$key]['over_country']);
218
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
260
+				if ($globalDebug && $result != 'success') {
261
+					echo '!!! ERROR : '.$result."\n";
262
+				}
219 263
 			}
220 264
 			$Spotter->db = null;
221 265
 			$SpotterLive->db = null;
222 266
 		}
223
-		if ($globalDebug) echo "\n";
267
+		if ($globalDebug) {
268
+			echo "\n";
269
+		}
224 270
 	}
225 271
 	unset($this->all_flights[$key]);
226 272
     }
@@ -228,9 +274,13 @@  discard block
 block discarded – undo
228 274
     public function add($line) {
229 275
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass, $globalArchive;
230 276
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
231
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01';
232
-	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 3000;
233
-/*
277
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
278
+		$globalCoordMinChange = '0.01';
279
+	}
280
+	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') {
281
+		$globalAircraftMaxUpdate = 3000;
282
+	}
283
+	/*
234 284
 	$Spotter = new Spotter();
235 285
 	$dbc = $Spotter->db;
236 286
 	$SpotterLive = new SpotterLive($dbc);
@@ -252,19 +302,28 @@  discard block
 block discarded – undo
252 302
 	// SBS format is CSV format
253 303
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
254 304
 	    //print_r($line);
255
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
305
+	    if (isset($line['hex'])) {
306
+	    	$line['hex'] = strtoupper($line['hex']);
307
+	    }
256 308
   	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
257 309
 
258 310
 		// Increment message number
259 311
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
260 312
 		    $current_date = date('Y-m-d');
261
-		    if (isset($line['source_name'])) $source = $line['source_name'];
262
-		    else $source = '';
263
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
313
+		    if (isset($line['source_name'])) {
314
+		    	$source = $line['source_name'];
315
+		    } else {
316
+		    	$source = '';
317
+		    }
318
+		    if ($source == '' || $line['format_source'] == 'aprs') {
319
+		    	$source = $line['format_source'];
320
+		    }
264 321
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
265 322
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
266 323
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
267
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
324
+		    } else {
325
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
326
+		    }
268 327
 		}
269 328
 		
270 329
 		/*
@@ -280,23 +339,38 @@  discard block
 block discarded – undo
280 339
 		//$this->db = $dbc;
281 340
 
282 341
 		//$hex = trim($line['hex']);
283
-	        if (!isset($line['id'])) $id = trim($line['hex']);
284
-	        else $id = trim($line['id']);
342
+	        if (!isset($line['id'])) {
343
+	        	$id = trim($line['hex']);
344
+	        } else {
345
+	        	$id = trim($line['id']);
346
+	        }
285 347
 		
286 348
 		if (!isset($this->all_flights[$id])) {
287
-		    if ($globalDebug) echo 'New flight...'."\n";
349
+		    if ($globalDebug) {
350
+		    	echo 'New flight...'."\n";
351
+		    }
288 352
 		    $this->all_flights[$id] = array();
289 353
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
290 354
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
291
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
355
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) {
356
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
357
+		    }
292 358
 		    if (!isset($line['id'])) {
293
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
294
-//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
359
+			if (!isset($globalDaemon)) {
360
+				$globalDaemon = TRUE;
361
+			}
362
+			//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
295 363
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
296
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
364
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
365
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
366
+			}
297 367
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
298
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
299
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
368
+		     } else {
369
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
370
+		     }
371
+		    if ($globalAllFlights !== FALSE) {
372
+		    	$dataFound = true;
373
+		    }
300 374
 		}
301 375
 		if (isset($line['source_type']) && $line['source_type'] != '') {
302 376
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
@@ -318,12 +392,20 @@  discard block
 block discarded – undo
318 392
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
319 393
 			    }
320 394
 			    $Spotter->db = null;
321
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
322
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
395
+			    if ($globalDebugTimeElapsed) {
396
+			    	echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
397
+			    }
398
+			    if ($aircraft_icao != '') {
399
+			    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
400
+			    }
323 401
 			}
324 402
 		    }
325
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
326
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
403
+		    if ($globalAllFlights !== FALSE) {
404
+		    	$dataFound = true;
405
+		    }
406
+		    if ($globalDebug) {
407
+		    	echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
408
+		    }
327 409
 		}
328 410
 	        if (isset($line['id']) && !isset($line['hex'])) {
329 411
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
@@ -332,7 +414,9 @@  discard block
 block discarded – undo
332 414
 			$icao = $line['aircraft_icao'];
333 415
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
334 416
 				$Spotter = new Spotter($this->db);
335
-				if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
417
+				if (isset($Spotter->aircraft_correct_icaotype[$icao])) {
418
+					$icao = $Spotter->aircraft_correct_icaotype[$icao];
419
+				}
336 420
 				$Spotter->db = null;
337 421
 			}
338 422
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
@@ -342,15 +426,24 @@  discard block
 block discarded – undo
342 426
 				$Spotter = new Spotter($this->db);
343 427
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
344 428
 				$Spotter->db = null;
345
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
429
+				if ($aircraft_icao != '') {
430
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
431
+				}
346 432
 			}
347 433
 		}
348 434
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
349
-			if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
350
-			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
351
-			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
352
-			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
353
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
435
+			if ($line['aircraft_type'] == 'PARA_GLIDER') {
436
+				$aircraft_icao = 'GLID';
437
+			} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
438
+				$aircraft_icao = 'UHEL';
439
+			} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
440
+				$aircraft_icao = 'TOWPLANE';
441
+			} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
442
+				$aircraft_icao = 'POWAIRC';
443
+			}
444
+			if (isset($aircraft_icao)) {
445
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
446
+			}
354 447
 		}
355 448
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
356 449
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
@@ -360,8 +453,11 @@  discard block
 block discarded – undo
360 453
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
361 454
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
362 455
 		    } else {
363
-				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
364
-				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
456
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
457
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
458
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
459
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
460
+				}
365 461
 				/*
366 462
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
367 463
 				print_r($this->all_flights[$id]);
@@ -370,16 +466,22 @@  discard block
 block discarded – undo
370 466
 				return '';
371 467
 		    }
372 468
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
373
-			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
469
+			if ($globalDebug) {
470
+				echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
471
+			}
374 472
 			return '';
375 473
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
376
-			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
474
+			if ($globalDebug) {
475
+				echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
476
+			}
377 477
 			return '';
378 478
 		} elseif (!isset($line['datetime'])) {
379 479
 			date_default_timezone_set('UTC');
380 480
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
381 481
 		} else {
382
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
482
+			if ($globalDebug) {
483
+				echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
484
+			}
383 485
 			return '';
384 486
 		}
385 487
 
@@ -400,30 +502,48 @@  discard block
 block discarded – undo
400 502
 
401 503
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
402 504
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
403
-				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
505
+				if ($globalDebug) {
506
+					echo '---!!!! New ident, reset aircraft data...'."\n";
507
+				}
404 508
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
405 509
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
406
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
407
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
408
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
510
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
511
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
512
+				} elseif (isset($line['id'])) {
513
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
514
+				} elseif (isset($this->all_flights[$id]['ident'])) {
515
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
516
+				}
409 517
 			} else {
410 518
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
411 519
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
412 520
 				$timeelapsed = microtime(true);
413 521
             			$Spotter = new Spotter($this->db);
414 522
             			$fromsource = NULL;
415
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
416
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
417
-				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
418
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
419
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
523
+            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
524
+            				$fromsource = $globalAirlinesSource;
525
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
526
+            				$fromsource = 'vatsim';
527
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
528
+					$fromsource = 'ivao';
529
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
530
+					$fromsource = 'vatsim';
531
+				} elseif (isset($globalIVAO) && $globalIVAO) {
532
+					$fromsource = 'ivao';
533
+				}
420 534
             			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
421
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
535
+				if ($globalDebug && $result != 'success') {
536
+					echo '!!! ERROR : '.$result."\n";
537
+				}
422 538
 				$Spotter->db = null;
423
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
539
+				if ($globalDebugTimeElapsed) {
540
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
541
+				}
424 542
 			    }
425 543
 			}
426
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
544
+		    } else {
545
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
546
+		    }
427 547
 		    
428 548
 /*
429 549
 		    if (!isset($line['id'])) {
@@ -433,7 +553,9 @@  discard block
 block discarded – undo
433 553
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
434 554
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
435 555
   */
436
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
556
+		    if (!isset($this->all_flights[$id]['id'])) {
557
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
558
+		    }
437 559
 
438 560
 		    //$putinarchive = true;
439 561
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -451,7 +573,9 @@  discard block
 block discarded – undo
451 573
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
452 574
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
453 575
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
454
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
576
+				if ($globalDebugTimeElapsed) {
577
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
578
+				}
455 579
                         }
456 580
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
457 581
 			$timeelapsed = microtime(true);
@@ -465,7 +589,9 @@  discard block
 block discarded – undo
465 589
 				$Translation->db = null;
466 590
 			    }
467 591
 			    $Spotter->db = null;
468
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
592
+			    if ($globalDebugTimeElapsed) {
593
+			    	echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
594
+			    }
469 595
                     	}
470 596
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
471 597
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -474,9 +600,13 @@  discard block
 block discarded – undo
474 600
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
475 601
 		    	    }
476 602
 			}
477
-			if (!isset($globalFork)) $globalFork = TRUE;
603
+			if (!isset($globalFork)) {
604
+				$globalFork = TRUE;
605
+			}
478 606
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
479
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
607
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
608
+					$this->get_Schedule($id,trim($line['ident']));
609
+				}
480 610
 			}
481 611
 		    }
482 612
 		}
@@ -494,9 +624,13 @@  discard block
 block discarded – undo
494 624
 			$speed = $speed*3.6;
495 625
 			if ($speed < 1000) {
496 626
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
497
-	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
627
+	  			if ($globalDebug) {
628
+	  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
629
+	  			}
498 630
 	  		} else {
499
-	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
631
+	  			if ($globalDebug) {
632
+	  				echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
633
+	  			}
500 634
 	  		}
501 635
 		    }
502 636
 		}
@@ -505,13 +639,21 @@  discard block
 block discarded – undo
505 639
 
506 640
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
507 641
 	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
508
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
642
+	    	    	if ($globalDebug) {
643
+	    	    		echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
644
+	    	    	}
509 645
 	    	    	return false;
510 646
 	    	    }
511
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
512
-	    	    else unset($timediff);
513
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
514
-	    	    else unset($timediff_archive);
647
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
648
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
649
+	    	    } else {
650
+	    	    	unset($timediff);
651
+	    	    }
652
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) {
653
+	    	    	$timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
654
+	    	    } else {
655
+	    	    	unset($timediff_archive);
656
+	    	    }
515 657
 	    	    if ($this->tmd > 5
516 658
 	    	        || (isset($line['format_source']) 
517 659
 	    	    	    && $line['format_source'] == 'airwhere' 
@@ -548,16 +690,25 @@  discard block
 block discarded – undo
548 690
 				$this->all_flights[$id]['putinarchive'] = true;
549 691
 				$this->tmd = 0;
550 692
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
551
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
693
+				    if ($globalDebug) {
694
+				    	echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
695
+				    }
552 696
 				    $timeelapsed = microtime(true);
553 697
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
554 698
 					$Spotter = new Spotter($this->db);
555 699
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
556
-					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
557
-					else $this->all_flights[$id]['over_country'] = '';
700
+					if (!empty($all_country)) {
701
+						$this->all_flights[$id]['over_country'] = $all_country['iso2'];
702
+					} else {
703
+						$this->all_flights[$id]['over_country'] = '';
704
+					}
558 705
 					$Spotter->db = null;
559
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
560
-					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
706
+					if ($globalDebugTimeElapsed) {
707
+						echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
708
+					}
709
+					if ($globalDebug) {
710
+						echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
711
+					}
561 712
 				    }
562 713
 				}
563 714
 				$this->all_flights[$id]['time_last_archive_coord'] = time();
@@ -603,7 +754,9 @@  discard block
 block discarded – undo
603 754
 			    */
604 755
 			}
605 756
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
606
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
757
+			    if ($line['longitude'] > 180) {
758
+			    	$line['longitude'] = $line['longitude'] - 360;
759
+			    }
607 760
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
608 761
 				if (!isset($this->all_flights[$id]['archive_longitude'])) {
609 762
 					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -640,7 +793,9 @@  discard block
 block discarded – undo
640 793
 		    }
641 794
 		}
642 795
 		if (isset($line['last_update']) && $line['last_update'] != '') {
643
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
796
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
797
+		    	$dataFound = true;
798
+		    }
644 799
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
645 800
 		}
646 801
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -662,35 +817,53 @@  discard block
 block discarded – undo
662 817
 			// Here we force archive of flight because after ground it's a new one (or should be)
663 818
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
664 819
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
665
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
666
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
667
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
820
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
821
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
822
+			} elseif (isset($line['id'])) {
823
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
824
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
825
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
826
+			}
827
+		    }
828
+		    if ($line['ground'] != 1) {
829
+		    	$line['ground'] = 0;
668 830
 		    }
669
-		    if ($line['ground'] != 1) $line['ground'] = 0;
670 831
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
671 832
 		    //$dataFound = true;
672 833
 		}
673 834
 		if (isset($line['squawk']) && $line['squawk'] != '') {
674 835
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
675
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
836
+			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) {
837
+			    	$this->all_flights[$id]['putinarchive'] = true;
838
+			    }
676 839
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
677 840
 			    $highlight = '';
678
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
679
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
680
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
841
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
842
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
843
+			    }
844
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
845
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
846
+			    }
847
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
848
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
849
+			    }
681 850
 			    if ($highlight != '') {
682 851
 				$timeelapsed = microtime(true);
683 852
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
684 853
 				    $Spotter = new Spotter($this->db);
685 854
 				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
686 855
 				    $Spotter->db = null;
687
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
856
+				    if ($globalDebugTimeElapsed) {
857
+				    	echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
858
+				    }
688 859
 				}
689 860
 				//$putinarchive = true;
690 861
 				//$highlight = '';
691 862
 			    }
692 863
 			    
693
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
864
+		    } else {
865
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
866
+		    }
694 867
 		    //$dataFound = true;
695 868
 		}
696 869
 
@@ -703,19 +876,27 @@  discard block
 block discarded – undo
703 876
 				}
704 877
 			}
705 878
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
706
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
879
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) {
880
+				$this->all_flights[$id]['putinarchive'] = true;
881
+			}
707 882
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
708 883
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
709 884
 			//$dataFound = true;
710 885
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
711 886
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
712 887
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
713
-				if ($globalDebug) echo '--- Reset because of altitude'."\n";
888
+				if ($globalDebug) {
889
+					echo '--- Reset because of altitude'."\n";
890
+				}
714 891
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
715 892
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
716
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
717
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
718
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
893
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
894
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
895
+				} elseif (isset($line['id'])) {
896
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
897
+				} elseif (isset($this->all_flights[$id]['ident'])) {
898
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
899
+				}
719 900
 			}
720 901
 		    }
721 902
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
@@ -726,22 +907,32 @@  discard block
 block discarded – undo
726 907
 		}
727 908
 		
728 909
 		if (isset($line['heading']) && $line['heading'] != '') {
729
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
910
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) {
911
+		    	$this->all_flights[$id]['putinarchive'] = true;
912
+		    }
730 913
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
731 914
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
732 915
 		    //$dataFound = true;
733 916
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
734 917
   		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
735 918
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
736
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
737
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
919
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) {
920
+		    	$this->all_flights[$id]['putinarchive'] = true;
921
+		    }
922
+  		    if ($globalDebug) {
923
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
924
+  		    }
738 925
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
739 926
   		    // If not enough messages and ACARS set heading to 0
740 927
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
741 928
   		}
742
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
743
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
744
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
929
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
930
+			$dataFound = false;
931
+		} elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
932
+			$dataFound = false;
933
+		} elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) {
934
+			$dataFound = false;
935
+		}
745 936
 
746 937
 //		print_r($this->all_flights[$id]);
747 938
 		//gets the callsign from the last hour
@@ -758,23 +949,38 @@  discard block
 block discarded – undo
758 949
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
759 950
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
760 951
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
761
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
952
+				    if ($globalDebug) {
953
+				    	echo "Check if aircraft is already in DB...";
954
+				    }
762 955
 				    $timeelapsed = microtime(true);
763 956
 				    $SpotterLive = new SpotterLive($this->db);
764 957
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
765 958
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
766
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
959
+					if ($globalDebugTimeElapsed) {
960
+						echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
961
+					}
767 962
 				    } elseif (isset($line['id'])) {
768 963
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
769
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
964
+					if ($globalDebugTimeElapsed) {
965
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
966
+					}
770 967
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
771 968
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
772
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
773
-				    } else $recent_ident = '';
969
+					if ($globalDebugTimeElapsed) {
970
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
971
+					}
972
+				    } else {
973
+				    	$recent_ident = '';
974
+				    }
774 975
 				    $SpotterLive->db=null;
775
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
776
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
777
-				} else $recent_ident = '';
976
+				    if ($globalDebug && $recent_ident == '') {
977
+				    	echo " Not in DB.\n";
978
+				    } elseif ($globalDebug && $recent_ident != '') {
979
+				    	echo " Already in DB.\n";
980
+				    }
981
+				} else {
982
+					$recent_ident = '';
983
+				}
778 984
 			    } else {
779 985
 				$recent_ident = '';
780 986
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -782,7 +988,9 @@  discard block
 block discarded – undo
782 988
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
783 989
 			    if($recent_ident == "")
784 990
 			    {
785
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
991
+				if ($globalDebug) {
992
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
993
+				}
786 994
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
787 995
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
788 996
 				//adds the spotter data for the archive
@@ -826,10 +1034,18 @@  discard block
 block discarded – undo
826 1034
 				
827 1035
 				if (!$ignoreImport) {
828 1036
 				    $highlight = '';
829
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
830
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
831
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
832
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1037
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
1038
+				    	$highlight = 'Squawk 7500 : Hijack';
1039
+				    }
1040
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
1041
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
1042
+				    }
1043
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
1044
+				    	$highlight = 'Squawk 7700 : Emergency';
1045
+				    }
1046
+				    if (!isset($this->all_flights[$id]['id'])) {
1047
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1048
+				    }
833 1049
 				    $timeelapsed = microtime(true);
834 1050
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
835 1051
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -837,28 +1053,43 @@  discard block
 block discarded – undo
837 1053
 					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
838 1054
 					    $Spotter->db = null;
839 1055
 					    if ($globalDebug) {
840
-						if (isset($result['error'])) echo 'Error: '.$result['error']."\n";
841
-						else echo 'Success';
1056
+						if (isset($result['error'])) {
1057
+							echo 'Error: '.$result['error']."\n";
1058
+						} else {
1059
+							echo 'Success';
1060
+						}
842 1061
 					    }
843 1062
 					    if (count($result) > 1) {
844 1063
 					    // ':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,
845
-						if ($this->all_flights[$id]['aircraft_icao'] == '') $this->all_flights[$id]['aircraft_icao'] = $result[':aircraft_icao'];
846
-						if ($this->all_flights[$id]['registration'] == '') $this->all_flights[$id]['registration'] = $result[':registration'];
1064
+						if ($this->all_flights[$id]['aircraft_icao'] == '') {
1065
+							$this->all_flights[$id]['aircraft_icao'] = $result[':aircraft_icao'];
1066
+						}
1067
+						if ($this->all_flights[$id]['registration'] == '') {
1068
+							$this->all_flights[$id]['registration'] = $result[':registration'];
1069
+						}
847 1070
 					    }
848 1071
 					}
849 1072
 				    }
850
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1073
+				    if ($globalDebugTimeElapsed) {
1074
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1075
+				    }
851 1076
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
852 1077
 
853 1078
 				    // Add source stat in DB
854 1079
 				    $Stats = new Stats($this->db);
855 1080
 				    if (!empty($this->stats)) {
856
-					if ($globalDebug) echo 'Add source stats : ';
1081
+					if ($globalDebug) {
1082
+						echo 'Add source stats : ';
1083
+					}
857 1084
 				        foreach($this->stats as $date => $data) {
858 1085
 					    foreach($data as $source => $sourced) {
859 1086
 					        //print_r($sourced);
860
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
861
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
1087
+				    	        if (isset($sourced['polar'])) {
1088
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
1089
+				    	        }
1090
+				    	        if (isset($sourced['hist'])) {
1091
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
1092
+				    	        }
862 1093
 				    		if (isset($sourced['msg'])) {
863 1094
 				    		    if (time() - $sourced['msg']['date'] > 10) {
864 1095
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -871,13 +1102,17 @@  discard block
 block discarded – undo
871 1102
 			    			unset($this->stats[$date]);
872 1103
 			    		    }
873 1104
 				    	}
874
-				    	if ($globalDebug) echo 'Done'."\n";
1105
+				    	if ($globalDebug) {
1106
+				    		echo 'Done'."\n";
1107
+				    	}
875 1108
 
876 1109
 				    }
877 1110
 				    $Stats->db = null;
878 1111
 				    }
879 1112
 				    $this->del();
880
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
1113
+				} elseif ($globalDebug) {
1114
+					echo 'Ignore data'."\n";
1115
+				}
881 1116
 				//$ignoreImport = false;
882 1117
 				$this->all_flights[$id]['addedSpotter'] = 1;
883 1118
 				//print_r($this->all_flights[$id]);
@@ -894,7 +1129,9 @@  discard block
 block discarded – undo
894 1129
 			*/
895 1130
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
896 1131
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
897
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
1132
+				    if ($globalDebug) {
1133
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
1134
+				    }
898 1135
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
899 1136
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
900 1137
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -903,7 +1140,9 @@  discard block
 block discarded – undo
903 1140
 					    $SpotterLive->db=null;
904 1141
 					}
905 1142
 				    }
906
-				    if ($globalDebug) echo " Done\n";
1143
+				    if ($globalDebug) {
1144
+				    	echo " Done\n";
1145
+				    }
907 1146
 				    $this->last_delete = time();
908 1147
 				}
909 1148
 			    } else {
@@ -930,11 +1169,17 @@  discard block
 block discarded – undo
930 1169
 		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
931 1170
 		    if ($globalDebug) {
932 1171
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
933
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
934
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
1172
+				if (isset($this->all_flights[$id]['source_name'])) {
1173
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
1174
+				} else {
1175
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
1176
+				}
935 1177
 			} else {
936
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
937
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
1178
+				if (isset($this->all_flights[$id]['source_name'])) {
1179
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
1180
+				} else {
1181
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
1182
+				}
938 1183
 			}
939 1184
 		    }
940 1185
 		    $ignoreImport = false;
@@ -980,22 +1225,30 @@  discard block
 block discarded – undo
980 1225
 
981 1226
 		    if (!$ignoreImport) {
982 1227
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
983
-				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1228
+				if (!isset($this->all_flights[$id]['id'])) {
1229
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1230
+				}
984 1231
 				$timeelapsed = microtime(true);
985 1232
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
986 1233
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
987
-					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1234
+					if ($globalDebug) {
1235
+						echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1236
+					}
988 1237
 					$SpotterLive = new SpotterLive($this->db);
989 1238
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
990 1239
 					$SpotterLive->db = null;
991
-					if ($globalDebug) echo $result."\n";
1240
+					if ($globalDebug) {
1241
+						echo $result."\n";
1242
+					}
992 1243
 				    }
993 1244
 				}
994 1245
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
995 1246
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
996 1247
 				}
997 1248
 				$this->all_flights[$id]['putinarchive'] = false;
998
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1249
+				if ($globalDebugTimeElapsed) {
1250
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1251
+				}
999 1252
 
1000 1253
 				// Put statistics in $this->stats variable
1001 1254
 				//if ($line['format_source'] != 'aprs') {
@@ -1003,7 +1256,9 @@  discard block
 block discarded – undo
1003 1256
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
1004 1257
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
1005 1258
 					$source = $this->all_flights[$id]['source_name'];
1006
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
1259
+					if ($source == '') {
1260
+						$source = $this->all_flights[$id]['format_source'];
1261
+					}
1007 1262
 					if (!isset($this->source_location[$source])) {
1008 1263
 						$Location = new Source($this->db);
1009 1264
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -1024,7 +1279,9 @@  discard block
 block discarded – undo
1024 1279
 					$stats_heading = round($stats_heading/22.5);
1025 1280
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1026 1281
 					$current_date = date('Y-m-d');
1027
-					if ($stats_heading == 16) $stats_heading = 0;
1282
+					if ($stats_heading == 16) {
1283
+						$stats_heading = 0;
1284
+					}
1028 1285
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1029 1286
 						for ($i=0;$i<=15;$i++) {
1030 1287
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -1042,7 +1299,9 @@  discard block
 block discarded – undo
1042 1299
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1043 1300
 						    end($this->stats[$current_date][$source]['hist']);
1044 1301
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1045
-						} else $mini = 0;
1302
+						} else {
1303
+							$mini = 0;
1304
+						}
1046 1305
 						for ($i=$mini;$i<=$distance;$i+=10) {
1047 1306
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1048 1307
 						}
@@ -1054,19 +1313,27 @@  discard block
 block discarded – undo
1054 1313
 				}
1055 1314
 
1056 1315
 				$this->all_flights[$id]['lastupdate'] = time();
1057
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
1316
+				if ($this->all_flights[$id]['putinarchive']) {
1317
+					$send = true;
1318
+				}
1058 1319
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1059
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1320
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
1321
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1322
+			}
1060 1323
 			//$this->del();
1061 1324
 			
1062 1325
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
1063 1326
 			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1064
-				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1327
+				if ($globalDebug) {
1328
+					echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1329
+				}
1065 1330
 				$SpotterLive = new SpotterLive($this->db);
1066 1331
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
1067 1332
 				$SpotterLive->db = null;
1068 1333
 				//SpotterLive->deleteLiveSpotterData();
1069
-				if ($globalDebug) echo " Done\n";
1334
+				if ($globalDebug) {
1335
+					echo " Done\n";
1336
+				}
1070 1337
 				$this->last_delete_hourly = time();
1071 1338
 			    } else {
1072 1339
 				$this->del();
@@ -1078,7 +1345,9 @@  discard block
 block discarded – undo
1078 1345
 		    //$ignoreImport = false;
1079 1346
 		}
1080 1347
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
1081
-		if ($send) return $this->all_flights[$id];
1348
+		if ($send) {
1349
+			return $this->all_flights[$id];
1350
+		}
1082 1351
 	    }
1083 1352
 	}
1084 1353
     }
Please login to merge, or discard this patch.