View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 64b871...55f75d )
by Yannick
11:40
created
Status
Category
Toggle Patches
install/class.update_schema.php 1 patch
Indentation   +634 added lines, -634 removed lines patch added patch discarded remove patch 
@@ -8,18 +8,18 @@  discard block
 
 block discarded – undo
8 8 
 class update_schema {
9 9
10 10 
 	public static function update_schedule() {
11 
-	    $Connection = new Connection();
12 
-	    $Schedule = new Schedule();
13 
-	    $query = "SELECT * FROM schedule";
14 
-            try {
15 
-            	$sth = $Connection->db->prepare($query);
11 
+		$Connection = new Connection();
12 
+		$Schedule = new Schedule();
13 
+		$query = "SELECT * FROM schedule";
14 
+			try {
15 
+				$sth = $Connection->db->prepare($query);
16 16 
 		$sth->execute();
17 
-    	    } catch(PDOException $e) {
17 
+			} catch(PDOException $e) {
18 18 
 		return "error : ".$e->getMessage()."\n";
19 
-    	    }
20 
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22 
-    	    }
19 
+			}
20 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22 
+			}
23 23
24 24 
 	}
25 25 
 /*
 
@@ -43,198 +43,198 @@  discard block
 
 block discarded – undo
43 43 
     	}
44 44 
 */
45 45 
 	private static function update_from_1() {
46 
-    		$Connection = new Connection();
47 
-    		// Add new column to routes table
48 
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
46 
+			$Connection = new Connection();
47 
+			// Add new column to routes table
48 
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
49 49 
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
50 
-        	try {
51 
-            	    $sth = $Connection->db->prepare($query);
52 
-		    $sth->execute();
53 
-    		} catch(PDOException $e) {
54 
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 
-    		}
56 
-    		// Copy schedules data to routes table
57 
-    		self::update_schedule();
58 
-    		// Delete schedule table
50 
+			try {
51 
+					$sth = $Connection->db->prepare($query);
52 
+			$sth->execute();
53 
+			} catch(PDOException $e) {
54 
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 
+			}
56 
+			// Copy schedules data to routes table
57 
+			self::update_schedule();
58 
+			// Delete schedule table
59 59 
 		$query = "DROP TABLE `schedule`";
60 
-        	try {
61 
-            	    $sth = $Connection->db->prepare($query);
62 
-		    $sth->execute();
63 
-    		} catch(PDOException $e) {
64 
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65 
-    		}
66 
-    		// Add source column
67 
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68 
-    		try {
69 
-            	    $sth = $Connection->db->prepare($query);
70 
-		    $sth->execute();
71 
-    		} catch(PDOException $e) {
72 
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 
-    		}
60 
+			try {
61 
+					$sth = $Connection->db->prepare($query);
62 
+			$sth->execute();
63 
+			} catch(PDOException $e) {
64 
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
65 
+			}
66 
+			// Add source column
67 
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68 
+			try {
69 
+					$sth = $Connection->db->prepare($query);
70 
+			$sth->execute();
71 
+			} catch(PDOException $e) {
72 
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 
+			}
74 74 
 		// Delete unused column
75 75 
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
76 
-    		try {
77 
-            	    $sth = $Connection->db->prepare($query);
78 
-		    $sth->execute();
79 
-    		} catch(PDOException $e) {
80 
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 
-    		}
76 
+			try {
77 
+					$sth = $Connection->db->prepare($query);
78 
+			$sth->execute();
79 
+			} catch(PDOException $e) {
80 
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 
+			}
82 82 
 		// Add ModeS column
83 83 
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
84 
-    		try {
85 
-            	    $sth = $Connection->db->prepare($query);
86 
-		    $sth->execute();
87 
-    		} catch(PDOException $e) {
88 
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 
-    		}
84 
+			try {
85 
+					$sth = $Connection->db->prepare($query);
86 
+			$sth->execute();
87 
+			} catch(PDOException $e) {
88 
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 
+			}
90 90 
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91 
-    		try {
92 
-            	    $sth = $Connection->db->prepare($query);
93 
-		    $sth->execute();
94 
-    		} catch(PDOException $e) {
95 
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 
-    		}
97 
-    		// Add auto_increment for aircraft_modes
98 
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99 
-    		try {
100 
-            	    $sth = $Connection->db->prepare($query);
101 
-		    $sth->execute();
102 
-    		} catch(PDOException $e) {
103 
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 
-    		}
105 
-    		$error = '';
91 
+			try {
92 
+					$sth = $Connection->db->prepare($query);
93 
+			$sth->execute();
94 
+			} catch(PDOException $e) {
95 
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 
+			}
97 
+			// Add auto_increment for aircraft_modes
98 
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99 
+			try {
100 
+					$sth = $Connection->db->prepare($query);
101 
+			$sth->execute();
102 
+			} catch(PDOException $e) {
103 
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 
+			}
105 
+			$error = '';
106 106 
 		$error .= create_db::import_file('../db/acars_live.sql');
107 107 
 		$error .= create_db::import_file('../db/config.sql');
108 108 
 		// Update schema_version to 2
109 109 
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
110 
-        	try {
111 
-            	    $sth = $Connection->db->prepare($query);
112 
-		    $sth->execute();
113 
-    		} catch(PDOException $e) {
114 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
115 
-    		}
110 
+			try {
111 
+					$sth = $Connection->db->prepare($query);
112 
+			$sth->execute();
113 
+			} catch(PDOException $e) {
114 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
115 
+			}
116 116 
 		return $error;
117 
-        }
117 
+		}
118 118
119 119 
 	private static function update_from_2() {
120 
-    		$Connection = new Connection();
121 
-    		// Add new column decode to acars_live table
120 
+			$Connection = new Connection();
121 
+			// Add new column decode to acars_live table
122 122 
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
123 
-        	try {
124 
-            	    $sth = $Connection->db->prepare($query);
125 
-		    $sth->execute();
126 
-    		} catch(PDOException $e) {
127 
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 
-    		}
129 
-    		$error = '';
130 
-    		// Create table acars_archive
123 
+			try {
124 
+					$sth = $Connection->db->prepare($query);
125 
+			$sth->execute();
126 
+			} catch(PDOException $e) {
127 
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 
+			}
129 
+			$error = '';
130 
+			// Create table acars_archive
131 131 
 		$error .= create_db::import_file('../db/acars_archive.sql');
132 132 
 		// Update schema_version to 3
133 133 
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
134 
-        	try {
135 
-            	    $sth = $Connection->db->prepare($query);
136 
-		    $sth->execute();
137 
-    		} catch(PDOException $e) {
138 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
139 
-    		}
134 
+			try {
135 
+					$sth = $Connection->db->prepare($query);
136 
+			$sth->execute();
137 
+			} catch(PDOException $e) {
138 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
139 
+			}
140 140 
 		return $error;
141 141 
 	}
142 142
143 143 
 	private static function update_from_3() {
144 
-    		$Connection = new Connection();
145 
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
144 
+			$Connection = new Connection();
145 
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
146 146 
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
147 
-        	try {
148 
-            	    $sth = $Connection->db->prepare($query);
149 
-		    $sth->execute();
150 
-    		} catch(PDOException $e) {
151 
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 
-    		}
153 
-    		// Add image_source_website column to spotter_image
147 
+			try {
148 
+					$sth = $Connection->db->prepare($query);
149 
+			$sth->execute();
150 
+			} catch(PDOException $e) {
151 
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 
+			}
153 
+			// Add image_source_website column to spotter_image
154 154 
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
155 
-        	try {
156 
-            	    $sth = $Connection->db->prepare($query);
157 
-		    $sth->execute();
158 
-    		} catch(PDOException $e) {
159 
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 
-    		}
161 
-    		$error = '';
155 
+			try {
156 
+					$sth = $Connection->db->prepare($query);
157 
+			$sth->execute();
158 
+			} catch(PDOException $e) {
159 
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 
+			}
161 
+			$error = '';
162 162 
 		// Update schema_version to 4
163 163 
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
164 
-        	try {
165 
-            	    $sth = $Connection->db->prepare($query);
166 
-		    $sth->execute();
167 
-    		} catch(PDOException $e) {
168 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
169 
-    		}
164 
+			try {
165 
+					$sth = $Connection->db->prepare($query);
166 
+			$sth->execute();
167 
+			} catch(PDOException $e) {
168 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
169 
+			}
170 170 
 		return $error;
171 171 
 	}
172 172
173 173 
 	private static function update_from_4() {
174 
-    		$Connection = new Connection();
174 
+			$Connection = new Connection();
175 175
176 
-    		$error = '';
177 
-    		// Create table acars_label
176 
+			$error = '';
177 
+			// Create table acars_label
178 178 
 		$error .= create_db::import_file('../db/acars_label.sql');
179 179 
 		if ($error == '') {
180 
-		    // Update schema_version to 5
181 
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182 
-        	    try {
183 
-            		$sth = $Connection->db->prepare($query);
180 
+			// Update schema_version to 5
181 
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182 
+				try {
183 
+					$sth = $Connection->db->prepare($query);
184 184 
 			$sth->execute();
185 
-    		    } catch(PDOException $e) {
185 
+				} catch(PDOException $e) {
186 186 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187 
-    		    }
188 
-    		}
187 
+				}
188 
+			}
189 189 
 		return $error;
190 190 
 	}
191 191
192 192 
 	private static function update_from_5() {
193 
-    		$Connection = new Connection();
194 
-    		// Add columns to translation
193 
+			$Connection = new Connection();
194 
+			// Add columns to translation
195 195 
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
196 
-        	try {
197 
-            	    $sth = $Connection->db->prepare($query);
198 
-		    $sth->execute();
199 
-    		} catch(PDOException $e) {
200 
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 
-    		}
202 
-    		// Add aircraft_shadow column to aircraft
203 
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204 
-        	try {
205 
-            	    $sth = $Connection->db->prepare($query);
206 
-		    $sth->execute();
207 
-    		} catch(PDOException $e) {
208 
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 
-    		}
210 
-    		// Add aircraft_shadow column to spotter_live
211 
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212 
-        	try {
213 
-            	    $sth = $Connection->db->prepare($query);
214 
-		    $sth->execute();
215 
-    		} catch(PDOException $e) {
216 
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 
-    		}
218 
-    		$error = '';
219 
-    		// Update table aircraft
196 
+			try {
197 
+					$sth = $Connection->db->prepare($query);
198 
+			$sth->execute();
199 
+			} catch(PDOException $e) {
200 
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 
+			}
202 
+			// Add aircraft_shadow column to aircraft
203 
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204 
+			try {
205 
+					$sth = $Connection->db->prepare($query);
206 
+			$sth->execute();
207 
+			} catch(PDOException $e) {
208 
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 
+			}
210 
+			// Add aircraft_shadow column to spotter_live
211 
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212 
+			try {
213 
+					$sth = $Connection->db->prepare($query);
214 
+			$sth->execute();
215 
+			} catch(PDOException $e) {
216 
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 
+			}
218 
+			$error = '';
219 
+			// Update table aircraft
220 220 
 		$error .= create_db::import_file('../db/aircraft.sql');
221 221 
 		$error .= create_db::import_file('../db/spotter_archive.sql');
222 222
223 223 
 		// Update schema_version to 6
224 224 
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
225 
-        	try {
226 
-            	    $sth = $Connection->db->prepare($query);
227 
-		    $sth->execute();
228 
-    		} catch(PDOException $e) {
229 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
230 
-    		}
225 
+			try {
226 
+					$sth = $Connection->db->prepare($query);
227 
+			$sth->execute();
228 
+			} catch(PDOException $e) {
229 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
230 
+			}
231 231 
 		return $error;
232 232 
 	}
233 233
234 234 
 	private static function update_from_6() {
235 
-    		$Connection = new Connection();
236 
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237 
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
235 
+			$Connection = new Connection();
236 
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237 
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238 
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239 
 			ALTER TABLE spotter_output ADD INDEX(ident);
240 240 
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
 
@@ -247,147 +247,147 @@  discard block
 
 block discarded – undo
247 247 
 			ALTER TABLE aircraft ADD INDEX(icao);
248 248 
 			ALTER TABLE airport ADD INDEX(icao);
249 249 
 			ALTER TABLE translation ADD INDEX(Operator);";
250 
-        	    try {
251 
-            		$sth = $Connection->db->prepare($query);
250 
+				try {
251 
+					$sth = $Connection->db->prepare($query);
252 252 
 			$sth->execute();
253 
-    		    } catch(PDOException $e) {
253 
+				} catch(PDOException $e) {
254 254 
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255 
-    		    }
256 
-    		}
257 
-    		$error = '';
258 
-    		// Update table countries
259 
-    		if ($Connection->tableExists('airspace')) {
260 
-    		    $error .= update_db::update_countries();
261 
-		    if ($error != '') return $error;
255 
+				}
256 
+			}
257 
+			$error = '';
258 
+			// Update table countries
259 
+			if ($Connection->tableExists('airspace')) {
260 
+				$error .= update_db::update_countries();
261 
+			if ($error != '') return $error;
262 262 
 		}
263 263 
 		// Update schema_version to 7
264 264 
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
265 
-        	try {
266 
-            	    $sth = $Connection->db->prepare($query);
267 
-		    $sth->execute();
268 
-    		} catch(PDOException $e) {
269 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
270 
-    		}
265 
+			try {
266 
+					$sth = $Connection->db->prepare($query);
267 
+			$sth->execute();
268 
+			} catch(PDOException $e) {
269 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
270 
+			}
271 271 
 		return $error;
272 
-    	}
272 
+		}
273 273
274 274 
 	private static function update_from_7() {
275 275 
 		global $globalDBname, $globalDBdriver;
276 
-    		$Connection = new Connection();
277 
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
276 
+			$Connection = new Connection();
277 
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278 
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279 
-        	try {
280 
-            	    $sth = $Connection->db->prepare($query);
281 
-		    $sth->execute();
282 
-    		} catch(PDOException $e) {
283 
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 
-    		}
285 
-    		if ($globalDBdriver == 'mysql') {
286 
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287 
-		    try {
288 
-            		$sth = $Connection->db->prepare($query);
289 
-			$sth->execute();
290 
-    		    } catch(PDOException $e) {
279 
+			try {
280 
+					$sth = $Connection->db->prepare($query);
281 
+			$sth->execute();
282 
+			} catch(PDOException $e) {
283 
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 
+			}
285 
+			if ($globalDBdriver == 'mysql') {
286 
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287 
+			try {
288 
+					$sth = $Connection->db->prepare($query);
289 
+			$sth->execute();
290 
+				} catch(PDOException $e) {
291 291 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292 
-    		    }
293 
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
294 
-    		    if ($row['engine'] == 'ARCHIVE') {
292 
+				}
293 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
294 
+				if ($row['engine'] == 'ARCHIVE') {
295 295 
 			$query = "CREATE TABLE copy LIKE spotter_archive;
296 296 
 				ALTER TABLE copy ENGINE=ARCHIVE;
297 297 
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
298 298 
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
299 299 
 				DROP TABLE spotter_archive;
300 300 
 				RENAME TABLE copy TO spotter_archive;";
301 
-            	    } else {
302 
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 
-            	    }
304 
-                } else {
305 
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 
-                }
307 
-        	try {
308 
-            	    $sth = $Connection->db->prepare($query);
309 
-		    $sth->execute();
310 
-    		} catch(PDOException $e) {
311 
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 
-    		}
301 
+					} else {
302 
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 
+					}
304 
+				} else {
305 
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 
+				}
307 
+			try {
308 
+					$sth = $Connection->db->prepare($query);
309 
+			$sth->execute();
310 
+			} catch(PDOException $e) {
311 
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 
+			}
313 313
314 
-    		$error = '';
315 
-    		// Update table aircraft
314 
+			$error = '';
315 
+			// Update table aircraft
316 316 
 		$error .= create_db::import_file('../db/source_location.sql');
317 317 
 		if ($error != '') return $error;
318 318 
 		// Update schema_version to 6
319 319 
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 
-        	try {
321 
-            	    $sth = $Connection->db->prepare($query);
322 
-		    $sth->execute();
323 
-    		} catch(PDOException $e) {
324 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
325 
-    		}
320 
+			try {
321 
+					$sth = $Connection->db->prepare($query);
322 
+			$sth->execute();
323 
+			} catch(PDOException $e) {
324 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
325 
+			}
326 326 
 		return $error;
327 327 
 	}
328 328
329 329 
 	private static function update_from_8() {
330 
-    		$Connection = new Connection();
331 
-    		$error = '';
332 
-    		// Update table aircraft
330 
+			$Connection = new Connection();
331 
+			$error = '';
332 
+			// Update table aircraft
333 333 
 		$error .= create_db::import_file('../db/notam.sql');
334 334 
 		if ($error != '') return $error;
335 335 
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 336 
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 337 
                         DELETE FROM config WHERE name = 'last_update_notam_db';
338 338 
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
339 
-        	try {
340 
-            	    $sth = $Connection->db->prepare($query);
341 
-		    $sth->execute();
342 
-    		} catch(PDOException $e) {
343 
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344 
-    		}
339 
+			try {
340 
+					$sth = $Connection->db->prepare($query);
341 
+			$sth->execute();
342 
+			} catch(PDOException $e) {
343 
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
344 
+			}
345 345 
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346 
-        	try {
347 
-            	    $sth = $Connection->db->prepare($query);
348 
-		    $sth->execute();
349 
-    		} catch(PDOException $e) {
350 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
351 
-    		}
346 
+			try {
347 
+					$sth = $Connection->db->prepare($query);
348 
+			$sth->execute();
349 
+			} catch(PDOException $e) {
350 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
351 
+			}
352 352 
 		return $error;
353 353 
 	}
354 354
355 355 
 	private static function update_from_9() {
356 
-    		$Connection = new Connection();
357 
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
356 
+			$Connection = new Connection();
357 
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358 
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359 
-        	try {
360 
-            	    $sth = $Connection->db->prepare($query);
361 
-		    $sth->execute();
362 
-    		} catch(PDOException $e) {
363 
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 
-    		}
359 
+			try {
360 
+					$sth = $Connection->db->prepare($query);
361 
+			$sth->execute();
362 
+			} catch(PDOException $e) {
363 
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 
+			}
365 365 
 		$error = '';
366 
-    		// Update table atc
366 
+			// Update table atc
367 367 
 		$error .= create_db::import_file('../db/atc.sql');
368 368 
 		if ($error != '') return $error;
369 369
370 370 
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 
-        	try {
372 
-            	    $sth = $Connection->db->prepare($query);
373 
-		    $sth->execute();
374 
-    		} catch(PDOException $e) {
375 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
376 
-    		}
371 
+			try {
372 
+					$sth = $Connection->db->prepare($query);
373 
+			$sth->execute();
374 
+			} catch(PDOException $e) {
375 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
376 
+			}
377 377 
 		return $error;
378 378 
 	}
379 379
380 380 
 	private static function update_from_10() {
381 
-    		$Connection = new Connection();
382 
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 
-        	try {
384 
-            	    $sth = $Connection->db->prepare($query);
385 
-		    $sth->execute();
386 
-    		} catch(PDOException $e) {
387 
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 
-    		}
381 
+			$Connection = new Connection();
382 
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 
+			try {
384 
+					$sth = $Connection->db->prepare($query);
385 
+			$sth->execute();
386 
+			} catch(PDOException $e) {
387 
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 
+			}
389 389 
 		$error = '';
390 
-    		// Add tables
390 
+			// Add tables
391 391 
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 392 
 		if ($error != '') return $error;
393 393 
 		$error .= create_db::import_file('../db/metar.sql');
 
@@ -398,76 +398,76 @@  discard block
 
 block discarded – undo
398 398 
 		if ($error != '') return $error;
399 399
400 400 
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 
-        	try {
402 
-            	    $sth = $Connection->db->prepare($query);
403 
-		    $sth->execute();
404 
-    		} catch(PDOException $e) {
405 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
406 
-    		}
401 
+			try {
402 
+					$sth = $Connection->db->prepare($query);
403 
+			$sth->execute();
404 
+			} catch(PDOException $e) {
405 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
406 
+			}
407 407 
 		return $error;
408 408 
 	}
409 409
410 410 
 	private static function update_from_11() {
411 411 
 		global $globalDBdriver, $globalDBname;
412 
-    		$Connection = new Connection();
413 
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 
-        	try {
415 
-            	    $sth = $Connection->db->prepare($query);
416 
-		    $sth->execute();
417 
-    		} catch(PDOException $e) {
418 
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 
-    		}
420 
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 
-        	try {
422 
-            	    $sth = $Connection->db->prepare($query);
423 
-		    $sth->execute();
424 
-    		} catch(PDOException $e) {
425 
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 
-    		}
427 
-    		if ($globalDBdriver == 'mysql') {
428 
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429 
-		    try {
430 
-            		$sth = $Connection->db->prepare($query);
431 
-			$sth->execute();
432 
-    		    } catch(PDOException $e) {
412 
+			$Connection = new Connection();
413 
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 
+			try {
415 
+					$sth = $Connection->db->prepare($query);
416 
+			$sth->execute();
417 
+			} catch(PDOException $e) {
418 
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 
+			}
420 
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 
+			try {
422 
+					$sth = $Connection->db->prepare($query);
423 
+			$sth->execute();
424 
+			} catch(PDOException $e) {
425 
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 
+			}
427 
+			if ($globalDBdriver == 'mysql') {
428 
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429 
+			try {
430 
+					$sth = $Connection->db->prepare($query);
431 
+			$sth->execute();
432 
+				} catch(PDOException $e) {
433 433 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434 
-    		    }
435 
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
436 
-    		    if ($row['engine'] == 'ARCHIVE') {
434 
+				}
435 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
436 
+				if ($row['engine'] == 'ARCHIVE') {
437 437 
 			$query = "CREATE TABLE copy LIKE spotter_archive;
438 438 
 				ALTER TABLE copy ENGINE=ARCHIVE;
439 439 
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
440 440 
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
441 441 
 				DROP TABLE spotter_archive;
442 442 
 				RENAME TABLE copy TO spotter_archive;";
443 
-            	    } else {
444 
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 
-            	    }
446 
-                } else {
447 
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 
-                }
449 
-        	try {
450 
-            	    $sth = $Connection->db->prepare($query);
451 
-		    $sth->execute();
452 
-    		} catch(PDOException $e) {
453 
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 
-    		}
443 
+					} else {
444 
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 
+					}
446 
+				} else {
447 
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 
+				}
449 
+			try {
450 
+					$sth = $Connection->db->prepare($query);
451 
+			$sth->execute();
452 
+			} catch(PDOException $e) {
453 
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 
+			}
455 455
456 456 
 		$error = '';
457 457
458 458 
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
459 
-        	try {
460 
-            	    $sth = $Connection->db->prepare($query);
461 
-		    $sth->execute();
462 
-    		} catch(PDOException $e) {
463 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
464 
-    		}
459 
+			try {
460 
+					$sth = $Connection->db->prepare($query);
461 
+			$sth->execute();
462 
+			} catch(PDOException $e) {
463 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
464 
+			}
465 465 
 		return $error;
466 466 
 	}
467 467 
 	private static function update_from_12() {
468 
-    		$Connection = new Connection();
468 
+			$Connection = new Connection();
469 469 
 		$error = '';
470 
-    		// Add tables
470 
+			// Add tables
471 471 
 		$error .= create_db::import_file('../db/stats.sql');
472 472 
 		if ($error != '') return $error;
473 473 
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
 
@@ -484,166 +484,166 @@  discard block
 
 block discarded – undo
484 484 
 		if ($error != '') return $error;
485 485
486 486 
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 
-        	try {
488 
-            	    $sth = $Connection->db->prepare($query);
489 
-		    $sth->execute();
490 
-    		} catch(PDOException $e) {
491 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
492 
-    		}
487 
+			try {
488 
+					$sth = $Connection->db->prepare($query);
489 
+			$sth->execute();
490 
+			} catch(PDOException $e) {
491 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
492 
+			}
493 493 
 		return $error;
494 494 
 	}
495 495
496 496 
 	private static function update_from_13() {
497 
-    		$Connection = new Connection();
498 
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
497 
+			$Connection = new Connection();
498 
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500 
 			try {
501 501 
 				$sth = $Connection->db->prepare($query);
502 502 
 				$sth->execute();
503 
-	    		} catch(PDOException $e) {
503 
+				} catch(PDOException $e) {
504 504 
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505 
-    			}
505 
+				}
506 506 
 		}
507 
-    		$error = '';
507 
+			$error = '';
508 508 
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
509 
-        	try {
510 
-            	    $sth = $Connection->db->prepare($query);
511 
-		    $sth->execute();
512 
-    		} catch(PDOException $e) {
513 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
514 
-    		}
509 
+			try {
510 
+					$sth = $Connection->db->prepare($query);
511 
+			$sth->execute();
512 
+			} catch(PDOException $e) {
513 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
514 
+			}
515 515 
 		return $error;
516 516 
 	}
517 517
518 518 
 	private static function update_from_14() {
519 
-    		$Connection = new Connection();
519 
+			$Connection = new Connection();
520 520 
 		$error = '';
521 
-    		// Add tables
522 
-    		if (!$Connection->tableExists('stats_flight')) {
521 
+			// Add tables
522 
+			if (!$Connection->tableExists('stats_flight')) {
523 523 
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 524 
 			if ($error != '') return $error;
525 525 
 		}
526 526 
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 
-        	try {
528 
-            	    $sth = $Connection->db->prepare($query);
529 
-		    $sth->execute();
530 
-    		} catch(PDOException $e) {
531 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
532 
-    		}
527 
+			try {
528 
+					$sth = $Connection->db->prepare($query);
529 
+			$sth->execute();
530 
+			} catch(PDOException $e) {
531 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
532 
+			}
533 533 
 		return $error;
534 534 
 	}
535 535
536 536
537 537 
 	private static function update_from_15() {
538 
-    		$Connection = new Connection();
538 
+			$Connection = new Connection();
539 539 
 		$error = '';
540 
-    		// Add tables
541 
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 
-        	try {
543 
-            	    $sth = $Connection->db->prepare($query);
544 
-		    $sth->execute();
545 
-    		} catch(PDOException $e) {
546 
-		    return "error (update stats) : ".$e->getMessage()."\n";
547 
-    		}
540 
+			// Add tables
541 
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 
+			try {
543 
+					$sth = $Connection->db->prepare($query);
544 
+			$sth->execute();
545 
+			} catch(PDOException $e) {
546 
+			return "error (update stats) : ".$e->getMessage()."\n";
547 
+			}
548 548 
 		if ($error != '') return $error;
549 549 
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 
-        	try {
551 
-            	    $sth = $Connection->db->prepare($query);
552 
-		    $sth->execute();
553 
-    		} catch(PDOException $e) {
554 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
555 
-    		}
550 
+			try {
551 
+					$sth = $Connection->db->prepare($query);
552 
+			$sth->execute();
553 
+			} catch(PDOException $e) {
554 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
555 
+			}
556 556 
 		return $error;
557 557 
 	}
558 558
559 559 
 	private static function update_from_16() {
560 
-    		$Connection = new Connection();
560 
+			$Connection = new Connection();
561 561 
 		$error = '';
562 
-    		// Add tables
563 
-    		if (!$Connection->tableExists('stats_registration')) {
562 
+			// Add tables
563 
+			if (!$Connection->tableExists('stats_registration')) {
564 564 
 			$error .= create_db::import_file('../db/stats_registration.sql');
565 565 
 		}
566 
-    		if (!$Connection->tableExists('stats_callsign')) {
566 
+			if (!$Connection->tableExists('stats_callsign')) {
567 567 
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 568 
 		}
569 569 
 		if ($error != '') return $error;
570 570 
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 
-        	try {
572 
-            	    $sth = $Connection->db->prepare($query);
573 
-		    $sth->execute();
574 
-    		} catch(PDOException $e) {
575 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
576 
-    		}
571 
+			try {
572 
+					$sth = $Connection->db->prepare($query);
573 
+			$sth->execute();
574 
+			} catch(PDOException $e) {
575 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
576 
+			}
577 577 
 		return $error;
578 578 
 	}
579 579
580 580 
 	private static function update_from_17() {
581 
-    		$Connection = new Connection();
581 
+			$Connection = new Connection();
582 582 
 		$error = '';
583 
-    		// Add tables
584 
-    		if (!$Connection->tableExists('stats_country')) {
583 
+			// Add tables
584 
+			if (!$Connection->tableExists('stats_country')) {
585 585 
 			$error .= create_db::import_file('../db/stats_country.sql');
586 586 
 		}
587 587 
 		if ($error != '') return $error;
588 588 
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 
-        	try {
590 
-            	    $sth = $Connection->db->prepare($query);
591 
-		    $sth->execute();
592 
-    		} catch(PDOException $e) {
593 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
594 
-    		}
589 
+			try {
590 
+					$sth = $Connection->db->prepare($query);
591 
+			$sth->execute();
592 
+			} catch(PDOException $e) {
593 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
594 
+			}
595 595 
 		return $error;
596 596 
 	}
597 597 
 	private static function update_from_18() {
598 
-    		$Connection = new Connection();
598 
+			$Connection = new Connection();
599 599 
 		$error = '';
600 
-    		// Modify stats_airport table
601 
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602 
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 
-    	        	try {
604 
-	            	    $sth = $Connection->db->prepare($query);
605 
-			    $sth->execute();
606 
-    			} catch(PDOException $e) {
607 
-			    return "error (update stats) : ".$e->getMessage()."\n";
608 
-    			}
609 
-    		}
600 
+			// Modify stats_airport table
601 
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602 
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 
+					try {
604 
+						$sth = $Connection->db->prepare($query);
605 
+				$sth->execute();
606 
+				} catch(PDOException $e) {
607 
+				return "error (update stats) : ".$e->getMessage()."\n";
608 
+				}
609 
+			}
610 610 
 		if ($error != '') return $error;
611 611 
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 
-        	try {
613 
-            	    $sth = $Connection->db->prepare($query);
614 
-		    $sth->execute();
615 
-    		} catch(PDOException $e) {
616 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
617 
-    		}
612 
+			try {
613 
+					$sth = $Connection->db->prepare($query);
614 
+			$sth->execute();
615 
+			} catch(PDOException $e) {
616 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
617 
+			}
618 618 
 		return $error;
619 619 
 	}
620 620
621 621 
 	private static function update_from_19() {
622 
-    		$Connection = new Connection();
622 
+			$Connection = new Connection();
623 623 
 		$error = '';
624 
-    		// Update airport table
624 
+			// Update airport table
625 625 
 		$error .= create_db::import_file('../db/airport.sql');
626 626 
 		if ($error != '') return 'Import airport.sql : '.$error;
627 627 
 		// Remove primary key on Spotter_Archive
628 628 
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 
-        	try {
630 
-            	    $sth = $Connection->db->prepare($query);
631 
-		    $sth->execute();
632 
-    		} catch(PDOException $e) {
633 
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 
-    		}
629 
+			try {
630 
+					$sth = $Connection->db->prepare($query);
631 
+			$sth->execute();
632 
+			} catch(PDOException $e) {
633 
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 
+			}
635 635 
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636 
-        	try {
637 
-            	    $sth = $Connection->db->prepare($query);
638 
-		    $sth->execute();
639 
-    		} catch(PDOException $e) {
640 
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 
-    		}
636 
+			try {
637 
+					$sth = $Connection->db->prepare($query);
638 
+			$sth->execute();
639 
+			} catch(PDOException $e) {
640 
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 
+			}
642 642 
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
643 643 
 			// Add column over_country
644 
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
644 
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645 
 			try {
646 
-            			$sth = $Connection->db->prepare($query);
646 
+						$sth = $Connection->db->prepare($query);
647 647 
 				$sth->execute();
648 648 
 			} catch(PDOException $e) {
649 649 
 				return "error (add over_country) : ".$e->getMessage()."\n";
 
@@ -651,9 +651,9 @@  discard block
 
 block discarded – undo
651 651 
 		}
652 652 
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
653 653 
 			// Add column over_country
654 
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
654 
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655 
 			try {
656 
-            			$sth = $Connection->db->prepare($query);
656 
+						$sth = $Connection->db->prepare($query);
657 657 
 				$sth->execute();
658 658 
 			} catch(PDOException $e) {
659 659 
 				return "error (add over_country) : ".$e->getMessage()."\n";
 
@@ -661,74 +661,74 @@  discard block
 
 block discarded – undo
661 661 
 		}
662 662 
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
663 663 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664 
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
664 
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665 
 			try {
666 666 
 				$sth = $Connection->db->prepare($query);
667 667 
 				$sth->execute();
668 668 
 			} catch(PDOException $e) {
669 669 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670 
-    			}
671 
-    		}
670 
+				}
671 
+			}
672 672 
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
673 673 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674 
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
674 
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675 
 			try {
676 676 
 				$sth = $Connection->db->prepare($query);
677 677 
 				$sth->execute();
678 678 
 			} catch(PDOException $e) {
679 679 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680 
-    			}
681 
-    		}
680 
+				}
681 
+			}
682 682 
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
683 683 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684 
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
684 
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685 
 			try {
686 686 
 				$sth = $Connection->db->prepare($query);
687 687 
 				$sth->execute();
688 688 
 			} catch(PDOException $e) {
689 689 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690 
-    			}
691 
-    		}
690 
+				}
691 
+			}
692 692 
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
693 693 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694 
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
694 
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695 
 			try {
696 696 
 				$sth = $Connection->db->prepare($query);
697 697 
 				$sth->execute();
698 698 
 			} catch(PDOException $e) {
699 699 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 
-    			}
701 
-    		}
700 
+				}
701 
+			}
702 702 
 		if ($error != '') return $error;
703 703 
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 
-        	try {
705 
-            	    $sth = $Connection->db->prepare($query);
706 
-		    $sth->execute();
707 
-    		} catch(PDOException $e) {
708 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
709 
-    		}
704 
+			try {
705 
+					$sth = $Connection->db->prepare($query);
706 
+			$sth->execute();
707 
+			} catch(PDOException $e) {
708 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
709 
+			}
710 710 
 		return $error;
711 711 
 	}
712 712
713 713 
 	private static function update_from_20() {
714 714 
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
715 
-    		$Connection = new Connection();
715 
+			$Connection = new Connection();
716 716 
 		$error = '';
717 
-    		// Update airline table
718 
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
717 
+			// Update airline table
718 
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 719 
 			$error .= create_db::import_file('../db/airlines.sql');
720 720 
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721 
 		}
722 722 
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 723 
 			// Add column over_country
724 
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 
-        		try {
724 
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 
+				try {
726 726 
 				$sth = $Connection->db->prepare($query);
727 727 
 				$sth->execute();
728 728 
 			} catch(PDOException $e) {
729 729 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 
-    			}
731 
-    		}
730 
+				}
731 
+			}
732 732 
 		if ($error != '') return $error;
733 733 
 		/*
734 734 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 
@@ -738,12 +738,12 @@  discard block
 
 block discarded – undo
738 738 
 		}
739 739 
 		*/
740 740 
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
741 
-        	try {
742 
-            	    $sth = $Connection->db->prepare($query);
743 
-		    $sth->execute();
744 
-    		} catch(PDOException $e) {
745 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
746 
-    		}
741 
+			try {
742 
+					$sth = $Connection->db->prepare($query);
743 
+			$sth->execute();
744 
+			} catch(PDOException $e) {
745 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
746 
+			}
747 747 
 		return $error;
748 748 
 	}
749 749 
 
@@ -762,35 +762,35 @@  discard block
 
 block discarded – undo
762 762 
 			if ($error != '') return $error;
763 763 
 		}
764 764 
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 
-        	try {
766 
-            	    $sth = $Connection->db->prepare($query);
767 
-		    $sth->execute();
768 
-    		} catch(PDOException $e) {
769 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
770 
-    		}
765 
+			try {
766 
+					$sth = $Connection->db->prepare($query);
767 
+			$sth->execute();
768 
+			} catch(PDOException $e) {
769 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
770 
+			}
771 771 
 		return $error;
772 772 
 	}
773 773
774 774 
 	private static function update_from_22() {
775 775 
 		global $globalDBdriver;
776 
-    		$Connection = new Connection();
776 
+			$Connection = new Connection();
777 777 
 		$error = '';
778 778 
 		// Add table stats polar
779 
-    		if (!$Connection->tableExists('stats_source')) {
779 
+			if (!$Connection->tableExists('stats_source')) {
780 780 
 			if ($globalDBdriver == 'mysql') {
781 
-    				$error .= create_db::import_file('../db/stats_source.sql');
781 
+					$error .= create_db::import_file('../db/stats_source.sql');
782 782 
 			} else {
783 783 
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 784 
 			}
785 785 
 			if ($error != '') return $error;
786 786 
 		}
787 787 
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 
-        	try {
789 
-            	    $sth = $Connection->db->prepare($query);
790 
-		    $sth->execute();
791 
-    		} catch(PDOException $e) {
792 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
793 
-    		}
788 
+			try {
789 
+					$sth = $Connection->db->prepare($query);
790 
+			$sth->execute();
791 
+			} catch(PDOException $e) {
792 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
793 
+			}
794 794 
 		return $error;
795 795 
 	}
796 796 
 
@@ -821,14 +821,14 @@  discard block
 
 block discarded – undo
821 821 
 		}
822 822 
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
823 823 
 			// Add aircraft_manufacturer to stats_aircraft
824 
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
824 
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
825 825 
 			try {
826 826 
 				$sth = $Connection->db->prepare($query);
827 827 
 				$sth->execute();
828 828 
 			} catch(PDOException $e) {
829 829 
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
830 
-    			}
831 
-    		}
830 
+				}
831 
+			}
832 832
833 833 
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
834 834 
 		try {
 
@@ -1176,7 +1176,7 @@  discard block
 
 block discarded – undo
1176 1176 
 			} catch(PDOException $e) {
1177 1177 
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1178 1178 
 			}
1179 
-                }
1179 
+				}
1180 1180 
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
1181 1181 
 			// Add mfr to aircraft
1182 1182 
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 
@@ -1250,7 +1250,7 @@  discard block
 
 block discarded – undo
1250 1250 
 			} catch(PDOException $e) {
1251 1251 
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
1252 1252 
 			}
1253 
-                }
1253 
+				}
1254 1254 
 		if (!$Connection->indexExists('accidents','registration_idx')) {
1255 1255 
 			// Add index key
1256 1256 
 			$query = "create index registration_idx on accidents (registration)";
 
@@ -1260,7 +1260,7 @@  discard block
 
 block discarded – undo
1260 1260 
 			} catch(PDOException $e) {
1261 1261 
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
1262 1262 
 			}
1263 
-                }
1263 
+				}
1264 1264 
 		if (!$Connection->indexExists('accidents','rdts')) {
1265 1265 
 			// Add index key
1266 1266 
 			$query = "create index rdts on accidents (registration,date,type,source)";
 
@@ -1270,7 +1270,7 @@  discard block
 
 block discarded – undo
1270 1270 
 			} catch(PDOException $e) {
1271 1271 
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
1272 1272 
 			}
1273 
-                }
1273 
+				}
1274 1274
1275 1275 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
1276 1276 
 		try {
 
@@ -1562,7 +1562,7 @@  discard block
 
 block discarded – undo
1562 1562 
 			} catch(PDOException $e) {
1563 1563 
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
1564 1564 
 			}
1565 
-                }
1565 
+				}
1566 1566 
 		$query = "UPDATE config SET value = '36' WHERE name = 'schema_version'";
1567 1567 
 		try {
1568 1568 
 			$sth = $Connection->db->prepare($query);
 
@@ -1719,7 +1719,7 @@  discard block
 
 block discarded – undo
1719 1719 
 			} catch(PDOException $e) {
1720 1720 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1721 1721 
 			}
1722 
-                }
1722 
+				}
1723 1723 
 		$query = "UPDATE config SET value = '38' WHERE name = 'schema_version'";
1724 1724 
 		try {
1725 1725 
 			$sth = $Connection->db->prepare($query);
 
@@ -2055,197 +2055,197 @@  discard block
 
 block discarded – undo
2055 2055
2056 2056
2057 2057
2058 
-    	public static function check_version($update = false) {
2059 
-    	    global $globalDBname;
2060 
-    	    $version = 0;
2061 
-    	    $Connection = new Connection();
2062 
-    	    if ($Connection->tableExists('aircraft')) {
2063 
-    		if (!$Connection->tableExists('config')) {
2064 
-    		    $version = '1';
2065 
-    		    if ($update) return self::update_from_1();
2066 
-    		    else return $version;
2058 
+		public static function check_version($update = false) {
2059 
+			global $globalDBname;
2060 
+			$version = 0;
2061 
+			$Connection = new Connection();
2062 
+			if ($Connection->tableExists('aircraft')) {
2063 
+			if (!$Connection->tableExists('config')) {
2064 
+				$version = '1';
2065 
+				if ($update) return self::update_from_1();
2066 
+				else return $version;
2067 2067 
 		} else {
2068 
-    		    $Connection = new Connection();
2069 
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2070 
-		    try {
2071 
-            		$sth = $Connection->db->prepare($query);
2072 
-		        $sth->execute();
2073 
-		    } catch(PDOException $e) {
2068 
+				$Connection = new Connection();
2069 
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2070 
+			try {
2071 
+					$sth = $Connection->db->prepare($query);
2072 
+				$sth->execute();
2073 
+			} catch(PDOException $e) {
2074 2074 
 			return "error : ".$e->getMessage()."\n";
2075 
-    		    }
2076 
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
2077 
-    		    if ($update) {
2078 
-    			if ($result['value'] == '2') {
2079 
-    			    $error = self::update_from_2();
2080 
-    			    if ($error != '') return $error;
2081 
-    			    else return self::check_version(true);
2082 
-    			} elseif ($result['value'] == '3') {
2083 
-    			    $error = self::update_from_3();
2084 
-    			    if ($error != '') return $error;
2085 
-    			    else return self::check_version(true);
2086 
-    			} elseif ($result['value'] == '4') {
2087 
-    			    $error = self::update_from_4();
2088 
-    			    if ($error != '') return $error;
2089 
-    			    else return self::check_version(true);
2090 
-    			} elseif ($result['value'] == '5') {
2091 
-    			    $error = self::update_from_5();
2092 
-    			    if ($error != '') return $error;
2093 
-    			    else return self::check_version(true);
2094 
-    			} elseif ($result['value'] == '6') {
2095 
-    			    $error = self::update_from_6();
2096 
-    			    if ($error != '') return $error;
2097 
-    			    else return self::check_version(true);
2098 
-    			} elseif ($result['value'] == '7') {
2099 
-    			    $error = self::update_from_7();
2100 
-    			    if ($error != '') return $error;
2101 
-    			    else return self::check_version(true);
2102 
-    			} elseif ($result['value'] == '8') {
2103 
-    			    $error = self::update_from_8();
2104 
-    			    if ($error != '') return $error;
2105 
-    			    else return self::check_version(true);
2106 
-    			} elseif ($result['value'] == '9') {
2107 
-    			    $error = self::update_from_9();
2108 
-    			    if ($error != '') return $error;
2109 
-    			    else return self::check_version(true);
2110 
-    			} elseif ($result['value'] == '10') {
2111 
-    			    $error = self::update_from_10();
2112 
-    			    if ($error != '') return $error;
2113 
-    			    else return self::check_version(true);
2114 
-    			} elseif ($result['value'] == '11') {
2115 
-    			    $error = self::update_from_11();
2116 
-    			    if ($error != '') return $error;
2117 
-    			    else return self::check_version(true);
2118 
-    			} elseif ($result['value'] == '12') {
2119 
-    			    $error = self::update_from_12();
2120 
-    			    if ($error != '') return $error;
2121 
-    			    else return self::check_version(true);
2122 
-    			} elseif ($result['value'] == '13') {
2123 
-    			    $error = self::update_from_13();
2124 
-    			    if ($error != '') return $error;
2125 
-    			    else return self::check_version(true);
2126 
-    			} elseif ($result['value'] == '14') {
2127 
-    			    $error = self::update_from_14();
2128 
-    			    if ($error != '') return $error;
2129 
-    			    else return self::check_version(true);
2130 
-    			} elseif ($result['value'] == '15') {
2131 
-    			    $error = self::update_from_15();
2132 
-    			    if ($error != '') return $error;
2133 
-    			    else return self::check_version(true);
2134 
-    			} elseif ($result['value'] == '16') {
2135 
-    			    $error = self::update_from_16();
2136 
-    			    if ($error != '') return $error;
2137 
-    			    else return self::check_version(true);
2138 
-    			} elseif ($result['value'] == '17') {
2139 
-    			    $error = self::update_from_17();
2140 
-    			    if ($error != '') return $error;
2141 
-    			    else return self::check_version(true);
2142 
-    			} elseif ($result['value'] == '18') {
2143 
-    			    $error = self::update_from_18();
2144 
-    			    if ($error != '') return $error;
2145 
-    			    else return self::check_version(true);
2146 
-    			} elseif ($result['value'] == '19') {
2147 
-    			    $error = self::update_from_19();
2148 
-    			    if ($error != '') return $error;
2149 
-    			    else return self::check_version(true);
2150 
-    			} elseif ($result['value'] == '20') {
2151 
-    			    $error = self::update_from_20();
2152 
-    			    if ($error != '') return $error;
2153 
-    			    else return self::check_version(true);
2154 
-    			} elseif ($result['value'] == '21') {
2155 
-    			    $error = self::update_from_21();
2156 
-    			    if ($error != '') return $error;
2157 
-    			    else return self::check_version(true);
2158 
-    			} elseif ($result['value'] == '22') {
2159 
-    			    $error = self::update_from_22();
2160 
-    			    if ($error != '') return $error;
2161 
-    			    else return self::check_version(true);
2162 
-    			} elseif ($result['value'] == '23') {
2163 
-    			    $error = self::update_from_23();
2164 
-    			    if ($error != '') return $error;
2165 
-    			    else return self::check_version(true);
2166 
-    			} elseif ($result['value'] == '24') {
2167 
-    			    $error = self::update_from_24();
2168 
-    			    if ($error != '') return $error;
2169 
-    			    else return self::check_version(true);
2170 
-    			} elseif ($result['value'] == '25') {
2171 
-    			    $error = self::update_from_25();
2172 
-    			    if ($error != '') return $error;
2173 
-    			    else return self::check_version(true);
2174 
-    			} elseif ($result['value'] == '26') {
2175 
-    			    $error = self::update_from_26();
2176 
-    			    if ($error != '') return $error;
2177 
-    			    else return self::check_version(true);
2178 
-    			} elseif ($result['value'] == '27') {
2179 
-    			    $error = self::update_from_27();
2180 
-    			    if ($error != '') return $error;
2181 
-    			    else return self::check_version(true);
2182 
-    			} elseif ($result['value'] == '28') {
2183 
-    			    $error = self::update_from_28();
2184 
-    			    if ($error != '') return $error;
2185 
-    			    else return self::check_version(true);
2186 
-    			} elseif ($result['value'] == '29') {
2187 
-    			    $error = self::update_from_29();
2188 
-    			    if ($error != '') return $error;
2189 
-    			    else return self::check_version(true);
2190 
-    			} elseif ($result['value'] == '30') {
2191 
-    			    $error = self::update_from_30();
2192 
-    			    if ($error != '') return $error;
2193 
-    			    else return self::check_version(true);
2194 
-    			} elseif ($result['value'] == '31') {
2195 
-    			    $error = self::update_from_31();
2196 
-    			    if ($error != '') return $error;
2197 
-    			    else return self::check_version(true);
2198 
-    			} elseif ($result['value'] == '32') {
2199 
-    			    $error = self::update_from_32();
2200 
-    			    if ($error != '') return $error;
2201 
-    			    else return self::check_version(true);
2202 
-    			} elseif ($result['value'] == '33') {
2203 
-    			    $error = self::update_from_33();
2204 
-    			    if ($error != '') return $error;
2205 
-    			    else return self::check_version(true);
2206 
-    			} elseif ($result['value'] == '34') {
2207 
-    			    $error = self::update_from_34();
2208 
-    			    if ($error != '') return $error;
2209 
-    			    else return self::check_version(true);
2210 
-    			} elseif ($result['value'] == '35') {
2211 
-    			    $error = self::update_from_35();
2212 
-    			    if ($error != '') return $error;
2213 
-    			    else return self::check_version(true);
2214 
-    			} elseif ($result['value'] == '36') {
2215 
-    			    $error = self::update_from_36();
2216 
-    			    if ($error != '') return $error;
2217 
-    			    else return self::check_version(true);
2218 
-    			} elseif ($result['value'] == '37') {
2219 
-    			    $error = self::update_from_37();
2220 
-    			    if ($error != '') return $error;
2221 
-    			    else return self::check_version(true);
2222 
-    			} elseif ($result['value'] == '38') {
2223 
-    			    $error = self::update_from_38();
2224 
-    			    if ($error != '') return $error;
2225 
-    			    else return self::check_version(true);
2226 
-    			} elseif ($result['value'] == '39') {
2227 
-    			    $error = self::update_from_39();
2228 
-    			    if ($error != '') return $error;
2229 
-    			    else return self::check_version(true);
2230 
-    			} elseif ($result['value'] == '40') {
2231 
-    			    $error = self::update_from_40();
2232 
-    			    if ($error != '') return $error;
2233 
-    			    else return self::check_version(true);
2234 
-    			} elseif ($result['value'] == '41') {
2235 
-    			    $error = self::update_from_41();
2236 
-    			    if ($error != '') return $error;
2237 
-    			    else return self::check_version(true);
2238 
-    			} elseif ($result['value'] == '42') {
2239 
-    			    $error = self::update_from_42();
2240 
-    			    if ($error != '') return $error;
2241 
-    			    else return self::check_version(true);
2242 
-    			} else return '';
2243 
-    		    }
2244 
-    		    else return $result['value'];
2075 
+				}
2076 
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
2077 
+				if ($update) {
2078 
+				if ($result['value'] == '2') {
2079 
+					$error = self::update_from_2();
2080 
+					if ($error != '') return $error;
2081 
+					else return self::check_version(true);
2082 
+				} elseif ($result['value'] == '3') {
2083 
+					$error = self::update_from_3();
2084 
+					if ($error != '') return $error;
2085 
+					else return self::check_version(true);
2086 
+				} elseif ($result['value'] == '4') {
2087 
+					$error = self::update_from_4();
2088 
+					if ($error != '') return $error;
2089 
+					else return self::check_version(true);
2090 
+				} elseif ($result['value'] == '5') {
2091 
+					$error = self::update_from_5();
2092 
+					if ($error != '') return $error;
2093 
+					else return self::check_version(true);
2094 
+				} elseif ($result['value'] == '6') {
2095 
+					$error = self::update_from_6();
2096 
+					if ($error != '') return $error;
2097 
+					else return self::check_version(true);
2098 
+				} elseif ($result['value'] == '7') {
2099 
+					$error = self::update_from_7();
2100 
+					if ($error != '') return $error;
2101 
+					else return self::check_version(true);
2102 
+				} elseif ($result['value'] == '8') {
2103 
+					$error = self::update_from_8();
2104 
+					if ($error != '') return $error;
2105 
+					else return self::check_version(true);
2106 
+				} elseif ($result['value'] == '9') {
2107 
+					$error = self::update_from_9();
2108 
+					if ($error != '') return $error;
2109 
+					else return self::check_version(true);
2110 
+				} elseif ($result['value'] == '10') {
2111 
+					$error = self::update_from_10();
2112 
+					if ($error != '') return $error;
2113 
+					else return self::check_version(true);
2114 
+				} elseif ($result['value'] == '11') {
2115 
+					$error = self::update_from_11();
2116 
+					if ($error != '') return $error;
2117 
+					else return self::check_version(true);
2118 
+				} elseif ($result['value'] == '12') {
2119 
+					$error = self::update_from_12();
2120 
+					if ($error != '') return $error;
2121 
+					else return self::check_version(true);
2122 
+				} elseif ($result['value'] == '13') {
2123 
+					$error = self::update_from_13();
2124 
+					if ($error != '') return $error;
2125 
+					else return self::check_version(true);
2126 
+				} elseif ($result['value'] == '14') {
2127 
+					$error = self::update_from_14();
2128 
+					if ($error != '') return $error;
2129 
+					else return self::check_version(true);
2130 
+				} elseif ($result['value'] == '15') {
2131 
+					$error = self::update_from_15();
2132 
+					if ($error != '') return $error;
2133 
+					else return self::check_version(true);
2134 
+				} elseif ($result['value'] == '16') {
2135 
+					$error = self::update_from_16();
2136 
+					if ($error != '') return $error;
2137 
+					else return self::check_version(true);
2138 
+				} elseif ($result['value'] == '17') {
2139 
+					$error = self::update_from_17();
2140 
+					if ($error != '') return $error;
2141 
+					else return self::check_version(true);
2142 
+				} elseif ($result['value'] == '18') {
2143 
+					$error = self::update_from_18();
2144 
+					if ($error != '') return $error;
2145 
+					else return self::check_version(true);
2146 
+				} elseif ($result['value'] == '19') {
2147 
+					$error = self::update_from_19();
2148 
+					if ($error != '') return $error;
2149 
+					else return self::check_version(true);
2150 
+				} elseif ($result['value'] == '20') {
2151 
+					$error = self::update_from_20();
2152 
+					if ($error != '') return $error;
2153 
+					else return self::check_version(true);
2154 
+				} elseif ($result['value'] == '21') {
2155 
+					$error = self::update_from_21();
2156 
+					if ($error != '') return $error;
2157 
+					else return self::check_version(true);
2158 
+				} elseif ($result['value'] == '22') {
2159 
+					$error = self::update_from_22();
2160 
+					if ($error != '') return $error;
2161 
+					else return self::check_version(true);
2162 
+				} elseif ($result['value'] == '23') {
2163 
+					$error = self::update_from_23();
2164 
+					if ($error != '') return $error;
2165 
+					else return self::check_version(true);
2166 
+				} elseif ($result['value'] == '24') {
2167 
+					$error = self::update_from_24();
2168 
+					if ($error != '') return $error;
2169 
+					else return self::check_version(true);
2170 
+				} elseif ($result['value'] == '25') {
2171 
+					$error = self::update_from_25();
2172 
+					if ($error != '') return $error;
2173 
+					else return self::check_version(true);
2174 
+				} elseif ($result['value'] == '26') {
2175 
+					$error = self::update_from_26();
2176 
+					if ($error != '') return $error;
2177 
+					else return self::check_version(true);
2178 
+				} elseif ($result['value'] == '27') {
2179 
+					$error = self::update_from_27();
2180 
+					if ($error != '') return $error;
2181 
+					else return self::check_version(true);
2182 
+				} elseif ($result['value'] == '28') {
2183 
+					$error = self::update_from_28();
2184 
+					if ($error != '') return $error;
2185 
+					else return self::check_version(true);
2186 
+				} elseif ($result['value'] == '29') {
2187 
+					$error = self::update_from_29();
2188 
+					if ($error != '') return $error;
2189 
+					else return self::check_version(true);
2190 
+				} elseif ($result['value'] == '30') {
2191 
+					$error = self::update_from_30();
2192 
+					if ($error != '') return $error;
2193 
+					else return self::check_version(true);
2194 
+				} elseif ($result['value'] == '31') {
2195 
+					$error = self::update_from_31();
2196 
+					if ($error != '') return $error;
2197 
+					else return self::check_version(true);
2198 
+				} elseif ($result['value'] == '32') {
2199 
+					$error = self::update_from_32();
2200 
+					if ($error != '') return $error;
2201 
+					else return self::check_version(true);
2202 
+				} elseif ($result['value'] == '33') {
2203 
+					$error = self::update_from_33();
2204 
+					if ($error != '') return $error;
2205 
+					else return self::check_version(true);
2206 
+				} elseif ($result['value'] == '34') {
2207 
+					$error = self::update_from_34();
2208 
+					if ($error != '') return $error;
2209 
+					else return self::check_version(true);
2210 
+				} elseif ($result['value'] == '35') {
2211 
+					$error = self::update_from_35();
2212 
+					if ($error != '') return $error;
2213 
+					else return self::check_version(true);
2214 
+				} elseif ($result['value'] == '36') {
2215 
+					$error = self::update_from_36();
2216 
+					if ($error != '') return $error;
2217 
+					else return self::check_version(true);
2218 
+				} elseif ($result['value'] == '37') {
2219 
+					$error = self::update_from_37();
2220 
+					if ($error != '') return $error;
2221 
+					else return self::check_version(true);
2222 
+				} elseif ($result['value'] == '38') {
2223 
+					$error = self::update_from_38();
2224 
+					if ($error != '') return $error;
2225 
+					else return self::check_version(true);
2226 
+				} elseif ($result['value'] == '39') {
2227 
+					$error = self::update_from_39();
2228 
+					if ($error != '') return $error;
2229 
+					else return self::check_version(true);
2230 
+				} elseif ($result['value'] == '40') {
2231 
+					$error = self::update_from_40();
2232 
+					if ($error != '') return $error;
2233 
+					else return self::check_version(true);
2234 
+				} elseif ($result['value'] == '41') {
2235 
+					$error = self::update_from_41();
2236 
+					if ($error != '') return $error;
2237 
+					else return self::check_version(true);
2238 
+				} elseif ($result['value'] == '42') {
2239 
+					$error = self::update_from_42();
2240 
+					if ($error != '') return $error;
2241 
+					else return self::check_version(true);
2242 
+				} else return '';
2243 
+				}
2244 
+				else return $result['value'];
2245 2245 
 		}
2246 2246
2247 
-	    } else return $version;
2248 
-    	}
2247 
+		} else return $version;
2248 
+		}
2249 2249
2250 2250 
 }
2251 2251 
 //echo update_schema::check_version();
Please login to merge, or discard this patch.
require/class.SpotterArchive.php 1 patch
Indentation   +652 added lines, -652 removed lines patch added patch discarded remove patch 
@@ -8,12 +8,12 @@  discard block
 
 block discarded – undo
8 8 
 		$this->db = $Connection->db;
9 9 
 	}
10 10
11 
-    /**
12 
-    * Get SQL query part for filter used
13 
-    * @param Array $filter the filter
14 
-    * @return Array the SQL part
15 
-    */
16 
-    public function getFilter($filter = array(),$where = false,$and = false) {
11 
+	/**
12 
+	 * Get SQL query part for filter used
13 
+	 * @param Array $filter the filter
14 
+	 * @return Array the SQL part
15 
+	 */
16 
+	public function getFilter($filter = array(),$where = false,$and = false) {
17 17 
 	global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
18 18 
 	$filters = array();
19 19 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 
@@ -30,88 +30,88 @@  discard block
 
 block discarded – undo
30 30 
 	$filter_query_join = '';
31 31 
 	$filter_query_where = '';
32 32 
 	foreach($filters as $flt) {
33 
-	    if (isset($flt['airlines']) && !empty($flt['airlines'])) {
33 
+		if (isset($flt['airlines']) && !empty($flt['airlines'])) {
34 34 
 		if ($flt['airlines'][0] != '') {
35 
-		    if (isset($flt['source'])) {
35 
+			if (isset($flt['source'])) {
36 36 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
37 
-		    } else {
37 
+			} else {
38 38 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
39 
-		    }
39 
+			}
40 
+		}
40 41 
 		}
41 
-	    }
42 
-	    if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
42 
+		if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
43 43 
 		if (isset($flt['source'])) {
44 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
44 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
45 45 
 		} else {
46 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
46 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
47 47 
 		}
48 
-	    }
49 
-	    if (isset($flt['idents']) && !empty($flt['idents'])) {
48 
+		}
49 
+		if (isset($flt['idents']) && !empty($flt['idents'])) {
50 50 
 		if (isset($flt['source'])) {
51 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
51 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
52 52 
 		} else {
53 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
53 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
54 
+		}
54 55 
 		}
55 
-	    }
56 
-	    if (isset($flt['registrations']) && !empty($flt['registrations'])) {
56 
+		if (isset($flt['registrations']) && !empty($flt['registrations'])) {
57 57 
 		if (isset($flt['source'])) {
58 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
58 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
59 59 
 		} else {
60 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
60 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
61 
+		}
61 62 
 		}
62 
-	    }
63 
-	    if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
63 
+		if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
64 64 
 		if (isset($flt['source'])) {
65 
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
65 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
66 
+		}
66 67 
 		}
67 
-	    }
68 68 
 	}
69 69 
 	if (isset($filter['airlines']) && !empty($filter['airlines'])) {
70 
-	    if ($filter['airlines'][0] != '') {
70 
+		if ($filter['airlines'][0] != '') {
71 71 
 		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
72 
-	    }
72 
+		}
73 73 
 	}
74 74
75 75 
 	if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
76 
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
76 
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
77 77 
 	}
78 78 
 	if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
79 
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
79 
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
80 80 
 	}
81 81 
 	if (isset($filter['source']) && !empty($filter['source'])) {
82 
-	    $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
82 
+		$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
83 83 
 	}
84 84 
 	if (isset($filter['ident']) && !empty($filter['ident'])) {
85 
-	    $filter_query_where .= " AND ident = '".$filter['ident']."'";
85 
+		$filter_query_where .= " AND ident = '".$filter['ident']."'";
86 86 
 	}
87 87 
 	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
88 88 
 		$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
89 89 
 	}
90 90 
 	if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
91 
-	    $filter_query_date = '';
91 
+		$filter_query_date = '';
92 92
93 
-	    if (isset($filter['year']) && $filter['year'] != '') {
93 
+		if (isset($filter['year']) && $filter['year'] != '') {
94 94 
 		if ($globalDBdriver == 'mysql') {
95 
-		    $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'";
95 
+			$filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'";
96 96 
 		} else {
97 
-		    $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'";
97 
+			$filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'";
98 
+		}
98 99 
 		}
99 
-	    }
100 
-	    if (isset($filter['month']) && $filter['month'] != '') {
100 
+		if (isset($filter['month']) && $filter['month'] != '') {
101 101 
 		if ($globalDBdriver == 'mysql') {
102 
-		    $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'";
102 
+			$filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'";
103 103 
 		} else {
104 
-		    $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'";
104 
+			$filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'";
105 105 
 		}
106 
-	    }
107 
-	    if (isset($filter['day']) && $filter['day'] != '') {
106 
+		}
107 
+		if (isset($filter['day']) && $filter['day'] != '') {
108 108 
 		if ($globalDBdriver == 'mysql') {
109 
-		    $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'";
109 
+			$filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'";
110 110 
 		} else {
111 
-		    $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
111 
+			$filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
112 
+		}
112 113 
 		}
113 
-	    }
114 
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
114 
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
115 115 
 	}
116 116 
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
117 117 
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 
@@ -120,7 +120,7 @@  discard block
 
 block discarded – undo
120 120 
 	}
121 121 
 	$filter_query = $filter_query_join.$filter_query_where;
122 122 
 	return $filter_query;
123 
-    }
123 
+	}
124 124
125 125 
 	// Spotter_archive
126 126 
 	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
 
@@ -152,44 +152,44 @@  discard block
 
 block discarded – undo
152 152 
 	}
153 153
154 154
155 
-        /**
156 
-        * Gets all the spotter information based on a particular callsign
157 
-        *
158 
-        * @return Array the spotter information
159 
-        *
160 
-        */
161 
-        public function getLastArchiveSpotterDataByIdent($ident)
162 
-        {
155 
+		/**
156 
+		 * Gets all the spotter information based on a particular callsign
157 
+		 *
158 
+		 * @return Array the spotter information
159 
+		 *
160 
+		 */
161 
+		public function getLastArchiveSpotterDataByIdent($ident)
162 
+		{
163 163 
 		$Spotter = new Spotter($this->db);
164 
-                date_default_timezone_set('UTC');
164 
+				date_default_timezone_set('UTC');
165 165
166 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
167 
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
168 
-                $query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
166 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
167 
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
168 
+				$query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
169 169
170 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
170 
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
171 171
172 
-                return $spotter_array;
173 
-        }
172 
+				return $spotter_array;
173 
+		}
174 174
175 175
176 
-        /**
177 
-        * Gets last the spotter information based on a particular id
178 
-        *
179 
-        * @return Array the spotter information
180 
-        *
181 
-        */
182 
-        public function getLastArchiveSpotterDataById($id)
183 
-        {
184 
-    		$Spotter = new Spotter($this->db);
185 
-                date_default_timezone_set('UTC');
186 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
187 
-                //$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
188 
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
189 
-                $query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
176 
+		/**
177 
+		 * Gets last the spotter information based on a particular id
178 
+		 *
179 
+		 * @return Array the spotter information
180 
+		 *
181 
+		 */
182 
+		public function getLastArchiveSpotterDataById($id)
183 
+		{
184 
+			$Spotter = new Spotter($this->db);
185 
+				date_default_timezone_set('UTC');
186 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
187 
+				//$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
188 
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
189 
+				$query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
190 190
191 191 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
192 
-                  /*
192 
+				  /*
193 193 
                 try {
194 194 
                         $Connection = new Connection();
195 195 
                         $sth = Connection->$db->prepare($query);
 
@@ -199,232 +199,232 @@  discard block
 
 block discarded – undo
199 199 
                 }
200 200 
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
201 201 
                 */
202 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
203 
-
204 
-                return $spotter_array;
205 
-        }
206 
-
207 
-        /**
208 
-        * Gets all the spotter information based on a particular id
209 
-        *
210 
-        * @return Array the spotter information
211 
-        *
212 
-        */
213 
-        public function getAllArchiveSpotterDataById($id)
202 
+				$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
203 
+
204 
+				return $spotter_array;
205 
+		}
206 
+
207 
+		/**
208 
+		 * Gets all the spotter information based on a particular id
209 
+		 *
210 
+		 * @return Array the spotter information
211 
+		 *
212 
+		 */
213 
+		public function getAllArchiveSpotterDataById($id)
214 214 
 	{
215 
-                date_default_timezone_set('UTC');
216 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
217 
-                $query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
215 
+				date_default_timezone_set('UTC');
216 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
217 
+				$query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
218 218
219 219 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
220 220
221 
-                try {
222 
-                        $sth = $this->db->prepare($query);
223 
-                        $sth->execute(array(':id' => $id));
224 
-                } catch(PDOException $e) {
225 
-                        echo $e->getMessage();
226 
-                        die;
227 
-                }
228 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
229 
-
230 
-                return $spotter_array;
231 
-        }
232 
-
233 
-        /**
234 
-        * Gets coordinate & time spotter information based on a particular id
235 
-        *
236 
-        * @return Array the spotter information
237 
-        *
238 
-        */
239 
-        public function getCoordArchiveSpotterDataById($id)
240 
-        {
241 
-                date_default_timezone_set('UTC');
242 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
243 
-                $query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
221 
+				try {
222 
+						$sth = $this->db->prepare($query);
223 
+						$sth->execute(array(':id' => $id));
224 
+				} catch(PDOException $e) {
225 
+						echo $e->getMessage();
226 
+						die;
227 
+				}
228 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
229 
+
230 
+				return $spotter_array;
231 
+		}
232 
+
233 
+		/**
234 
+		 * Gets coordinate & time spotter information based on a particular id
235 
+		 *
236 
+		 * @return Array the spotter information
237 
+		 *
238 
+		 */
239 
+		public function getCoordArchiveSpotterDataById($id)
240 
+		{
241 
+				date_default_timezone_set('UTC');
242 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
243 
+				$query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
244 244
245 245 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
246 246
247 
-                try {
248 
-                        $sth = $this->db->prepare($query);
249 
-                        $sth->execute(array(':id' => $id));
250 
-                } catch(PDOException $e) {
251 
-                        echo $e->getMessage();
252 
-                        die;
253 
-                }
254 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
247 
+				try {
248 
+						$sth = $this->db->prepare($query);
249 
+						$sth->execute(array(':id' => $id));
250 
+				} catch(PDOException $e) {
251 
+						echo $e->getMessage();
252 
+						die;
253 
+				}
254 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
255 255
256 
-                return $spotter_array;
257 
-        }
256 
+				return $spotter_array;
257 
+		}
258 258
259 259
260 
-        /**
261 
-        * Gets altitude information based on a particular callsign
262 
-        *
263 
-        * @return Array the spotter information
264 
-        *
265 
-        */
266 
-        public function getAltitudeArchiveSpotterDataByIdent($ident)
267 
-        {
260 
+		/**
261 
+		 * Gets altitude information based on a particular callsign
262 
+		 *
263 
+		 * @return Array the spotter information
264 
+		 *
265 
+		 */
266 
+		public function getAltitudeArchiveSpotterDataByIdent($ident)
267 
+		{
268 268
269 
-                date_default_timezone_set('UTC');
269 
+				date_default_timezone_set('UTC');
270 270
271 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
272 
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
271 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
272 
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
273 273
274 
-                try {
275 
-                        $sth = $this->db->prepare($query);
276 
-                        $sth->execute(array(':ident' => $ident));
277 
-                } catch(PDOException $e) {
278 
-                        echo $e->getMessage();
279 
-                        die;
280 
-                }
281 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
274 
+				try {
275 
+						$sth = $this->db->prepare($query);
276 
+						$sth->execute(array(':ident' => $ident));
277 
+				} catch(PDOException $e) {
278 
+						echo $e->getMessage();
279 
+						die;
280 
+				}
281 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
282 282
283 
-                return $spotter_array;
284 
-        }
283 
+				return $spotter_array;
284 
+		}
285 285
286 
-        /**
287 
-        * Gets altitude information based on a particular id
288 
-        *
289 
-        * @return Array the spotter information
290 
-        *
291 
-        */
292 
-        public function getAltitudeArchiveSpotterDataById($id)
293 
-        {
286 
+		/**
287 
+		 * Gets altitude information based on a particular id
288 
+		 *
289 
+		 * @return Array the spotter information
290 
+		 *
291 
+		 */
292 
+		public function getAltitudeArchiveSpotterDataById($id)
293 
+		{
294 294
295 
-                date_default_timezone_set('UTC');
295 
+				date_default_timezone_set('UTC');
296 296
297 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
298 
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
297 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
298 
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
299 299
300 
-                try {
301 
-                        $sth = $this->db->prepare($query);
302 
-                        $sth->execute(array(':id' => $id));
303 
-                } catch(PDOException $e) {
304 
-                        echo $e->getMessage();
305 
-                        die;
306 
-                }
307 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
300 
+				try {
301 
+						$sth = $this->db->prepare($query);
302 
+						$sth->execute(array(':id' => $id));
303 
+				} catch(PDOException $e) {
304 
+						echo $e->getMessage();
305 
+						die;
306 
+				}
307 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
308 308
309 
-                return $spotter_array;
310 
-        }
309 
+				return $spotter_array;
310 
+		}
311 311
312 
-        /**
313 
-        * Gets altitude & speed information based on a particular id
314 
-        *
315 
-        * @return Array the spotter information
316 
-        *
317 
-        */
318 
-        public function getAltitudeSpeedArchiveSpotterDataById($id)
319 
-        {
312 
+		/**
313 
+		 * Gets altitude & speed information based on a particular id
314 
+		 *
315 
+		 * @return Array the spotter information
316 
+		 *
317 
+		 */
318 
+		public function getAltitudeSpeedArchiveSpotterDataById($id)
319 
+		{
320 320
321 
-                date_default_timezone_set('UTC');
321 
+				date_default_timezone_set('UTC');
322 322
323 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
324 
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
323 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
324 
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
325 325
326 
-                try {
327 
-                        $sth = $this->db->prepare($query);
328 
-                        $sth->execute(array(':id' => $id));
329 
-                } catch(PDOException $e) {
330 
-                        echo $e->getMessage();
331 
-                        die;
332 
-                }
333 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
326 
+				try {
327 
+						$sth = $this->db->prepare($query);
328 
+						$sth->execute(array(':id' => $id));
329 
+				} catch(PDOException $e) {
330 
+						echo $e->getMessage();
331 
+						die;
332 
+				}
333 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
334 334
335 
-                return $spotter_array;
336 
-        }
335 
+				return $spotter_array;
336 
+		}
337 337
338 338
339 
-        /**
340 
-        * Gets altitude information based on a particular callsign
341 
-        *
342 
-        * @return Array the spotter information
343 
-        *
344 
-        */
345 
-        public function getLastAltitudeArchiveSpotterDataByIdent($ident)
346 
-        {
339 
+		/**
340 
+		 * Gets altitude information based on a particular callsign
341 
+		 *
342 
+		 * @return Array the spotter information
343 
+		 *
344 
+		 */
345 
+		public function getLastAltitudeArchiveSpotterDataByIdent($ident)
346 
+		{
347 347
348 
-                date_default_timezone_set('UTC');
348 
+				date_default_timezone_set('UTC');
349 349
350 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
351 
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
350 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
351 
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
352 352 
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
353 353
354 
-                try {
355 
-                        $sth = $this->db->prepare($query);
356 
-                        $sth->execute(array(':ident' => $ident));
357 
-                } catch(PDOException $e) {
358 
-                        echo $e->getMessage();
359 
-                        die;
360 
-                }
361 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
354 
+				try {
355 
+						$sth = $this->db->prepare($query);
356 
+						$sth->execute(array(':ident' => $ident));
357 
+				} catch(PDOException $e) {
358 
+						echo $e->getMessage();
359 
+						die;
360 
+				}
361 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
362 362
363 
-                return $spotter_array;
364 
-        }
363 
+				return $spotter_array;
364 
+		}
365 365
366 366
367 367
368 
-       /**
369 
-        * Gets all the archive spotter information
370 
-        *
371 
-        * @return Array the spotter information
372 
-        *
373 
-        */
374 
-        public function getSpotterArchiveData($ident,$flightaware_id,$date)
375 
-        {
376 
-    		$Spotter = new Spotter($this->db);
377 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
378 
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
368 
+	   /**
369 
+	    * Gets all the archive spotter information
370 
+	    *
371 
+	    * @return Array the spotter information
372 
+	    *
373 
+	    */
374 
+		public function getSpotterArchiveData($ident,$flightaware_id,$date)
375 
+		{
376 
+			$Spotter = new Spotter($this->db);
377 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
378 
+				$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
379 379
380 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
380 
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
381 381
382 
-                return $spotter_array;
383 
-        }
382 
+				return $spotter_array;
383 
+		}
384 384
385 
-        public function deleteSpotterArchiveTrackData()
386 
-        {
385 
+		public function deleteSpotterArchiveTrackData()
386 
+		{
387 387 
 		global $globalArchiveKeepTrackMonths;
388 
-                date_default_timezone_set('UTC');
388 
+				date_default_timezone_set('UTC');
389 389 
 		$query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
390 
-                try {
391 
-                        $sth = $this->db->prepare($query);
392 
-                        $sth->execute();
393 
-                } catch(PDOException $e) {
394 
-                        echo $e->getMessage();
395 
-                        die;
396 
-                }
390 
+				try {
391 
+						$sth = $this->db->prepare($query);
392 
+						$sth->execute();
393 
+				} catch(PDOException $e) {
394 
+						echo $e->getMessage();
395 
+						die;
396 
+				}
397 397 
 	}
398 398
399 399 
 	/**
400 
-        * Gets Minimal Live Spotter data
401 
-        *
402 
-        * @return Array the spotter information
403 
-        *
404 
-        */
405 
-        public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
406 
-        {
407 
-                global $globalDBdriver, $globalLiveInterval;
408 
-                date_default_timezone_set('UTC');
409 
-
410 
-                $filter_query = '';
411 
-                if (isset($filter['source']) && !empty($filter['source'])) {
412 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
413 
-                }
414 
-                // Use spotter_output also ?
415 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
416 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
417 
-                }
418 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
419 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
420 
-                }
421 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
422 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
423 
-                }
424 
-
425 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
426 
-                if ($globalDBdriver == 'mysql') {
427 
-                        /*
400 
+	 * Gets Minimal Live Spotter data
401 
+	 *
402 
+	 * @return Array the spotter information
403 
+	 *
404 
+	 */
405 
+		public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
406 
+		{
407 
+				global $globalDBdriver, $globalLiveInterval;
408 
+				date_default_timezone_set('UTC');
409 
+
410 
+				$filter_query = '';
411 
+				if (isset($filter['source']) && !empty($filter['source'])) {
412 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
413 
+				}
414 
+				// Use spotter_output also ?
415 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
416 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
417 
+				}
418 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
419 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
420 
+				}
421 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
422 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
423 
+				}
424 
+
425 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
426 
+				if ($globalDBdriver == 'mysql') {
427 
+						/*
428 428 
                         $query  = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk
429 429 
                     		    FROM spotter_archive
430 430 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 
@@ -443,56 +443,56 @@  discard block
 
 block discarded – undo
443 443 
 				    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
444 444 
 				    WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
445 445 
                         	    '.$filter_query.' ORDER BY flightaware_id';
446 
-                } else {
447 
-                        //$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
448 
-                        $query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
446 
+				} else {
447 
+						//$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
448 
+						$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
449 449 
                         	    FROM spotter_archive
450 450 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
451 451 
                         	    WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".'
452 452 
                         	    '.$filter_query.' ORDER BY flightaware_id';
453 
-                }
454 
-                //echo $query;
455 
-                try {
456 
-                        $sth = $this->db->prepare($query);
457 
-                        $sth->execute();
458 
-                } catch(PDOException $e) {
459 
-                        echo $e->getMessage();
460 
-                        die;
461 
-                }
462 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
463 
-
464 
-                return $spotter_array;
465 
-        }
453 
+				}
454 
+				//echo $query;
455 
+				try {
456 
+						$sth = $this->db->prepare($query);
457 
+						$sth->execute();
458 
+				} catch(PDOException $e) {
459 
+						echo $e->getMessage();
460 
+						die;
461 
+				}
462 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
463 
+
464 
+				return $spotter_array;
465 
+		}
466 466
467 467 
 	/**
468 
-        * Gets Minimal Live Spotter data
469 
-        *
470 
-        * @return Array the spotter information
471 
-        *
472 
-        */
473 
-        public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
474 
-        {
475 
-                global $globalDBdriver, $globalLiveInterval;
476 
-                date_default_timezone_set('UTC');
477 
-
478 
-                $filter_query = '';
479 
-                if (isset($filter['source']) && !empty($filter['source'])) {
480 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
481 
-                }
482 
-                // Should use spotter_output also ?
483 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
484 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
485 
-                }
486 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
487 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
488 
-                }
489 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
490 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
491 
-                }
492 
-
493 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
494 
-                if ($globalDBdriver == 'mysql') {
495 
-                        /*
468 
+	 * Gets Minimal Live Spotter data
469 
+	 *
470 
+	 * @return Array the spotter information
471 
+	 *
472 
+	 */
473 
+		public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
474 
+		{
475 
+				global $globalDBdriver, $globalLiveInterval;
476 
+				date_default_timezone_set('UTC');
477 
+
478 
+				$filter_query = '';
479 
+				if (isset($filter['source']) && !empty($filter['source'])) {
480 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
481 
+				}
482 
+				// Should use spotter_output also ?
483 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
484 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
485 
+				}
486 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
487 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
488 
+				}
489 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
490 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
491 
+				}
492 
+
493 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
494 
+				if ($globalDBdriver == 'mysql') {
495 
+						/*
496 496 
                         $query  = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk
497 497 
                     		    FROM spotter_archive
498 498 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 
@@ -503,95 +503,95 @@  discard block
 
 block discarded – undo
503 503 
 				    WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".')
504 504 
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
505 505
506 
-                } else {
507 
-                        //$query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao';
508 
-                       /*
506 
+				} else {
507 
+						//$query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao';
508 
+					   /*
509 509 
                         $query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
510 510 
                         	    FROM spotter_archive_output
511 511 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
512 512 
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
513 513 
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
514 514 
                         */
515 
-                        $query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
515 
+						$query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
516 516 
                         	    FROM spotter_archive_output
517 517 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
518 518 
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
519 519 
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
520 520 
 //                        	    .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
521 521
522 
-                }
523 
-                //echo $query;
524 
-                try {
525 
-                        $sth = $this->db->prepare($query);
526 
-                        $sth->execute();
527 
-                } catch(PDOException $e) {
528 
-                        echo $e->getMessage();
529 
-                        die;
530 
-                }
531 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
532 
-
533 
-                return $spotter_array;
534 
-        }
522 
+				}
523 
+				//echo $query;
524 
+				try {
525 
+						$sth = $this->db->prepare($query);
526 
+						$sth->execute();
527 
+				} catch(PDOException $e) {
528 
+						echo $e->getMessage();
529 
+						die;
530 
+				}
531 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
532 
+
533 
+				return $spotter_array;
534 
+		}
535 535
536 536 
 	 /**
537 
-        * Gets count Live Spotter data
538 
-        *
539 
-        * @return Array the spotter information
540 
-        *
541 
-        */
542 
-        public function getLiveSpotterCount($begindate,$enddate,$filter = array())
543 
-        {
544 
-                global $globalDBdriver, $globalLiveInterval;
545 
-                date_default_timezone_set('UTC');
546 
-
547 
-                $filter_query = '';
548 
-                if (isset($filter['source']) && !empty($filter['source'])) {
549 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
550 
-                }
551 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
552 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
553 
-                }
554 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
555 
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
556 
-                }
557 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
558 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
559 
-                }
560 
-
561 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
562 
-                if ($globalDBdriver == 'mysql') {
537 
+	  * Gets count Live Spotter data
538 
+	  *
539 
+	  * @return Array the spotter information
540 
+	  *
541 
+	  */
542 
+		public function getLiveSpotterCount($begindate,$enddate,$filter = array())
543 
+		{
544 
+				global $globalDBdriver, $globalLiveInterval;
545 
+				date_default_timezone_set('UTC');
546 
+
547 
+				$filter_query = '';
548 
+				if (isset($filter['source']) && !empty($filter['source'])) {
549 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
550 
+				}
551 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
552 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
553 
+				}
554 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
555 
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
556 
+				}
557 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
558 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
559 
+				}
560 
+
561 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
562 
+				if ($globalDBdriver == 'mysql') {
563 563 
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb
564 564 
 			FROM spotter_archive l
565 565 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
566 
-                } else {
566 
+				} else {
567 567 
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
568 
-                }
569 
-                //echo $query;
570 
-                try {
571 
-                        $sth = $this->db->prepare($query);
572 
-                        $sth->execute();
573 
-                } catch(PDOException $e) {
574 
-                        echo $e->getMessage();
575 
-                        die;
576 
-                }
568 
+				}
569 
+				//echo $query;
570 
+				try {
571 
+						$sth = $this->db->prepare($query);
572 
+						$sth->execute();
573 
+				} catch(PDOException $e) {
574 
+						echo $e->getMessage();
575 
+						die;
576 
+				}
577 577 
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
578 578 
 		$sth->closeCursor();
579 
-                return $result['nb'];
579 
+				return $result['nb'];
580 580
581 
-        }
581 
+		}
582 582
583 583
584 584
585 585 
 	// Spotter_Archive_output
586 586
587 
-    /**
588 
-    * Gets all the spotter information
589 
-    *
590 
-    * @return Array the spotter information
591 
-    *
592 
-    */
593 
-    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
594 
-    {
587 
+	/**
588 
+	 * Gets all the spotter information
589 
+	 *
590 
+	 * @return Array the spotter information
591 
+	 *
592 
+	 */
593 
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
594 
+	{
595 595 
 	global $globalTimezone, $globalDBdriver;
596 596 
 	require_once(dirname(__FILE__).'/class.Translation.php');
597 597 
 	$Translation = new Translation();
 
@@ -605,159 +605,159 @@  discard block
 
 block discarded – undo
605 605 
 	$filter_query = $this->getFilter($filters);
606 606 
 	if ($q != "")
607 607 
 	{
608 
-	    if (!is_string($q))
609 
-	    {
608 
+		if (!is_string($q))
609 
+		{
610 610 
 		return false;
611 
-	    } else {
611 
+		} else {
612 612
613 613 
 		$q_array = explode(" ", $q);
614 614
615 615 
 		foreach ($q_array as $q_item){
616 
-		    $additional_query .= " AND (";
617 
-		    $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
618 
-		    $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
619 
-		    $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
620 
-		    $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
621 
-		    $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
622 
-		    $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
623 
-		    $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
624 
-		    $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
625 
-		    $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
626 
-		    $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
627 
-		    $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
628 
-		    $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
629 
-		    $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
630 
-		    $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
631 
-		    $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
632 
-		    $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
633 
-		    $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
634 
-		    $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
635 
-		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
636 
-		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
637 
-		    $translate = $Translation->ident2icao($q_item);
638 
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
639 
-		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
640 
-		    $additional_query .= ")";
641 
-		}
642 
-	    }
616 
+			$additional_query .= " AND (";
617 
+			$additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
618 
+			$additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
619 
+			$additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
620 
+			$additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
621 
+			$additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
622 
+			$additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
623 
+			$additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
624 
+			$additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
625 
+			$additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
626 
+			$additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
627 
+			$additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
628 
+			$additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
629 
+			$additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
630 
+			$additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
631 
+			$additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
632 
+			$additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
633 
+			$additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
634 
+			$additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
635 
+			$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
636 
+			$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
637 
+			$translate = $Translation->ident2icao($q_item);
638 
+			if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
639 
+			$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
640 
+			$additional_query .= ")";
641 
+		}
642 
+		}
643 643 
 	}
644 644
645 645 
 	if ($registration != "")
646 646 
 	{
647 
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
648 
-	    if (!is_string($registration))
649 
-	    {
647 
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
648 
+		if (!is_string($registration))
649 
+		{
650 650 
 		return false;
651 
-	    } else {
651 
+		} else {
652 652 
 		$additional_query .= " AND (spotter_archive_output.registration = '".$registration."')";
653 
-	    }
653 
+		}
654 654 
 	}
655 655
656 656 
 	if ($aircraft_icao != "")
657 657 
 	{
658 
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
659 
-	    if (!is_string($aircraft_icao))
660 
-	    {
658 
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
659 
+		if (!is_string($aircraft_icao))
660 
+		{
661 661 
 		return false;
662 
-	    } else {
662 
+		} else {
663 663 
 		$additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')";
664 
-	    }
664 
+		}
665 665 
 	}
666 666
667 667 
 	if ($aircraft_manufacturer != "")
668 668 
 	{
669 
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
670 
-	    if (!is_string($aircraft_manufacturer))
671 
-	    {
669 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
670 
+		if (!is_string($aircraft_manufacturer))
671 
+		{
672 672 
 		return false;
673 
-	    } else {
673 
+		} else {
674 674 
 		$additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
675 
-	    }
675 
+		}
676 676 
 	}
677 677
678 678 
 	if ($highlights == "true")
679 679 
 	{
680 
-	    if (!is_string($highlights))
681 
-	    {
680 
+		if (!is_string($highlights))
681 
+		{
682 682 
 		return false;
683 
-	    } else {
683 
+		} else {
684 684 
 		$additional_query .= " AND (spotter_archive_output.highlight <> '')";
685 
-	    }
685 
+		}
686 686 
 	}
687 687
688 688 
 	if ($airline_icao != "")
689 689 
 	{
690 
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
691 
-	    if (!is_string($airline_icao))
692 
-	    {
690 
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
691 
+		if (!is_string($airline_icao))
692 
+		{
693 693 
 		return false;
694 
-	    } else {
694 
+		} else {
695 695 
 		$additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')";
696 
-	    }
696 
+		}
697 697 
 	}
698 698
699 699 
 	if ($airline_country != "")
700 700 
 	{
701 
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
702 
-	    if (!is_string($airline_country))
703 
-	    {
701 
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
702 
+		if (!is_string($airline_country))
703 
+		{
704 704 
 		return false;
705 
-	    } else {
705 
+		} else {
706 706 
 		$additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')";
707 
-	    }
707 
+		}
708 708 
 	}
709 709
710 710 
 	if ($airline_type != "")
711 711 
 	{
712 
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
713 
-	    if (!is_string($airline_type))
714 
-	    {
712 
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
713 
+		if (!is_string($airline_type))
714 
+		{
715 715 
 		return false;
716 
-	    } else {
716 
+		} else {
717 717 
 		if ($airline_type == "passenger")
718 718 
 		{
719 
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
719 
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
720 720 
 		}
721 721 
 		if ($airline_type == "cargo")
722 722 
 		{
723 
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
723 
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
724 724 
 		}
725 725 
 		if ($airline_type == "military")
726 726 
 		{
727 
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
727 
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
728 
+		}
728 729 
 		}
729 
-	    }
730 730 
 	}
731 731
732 732 
 	if ($airport != "")
733 733 
 	{
734 
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
735 
-	    if (!is_string($airport))
736 
-	    {
734 
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
735 
+		if (!is_string($airport))
736 
+		{
737 737 
 		return false;
738 
-	    } else {
738 
+		} else {
739 739 
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))";
740 
-	    }
740 
+		}
741 741 
 	}
742 742
743 743 
 	if ($airport_country != "")
744 744 
 	{
745 
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
746 
-	    if (!is_string($airport_country))
747 
-	    {
745 
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
746 
+		if (!is_string($airport_country))
747 
+		{
748 748 
 		return false;
749 
-	    } else {
749 
+		} else {
750 750 
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))";
751 
-	    }
751 
+		}
752 752 
 	}
753 753
754 754 
 	if ($callsign != "")
755 755 
 	{
756 
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
757 
-	    if (!is_string($callsign))
758 
-	    {
756 
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
757 
+		if (!is_string($callsign))
758 
+		{
759 759 
 		return false;
760 
-	    } else {
760 
+		} else {
761 761 
 		$translate = $Translation->ident2icao($callsign);
762 762 
 		if ($translate != $callsign) {
763 763 
 			$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
 
@@ -765,99 +765,99 @@  discard block
 
 block discarded – undo
765 765 
 		} else {
766 766 
 			$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
767 767 
 		}
768 
-	    }
768 
+		}
769 769 
 	}
770 770
771 771 
 	if ($owner != "")
772 772 
 	{
773 
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
774 
-	    if (!is_string($owner))
775 
-	    {
773 
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
774 
+		if (!is_string($owner))
775 
+		{
776 776 
 		return false;
777 
-	    } else {
777 
+		} else {
778 778 
 		$additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')";
779 
-	    }
779 
+		}
780 780 
 	}
781 781
782 782 
 	if ($pilot_name != "")
783 783 
 	{
784 
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
785 
-	    if (!is_string($pilot_name))
786 
-	    {
784 
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
785 
+		if (!is_string($pilot_name))
786 
+		{
787 787 
 		return false;
788 
-	    } else {
788 
+		} else {
789 789 
 		$additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')";
790 
-	    }
790 
+		}
791 791 
 	}
792 792
793 793 
 	if ($pilot_id != "")
794 794 
 	{
795 
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
796 
-	    if (!is_string($pilot_id))
797 
-	    {
795 
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
796 
+		if (!is_string($pilot_id))
797 
+		{
798 798 
 		return false;
799 
-	    } else {
799 
+		} else {
800 800 
 		$additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')";
801 
-	    }
801 
+		}
802 802 
 	}
803 803
804 804 
 	if ($departure_airport_route != "")
805 805 
 	{
806 
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
807 
-	    if (!is_string($departure_airport_route))
808 
-	    {
806 
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
807 
+		if (!is_string($departure_airport_route))
808 
+		{
809 809 
 		return false;
810 
-	    } else {
810 
+		} else {
811 811 
 		$additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')";
812 
-	    }
812 
+		}
813 813 
 	}
814 814
815 815 
 	if ($arrival_airport_route != "")
816 816 
 	{
817 
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
818 
-	    if (!is_string($arrival_airport_route))
819 
-	    {
817 
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
818 
+		if (!is_string($arrival_airport_route))
819 
+		{
820 820 
 		return false;
821 
-	    } else {
821 
+		} else {
822 822 
 		$additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
823 
-	    }
823 
+		}
824 824 
 	}
825 825
826 826 
 	if ($altitude != "")
827 827 
 	{
828 
-	    $altitude_array = explode(",", $altitude);
828 
+		$altitude_array = explode(",", $altitude);
829 829
830 
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
831 
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
830 
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
831 
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
832 832
833 833
834 
-	    if ($altitude_array[1] != "")
835 
-	    {
834 
+		if ($altitude_array[1] != "")
835 
+		{
836 836 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
837 837 
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
838 838 
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
839 
-	    } else {
839 
+		} else {
840 840 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
841 841 
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
842 
-	    }
842 
+		}
843 843 
 	}
844 844
845 845 
 	if ($date_posted != "")
846 846 
 	{
847 
-	    $date_array = explode(",", $date_posted);
847 
+		$date_array = explode(",", $date_posted);
848 848
849 
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
850 
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
849 
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
850 
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
851 851
852 
-	    if ($globalTimezone != '') {
852 
+		if ($globalTimezone != '') {
853 853 
 		date_default_timezone_set($globalTimezone);
854 854 
 		$datetime = new DateTime();
855 855 
 		$offset = $datetime->format('P');
856 
-	    } else $offset = '+00:00';
856 
+		} else $offset = '+00:00';
857 857
858 858
859 
-	    if ($date_array[1] != "")
860 
-	    {
859 
+		if ($date_array[1] != "")
860 
+		{
861 861 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
862 862 
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
863 863 
 		if ($globalDBdriver == 'mysql') {
 
@@ -865,28 +865,28 @@  discard block
 
 block discarded – undo
865 865 
 		} else {
866 866 
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
867 867 
 		}
868 
-	    } else {
868 
+		} else {
869 869 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
870 
-                if ($globalDBdriver == 'mysql') {
870 
+				if ($globalDBdriver == 'mysql') {
871 871 
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
872 872 
 		} else {
873 873 
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
874 874 
 		}
875 
-	    }
875 
+		}
876 876 
 	}
877 877
878 878 
 	if ($limit != "")
879 879 
 	{
880 
-	    $limit_array = explode(",", $limit);
880 
+		$limit_array = explode(",", $limit);
881 881
882 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
883 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
882 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
883 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
884 884
885 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
886 
-	    {
885 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
886 
+		{
887 887 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
888 888 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
889 
-	    }
889 
+		}
890 890 
 	}
891 891
892 892 
 
@@ -917,33 +917,33 @@  discard block
 
 block discarded – undo
917 917 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
918 918
919 919 
 	return $spotter_array;
920 
-    }
920 
+	}
921 921
922 
-    public function deleteSpotterArchiveData()
923 
-    {
922 
+	public function deleteSpotterArchiveData()
923 
+	{
924 924 
 		global $globalArchiveKeepMonths, $globalDBdriver;
925 
-                date_default_timezone_set('UTC');
926 
-                if ($globalDBdriver == 'mysql') {
925 
+				date_default_timezone_set('UTC');
926 
+				if ($globalDBdriver == 'mysql') {
927 927 
 			$query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
928 928 
 		} else {
929 929 
 			$query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
930 930 
 		}
931 
-                try {
932 
-                        $sth = $this->db->prepare($query);
933 
-                        $sth->execute();
934 
-                } catch(PDOException $e) {
935 
-                        return "error";
936 
-                }
931 
+				try {
932 
+						$sth = $this->db->prepare($query);
933 
+						$sth->execute();
934 
+				} catch(PDOException $e) {
935 
+						return "error";
936 
+				}
937 937 
 	}
938 938
939 
-    /**
940 
-    * Gets all the spotter information based on the callsign
941 
-    *
942 
-    * @return Array the spotter information
943 
-    *
944 
-    */
945 
-    public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
946 
-    {
939 
+	/**
940 
+	 * Gets all the spotter information based on the callsign
941 
+	 *
942 
+	 * @return Array the spotter information
943 
+	 *
944 
+	 */
945 
+	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
946 
+	{
947 947 
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
948 948
949 949 
 	date_default_timezone_set('UTC');
 
@@ -955,35 +955,35 @@  discard block
 
 block discarded – undo
955 955
956 956 
 	if ($ident != "")
957 957 
 	{
958 
-	    if (!is_string($ident))
959 
-	    {
958 
+		if (!is_string($ident))
959 
+		{
960 960 
 		return false;
961 
-	    } else {
961 
+		} else {
962 962 
 		$additional_query = " AND (spotter_archive_output.ident = :ident)";
963 963 
 		$query_values = array(':ident' => $ident);
964 
-	    }
964 
+		}
965 965 
 	}
966 966
967 967 
 	if ($limit != "")
968 968 
 	{
969 
-	    $limit_array = explode(",", $limit);
969 
+		$limit_array = explode(",", $limit);
970 970
971 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
972 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
971 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
972 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
973 973
974 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
975 
-	    {
974 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
975 
+		{
976 976 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
977 977 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
978 
-	    }
978 
+		}
979 979 
 	}
980 980
981 981 
 	if ($sort != "")
982 982 
 	{
983 
-	    $search_orderby_array = $Spotter->getOrderBy();
984 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
983 
+		$search_orderby_array = $Spotter->getOrderBy();
984 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
985 985 
 	} else {
986 
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
986 
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
987 987 
 	}
988 988
989 989 
 	$query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
 
@@ -991,17 +991,17 @@  discard block
 
 block discarded – undo
991 991 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
992 992
993 993 
 	return $spotter_array;
994 
-    }
994 
+	}
995 995
996 996
997 
-    /**
998 
-    * Gets all the spotter information based on the owner
999 
-    *
1000 
-    * @return Array the spotter information
1001 
-    *
1002 
-    */
1003 
-    public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
1004 
-    {
997 
+	/**
998 
+	 * Gets all the spotter information based on the owner
999 
+	 *
1000 
+	 * @return Array the spotter information
1001 
+	 *
1002 
+	 */
1003 
+	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
1004 
+	{
1005 1005 
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
1006 1006
1007 1007 
 	date_default_timezone_set('UTC');
 
@@ -1014,35 +1014,35 @@  discard block
 
 block discarded – undo
1014 1014
1015 1015 
 	if ($owner != "")
1016 1016 
 	{
1017 
-	    if (!is_string($owner))
1018 
-	    {
1017 
+		if (!is_string($owner))
1018 
+		{
1019 1019 
 		return false;
1020 
-	    } else {
1020 
+		} else {
1021 1021 
 		$additional_query = " AND (spotter_archive_output.owner_name = :owner)";
1022 1022 
 		$query_values = array(':owner' => $owner);
1023 
-	    }
1023 
+		}
1024 1024 
 	}
1025 1025
1026 1026 
 	if ($limit != "")
1027 1027 
 	{
1028 
-	    $limit_array = explode(",", $limit);
1028 
+		$limit_array = explode(",", $limit);
1029 1029
1030 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1031 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1030 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1031 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1032 1032
1033 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1034 
-	    {
1033 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1034 
+		{
1035 1035 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1036 1036 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1037 
-	    }
1037 
+		}
1038 1038 
 	}
1039 1039
1040 1040 
 	if ($sort != "")
1041 1041 
 	{
1042 
-	    $search_orderby_array = $Spotter->getOrderBy();
1043 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1042 
+		$search_orderby_array = $Spotter->getOrderBy();
1043 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1044 1044 
 	} else {
1045 
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
1045 
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
1046 1046 
 	}
1047 1047
1048 1048 
 	$query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1050,16 +1050,16 @@  discard block
 
 block discarded – undo
1050 1050 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
1051 1051
1052 1052 
 	return $spotter_array;
1053 
-    }
1054 
-
1055 
-    /**
1056 
-    * Gets all the spotter information based on the pilot
1057 
-    *
1058 
-    * @return Array the spotter information
1059 
-    *
1060 
-    */
1061 
-    public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1062 
-    {
1053 
+	}
1054 
+
1055 
+	/**
1056 
+	 * Gets all the spotter information based on the pilot
1057 
+	 *
1058 
+	 * @return Array the spotter information
1059 
+	 *
1060 
+	 */
1061 
+	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1062 
+	{
1063 1063 
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
1064 1064
1065 1065 
 	date_default_timezone_set('UTC');
 
@@ -1078,24 +1078,24 @@  discard block
 
 block discarded – undo
1078 1078
1079 1079 
 	if ($limit != "")
1080 1080 
 	{
1081 
-	    $limit_array = explode(",", $limit);
1081 
+		$limit_array = explode(",", $limit);
1082 1082
1083 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1084 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1083 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1084 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1085 1085
1086 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1087 
-	    {
1086 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1087 
+		{
1088 1088 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1089 1089 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1090 
-	    }
1090 
+		}
1091 1091 
 	}
1092 1092
1093 1093 
 	if ($sort != "")
1094 1094 
 	{
1095 
-	    $search_orderby_array = $Spotter->getOrderBy();
1096 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1095 
+		$search_orderby_array = $Spotter->getOrderBy();
1096 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1097 1097 
 	} else {
1098 
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
1098 
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
1099 1099 
 	}
1100 1100
1101 1101 
 	$query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1103,16 +1103,16 @@  discard block
 
 block discarded – undo
1103 1103 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
1104 1104
1105 1105 
 	return $spotter_array;
1106 
-    }
1107 
-
1108 
-    /**
1109 
-    * Gets all number of flight over countries
1110 
-    *
1111 
-    * @return Array the airline country list
1112 
-    *
1113 
-    */
1114 
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1115 
-    {
1106 
+	}
1107 
+
1108 
+	/**
1109 
+	 * Gets all number of flight over countries
1110 
+	 *
1111 
+	 * @return Array the airline country list
1112 
+	 *
1113 
+	 */
1114 
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1115 
+	{
1116 1116 
 	global $globalDBdriver;
1117 1117 
 	/*
1118 1118 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1122,14 +1122,14 @@  discard block
 
 block discarded – undo
1122 1122 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
1123 1123 
 		    FROM countries c, spotter_archive s
1124 1124 
 		    WHERE c.iso2 = s.over_country ";
1125 
-                if ($olderthanmonths > 0) {
1126 
-            		if ($globalDBdriver == 'mysql') {
1125 
+				if ($olderthanmonths > 0) {
1126 
+					if ($globalDBdriver == 'mysql') {
1127 1127 
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1128 1128 
 			} else {
1129 1129 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1130 1130 
 			}
1131 1131 
 		}
1132 
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1132 
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1133 1133 
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1134 1134 
 	if ($limit) $query .= " LIMIT 0,10";
1135 1135 
       
@@ -1142,23 +1142,23 @@  discard block
 
 block discarded – undo
1142 1142
1143 1143 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1144 1144 
 	{
1145 
-	    $temp_array['flight_count'] = $row['nb'];
1146 
-	    $temp_array['flight_country'] = $row['name'];
1147 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1148 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1149 
-	    $flight_array[] = $temp_array;
1145 
+		$temp_array['flight_count'] = $row['nb'];
1146 
+		$temp_array['flight_country'] = $row['name'];
1147 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1148 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1149 
+		$flight_array[] = $temp_array;
1150 1150 
 	}
1151 1151 
 	return $flight_array;
1152 
-    }
1153 
-
1154 
-    /**
1155 
-    * Gets all number of flight over countries
1156 
-    *
1157 
-    * @return Array the airline country list
1158 
-    *
1159 
-    */
1160 
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1161 
-    {
1152 
+	}
1153 
+
1154 
+	/**
1155 
+	 * Gets all number of flight over countries
1156 
+	 *
1157 
+	 * @return Array the airline country list
1158 
+	 *
1159 
+	 */
1160 
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1161 
+	{
1162 1162 
 	global $globalDBdriver;
1163 1163 
 	/*
1164 1164 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1168,14 +1168,14 @@  discard block
 
 block discarded – undo
1168 1168 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
1169 1169 
 		    FROM countries c, spotter_archive s, spotter_output o
1170 1170 
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id ";
1171 
-                if ($olderthanmonths > 0) {
1172 
-            		if ($globalDBdriver == 'mysql') {
1171 
+				if ($olderthanmonths > 0) {
1172 
+					if ($globalDBdriver == 'mysql') {
1173 1173 
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1174 1174 
 			} else {
1175 1175 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1176 1176 
 			}
1177 1177 
 		}
1178 
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1178 
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1179 1179 
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1180 1180 
 	if ($limit) $query .= " LIMIT 0,10";
1181 1181 
       
@@ -1188,24 +1188,24 @@  discard block
 
 block discarded – undo
1188 1188
1189 1189 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1190 1190 
 	{
1191 
-	    $temp_array['airline_icao'] = $row['airline_icao'];
1192 
-	    $temp_array['flight_count'] = $row['nb'];
1193 
-	    $temp_array['flight_country'] = $row['name'];
1194 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1195 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1196 
-	    $flight_array[] = $temp_array;
1191 
+		$temp_array['airline_icao'] = $row['airline_icao'];
1192 
+		$temp_array['flight_count'] = $row['nb'];
1193 
+		$temp_array['flight_country'] = $row['name'];
1194 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1195 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1196 
+		$flight_array[] = $temp_array;
1197 1197 
 	}
1198 1198 
 	return $flight_array;
1199 
-    }
1200 
-
1201 
-    /**
1202 
-    * Gets last spotter information based on a particular callsign
1203 
-    *
1204 
-    * @return Array the spotter information
1205 
-    *
1206 
-    */
1207 
-    public function getDateArchiveSpotterDataById($id,$date)
1208 
-    {
1199 
+	}
1200 
+
1201 
+	/**
1202 
+	 * Gets last spotter information based on a particular callsign
1203 
+	 *
1204 
+	 * @return Array the spotter information
1205 
+	 *
1206 
+	 */
1207 
+	public function getDateArchiveSpotterDataById($id,$date)
1208 
+	{
1209 1209 
 	$Spotter = new Spotter($this->db);
1210 1210 
 	date_default_timezone_set('UTC');
1211 1211 
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
 
@@ -1213,16 +1213,16 @@  discard block
 
 block discarded – undo
1213 1213 
 	$date = date('c',$date);
1214 1214 
 	$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
1215 1215 
 	return $spotter_array;
1216 
-    }
1217 
-
1218 
-    /**
1219 
-    * Gets all the spotter information based on a particular callsign
1220 
-    *
1221 
-    * @return Array the spotter information
1222 
-    *
1223 
-    */
1224 
-    public function getDateArchiveSpotterDataByIdent($ident,$date)
1225 
-    {
1216 
+	}
1217 
+
1218 
+	/**
1219 
+	 * Gets all the spotter information based on a particular callsign
1220 
+	 *
1221 
+	 * @return Array the spotter information
1222 
+	 *
1223 
+	 */
1224 
+	public function getDateArchiveSpotterDataByIdent($ident,$date)
1225 
+	{
1226 1226 
 	$Spotter = new Spotter($this->db);
1227 1227 
 	date_default_timezone_set('UTC');
1228 1228 
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 
@@ -1230,16 +1230,16 @@  discard block
 
 block discarded – undo
1230 1230 
 	$date = date('c',$date);
1231 1231 
 	$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1232 1232 
 	return $spotter_array;
1233 
-    }
1234 
-
1235 
-    /**
1236 
-    * Gets all the spotter information based on the airport
1237 
-    *
1238 
-    * @return Array the spotter information
1239 
-    *
1240 
-    */
1241 
-    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1242 
-    {
1233 
+	}
1234 
+
1235 
+	/**
1236 
+	 * Gets all the spotter information based on the airport
1237 
+	 *
1238 
+	 * @return Array the spotter information
1239 
+	 *
1240 
+	 */
1241 
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1242 
+	{
1243 1243 
 	global $global_query;
1244 1244 
 	$Spotter = new Spotter();
1245 1245 
 	date_default_timezone_set('UTC');
 
@@ -1250,35 +1250,35 @@  discard block
 
 block discarded – undo
1250 1250
1251 1251 
 	if ($airport != "")
1252 1252 
 	{
1253 
-	    if (!is_string($airport))
1254 
-	    {
1253 
+		if (!is_string($airport))
1254 
+		{
1255 1255 
 		return false;
1256 
-	    } else {
1256 
+		} else {
1257 1257 
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))";
1258 1258 
 		$query_values = array(':airport' => $airport);
1259 
-	    }
1259 
+		}
1260 1260 
 	}
1261 1261
1262 1262 
 	if ($limit != "")
1263 1263 
 	{
1264 
-	    $limit_array = explode(",", $limit);
1264 
+		$limit_array = explode(",", $limit);
1265 1265
1266 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1267 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1266 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1267 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1268 1268
1269 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1270 
-	    {
1269 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1270 
+		{
1271 1271 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1272 1272 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1273 
-	    }
1273 
+		}
1274 1274 
 	}
1275 1275
1276 1276 
 	if ($sort != "")
1277 1277 
 	{
1278 
-	    $search_orderby_array = $Spotter->getOrderBy();
1279 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1278 
+		$search_orderby_array = $Spotter->getOrderBy();
1279 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1280 1280 
 	} else {
1281 
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
1281 
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
1282 1282 
 	}
1283 1283
1284 1284 
 	$query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
 
@@ -1286,6 +1286,6 @@  discard block
 
 block discarded – undo
1286 1286 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
1287 1287
1288 1288 
 	return $spotter_array;
1289 
-    }
1289 
+	}
1290 1290 
 }
1291 1291 
 ?>
1292 1292 
\ No newline at end of file
Please login to merge, or discard this patch.
require/class.SpotterImport.php 1 patch
Indentation   +400 added lines, -400 removed lines patch added patch discarded remove patch 
@@ -8,20 +8,20 @@  discard block
 
 block discarded – undo
8 8 
 require_once(dirname(__FILE__).'/class.Stats.php');
9 9 
 require_once(dirname(__FILE__).'/class.Source.php');
10 10 
 if (isset($globalServerAPRS) && $globalServerAPRS) {
11 
-    require_once(dirname(__FILE__).'/class.APRS.php');
11 
+	require_once(dirname(__FILE__).'/class.APRS.php');
12 12 
 }
13 13
14 14 
 class SpotterImport {
15 
-    private $all_flights = array();
16 
-    private $last_delete_hourly = 0;
17 
-    private $last_delete = 0;
18 
-    private $stats = array();
19 
-    private $tmd = 0;
20 
-    private $source_location = array();
21 
-    public $db = null;
22 
-    public $nb = 0;
23 
-
24 
-    public function __construct($dbc = null) {
15 
+	private $all_flights = array();
16 
+	private $last_delete_hourly = 0;
17 
+	private $last_delete = 0;
18 
+	private $stats = array();
19 
+	private $tmd = 0;
20 
+	private $source_location = array();
21 
+	public $db = null;
22 
+	public $nb = 0;
23 
+
24 
+	public function __construct($dbc = null) {
25 25 
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
26 26 
 	if (!(isset($globalNoDB) && $globalNoDB)) {
27 27 
 		$Connection = new Connection($dbc);
 
@@ -33,14 +33,14 @@  discard block
 
 block discarded – undo
33 33 
 		$currentdate = date('Y-m-d');
34 34 
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35 
 		if (!empty($sourcestat)) {
36 
-		    foreach($sourcestat as $srcst) {
37 
-		    	$type = $srcst['stats_type'];
36 
+			foreach($sourcestat as $srcst) {
37 
+				$type = $srcst['stats_type'];
38 38 
 			if ($type == 'polar' || $type == 'hist') {
39 
-			    $source = $srcst['source_name'];
40 
-			    $data = $srcst['source_data'];
41 
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42 
-	    		}
43 
-		    }
39 
+				$source = $srcst['source_name'];
40 
+				$data = $srcst['source_data'];
41 
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
42 
+				}
43 
+			}
44 44 
 		}
45 45 
 	}
46 46 
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
 
@@ -48,9 +48,9 @@  discard block
 
 block discarded – undo
48 48 
 		//$APRSSpotter->connect();
49 49 
 	}
50 50
51 
-    }
51 
+	}
52 52
53 
-    public function get_Schedule($id,$ident) {
53 
+	public function get_Schedule($id,$ident) {
54 54 
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55 
 	// Get schedule here, so it's done only one time
56 56 
 	
@@ -70,42 +70,42 @@  discard block
 
 block discarded – undo
70 70 
 	$operator = $Spotter->getOperator($ident);
71 71 
 	$scheduleexist = false;
72 72 
 	if ($Schedule->checkSchedule($operator) == 0) {
73 
-	    $operator = $Translation->checkTranslation($ident);
74 
-	    if ($Schedule->checkSchedule($operator) == 0) {
73 
+		$operator = $Translation->checkTranslation($ident);
74 
+		if ($Schedule->checkSchedule($operator) == 0) {
75 75 
 		$schedule = $Schedule->fetchSchedule($operator);
76 76 
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77 
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 
-		    // Should also check if route schedule = route from DB
81 
-		    if ($schedule['DepartureAirportIATA'] != '') {
77 
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 
+			// Should also check if route schedule = route from DB
81 
+			if ($schedule['DepartureAirportIATA'] != '') {
82 82 
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
83 
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 
-			    if (trim($airport_icao) != '') {
83 
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 
+				if (trim($airport_icao) != '') {
85 85 
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86 86 
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
87 
-			    }
87 
+				}
88 
+			}
88 89 
 			}
89 
-		    }
90 
-		    if ($schedule['ArrivalAirportIATA'] != '') {
90 
+			if ($schedule['ArrivalAirportIATA'] != '') {
91 91 
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
92 
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 
-			    if (trim($airport_icao) != '') {
92 
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 
+				if (trim($airport_icao) != '') {
94 94 
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95 95 
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
96 
-			    }
96 
+				}
97 97 
 			}
98 
-		    }
99 
-		    $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']);
98 
+			}
99 
+			$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']);
100 100 
 		}
101 
-	    } else $scheduleexist = true;
101 
+		} else $scheduleexist = true;
102 102 
 	} else $scheduleexist = true;
103 103 
 	// close connection, at least one way will work ?
104 
-       if ($scheduleexist) {
104 
+	   if ($scheduleexist) {
105 105 
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106 
-    		$sch = $Schedule->getSchedule($operator);
106 
+			$sch = $Schedule->getSchedule($operator);
107 107 
 		$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']));
108 
-       }
108 
+	   }
109 109 
 	$Spotter->db = null;
110 110 
 	$Schedule->db = null;
111 111 
 	$Translation->db = null;
 
@@ -120,78 +120,78 @@  discard block
 
 block discarded – undo
120 120 
 	}
121 121 
 	  */
122 122 
 	}
123 
-    }
123 
+	}
124 124
125 
-    public function checkAll() {
125 
+	public function checkAll() {
126 126 
 	global $globalDebug, $globalNoImport;
127 127 
 	if ($globalDebug) echo "Update last seen flights data...\n";
128 128 
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129 
-	    foreach ($this->all_flights as $key => $flight) {
129 
+		foreach ($this->all_flights as $key => $flight) {
130 130 
 		if (isset($this->all_flights[$key]['id'])) {
131 
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 
-    		    $Spotter = new Spotter($this->db);
133 
-        	    $real_arrival = $this->arrival($key);
134 
-        	    if (isset($this->all_flights[$key]['altitude'])) $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']);
135 
-        	}
136 
-	    }
131 
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 
+				$Spotter = new Spotter($this->db);
133 
+				$real_arrival = $this->arrival($key);
134 
+				if (isset($this->all_flights[$key]['altitude'])) $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']);
135 
+			}
136 
+		}
137 
+	}
137 138 
 	}
138 
-    }
139 139
140 
-    public function arrival($key) {
140 
+	public function arrival($key) {
141 141 
 	global $globalClosestMinDist, $globalDebug;
142 142 
 	if ($globalDebug) echo 'Update arrival...'."\n";
143 143 
 	$Spotter = new Spotter($this->db);
144 
-        $airport_icao = '';
145 
-        $airport_time = '';
146 
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
144 
+		$airport_icao = '';
145 
+		$airport_time = '';
146 
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147 
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148 
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 
-    	    if (isset($closestAirports[0])) {
150 
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 
-        	    $airport_icao = $closestAirports[0]['icao'];
152 
-        	    $airport_time = $this->all_flights[$key]['datetime'];
153 
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154 
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 
-        	    foreach ($closestAirports as $airport) {
156 
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 
-        		    $airport_icao = $airport['icao'];
158 
-        		    $airport_time = $this->all_flights[$key]['datetime'];
159 
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160 
-        		    break;
161 
-        		}
162 
-        	    }
163 
-        	} 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))) {
164 
-        		$airport_icao = $closestAirports[0]['icao'];
165 
-        		$airport_time = $this->all_flights[$key]['datetime'];
166 
-        	} else {
167 
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168 
-        	}
169 
-    	    } else {
170 
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171 
-    	    }
172 
-
173 
-        } else {
174 
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 
-        }
176 
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 
-    }
178 
-
179 
-
180 
-
181 
-    public function del() {
148 
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 
+			if (isset($closestAirports[0])) {
150 
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 
+				$airport_icao = $closestAirports[0]['icao'];
152 
+				$airport_time = $this->all_flights[$key]['datetime'];
153 
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154 
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 
+				foreach ($closestAirports as $airport) {
156 
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 
+					$airport_icao = $airport['icao'];
158 
+					$airport_time = $this->all_flights[$key]['datetime'];
159 
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160 
+					break;
161 
+				}
162 
+				}
163 
+			} 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))) {
164 
+				$airport_icao = $closestAirports[0]['icao'];
165 
+				$airport_time = $this->all_flights[$key]['datetime'];
166 
+			} else {
167 
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168 
+			}
169 
+			} else {
170 
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171 
+			}
172 
+
173 
+		} else {
174 
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 
+		}
176 
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 
+	}
178 
+
179 
+
180 
+
181 
+	public function del() {
182 182 
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 183 
 	// Delete old infos
184 184 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185 
 	foreach ($this->all_flights as $key => $flight) {
186 
-	    if (isset($flight['lastupdate'])) {
186 
+		if (isset($flight['lastupdate'])) {
187 187 
 		if ($flight['lastupdate'] < (time()-5900)) {
188 
-		    $this->delKey($key);
188 
+			$this->delKey($key);
189 
+		}
189 190 
 		}
190 
-	    }
191 191 
 	}
192 
-    }
192 
+	}
193 193
194 
-    public function delKey($key) {
194 
+	public function delKey($key) {
195 195 
 	global $globalDebug, $globalNoImport, $globalNoDB;
196 196 
 	// Delete old infos
197 197 
 	if (isset($this->all_flights[$key]['id'])) {
 
@@ -206,9 +206,9 @@  discard block
 
 block discarded – undo
206 206 
 		}
207 207 
 	}
208 208 
 	unset($this->all_flights[$key]);
209 
-    }
209 
+	}
210 210
211 
-    public function add($line) {
211 
+	public function add($line) {
212 212 
 	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;
213 213 
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
214 214 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
 
@@ -234,20 +234,20 @@  discard block
 
 block discarded – undo
234 234
235 235 
 	// SBS format is CSV format
236 236 
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
237 
-	    //print_r($line);
238 
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
239 
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
237 
+		//print_r($line);
238 
+		if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
239 
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
240 240
241 241 
 		// Increment message number
242 242 
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
243 
-		    $current_date = date('Y-m-d');
244 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
245 
-		    else $source = '';
246 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
247 
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
248 
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
249 
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
250 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
243 
+			$current_date = date('Y-m-d');
244 
+			if (isset($line['source_name'])) $source = $line['source_name'];
245 
+			else $source = '';
246 
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
247 
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
248 
+				$this->stats[$current_date][$source]['msg']['date'] = time();
249 
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
250 
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
251 251 
 		}
252 252
253 253 
 		/*
 
@@ -263,53 +263,53 @@  discard block
 
 block discarded – undo
263 263 
 		//$this->db = $dbc;
264 264
265 265 
 		//$hex = trim($line['hex']);
266 
-	        if (!isset($line['id'])) $id = trim($line['hex']);
267 
-	        else $id = trim($line['id']);
266 
+			if (!isset($line['id'])) $id = trim($line['hex']);
267 
+			else $id = trim($line['id']);
268 268
269 269 
 		if (!isset($this->all_flights[$id])) {
270 
-		    $this->all_flights[$id] = array();
271 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
272 
-		    $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' => ''));
273 
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
274 
-		    if (!isset($line['id'])) {
270 
+			$this->all_flights[$id] = array();
271 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
272 
+			$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' => ''));
273 
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
274 
+			if (!isset($line['id'])) {
275 275 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
276 276 
 //			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')));
277 277 
 //			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')));
278 278 
 			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' || $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')));
279 
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
280 
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
281 
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
279 
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
280 
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
281 
+			if ($globalAllFlights !== FALSE) $dataFound = true;
282 282 
 		}
283 283 
 		if (isset($line['source_type']) && $line['source_type'] != '') {
284 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
284 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
285 285 
 		}
286 286
287 287 
 		//print_r($this->all_flights);
288 288 
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
289 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
290 
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
289 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
290 
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
291 291 
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
292 
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
293 
-		    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') {
292 
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
293 
+			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') {
294 294 
 			$timeelapsed = microtime(true);
295 295 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
296 
-			    $Spotter = new Spotter($this->db);
297 
-			    if (isset($this->all_flights[$id]['source_type'])) {
296 
+				$Spotter = new Spotter($this->db);
297 
+				if (isset($this->all_flights[$id]['source_type'])) {
298 298 
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
299 
-			    } else {
299 
+				} else {
300 300 
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
301 
-			    }
302 
-			    $Spotter->db = null;
303 
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
304 
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
301 
+				}
302 
+				$Spotter->db = null;
303 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
304 
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
305 
+			}
305 306 
 			}
306 
-		    }
307 
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
308 
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
307 
+			if ($globalAllFlights !== FALSE) $dataFound = true;
308 
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
309 309 
 		}
310 
-	        if (isset($line['id']) && !isset($line['hex'])) {
311 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
312 
-	        }
310 
+			if (isset($line['id']) && !isset($line['hex'])) {
311 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
312 
+			}
313 313 
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
314 314 
 			$icao = $line['aircraft_icao'];
315 315 
 			$Spotter = new Spotter($this->db);
 
@@ -338,9 +338,9 @@  discard block
 
 block discarded – undo
338 338 
 		}
339 339 
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
340 340 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
341 
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
341 
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
342 342 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
343 
-		    } else {
343 
+			} else {
344 344 
 				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";
345 345 
 				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";
346 346 
 				/*
 
@@ -349,7 +349,7 @@  discard block
 
 block discarded – undo
349 349 
 				print_r($line);
350 350 
 				*/
351 351 
 				return '';
352 
-		    }
352 
+			}
353 353 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
354 354 
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n";
355 355 
 			return '';
 
@@ -366,21 +366,21 @@  discard block
 
 block discarded – undo
366 366 
 		}
367 367
368 368 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
369 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
369 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
370 370 
 		}
371 371 
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
372 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
372 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
373 373 
 		}
374 374 
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
375 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
375 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
376 376 
 		}
377 377 
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
378 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
378 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
379 379 
 		}
380 380
381 381 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
382 382
383 
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
383 
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
384 384 
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
385 385 
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
386 386 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 
@@ -389,23 +389,23 @@  discard block
 
 block discarded – undo
389 389 
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
390 390 
 				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']));
391 391 
 			} else {
392 
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
393 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
392 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
393 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
394 394 
 				$timeelapsed = microtime(true);
395 
-            			$Spotter = new Spotter($this->db);
396 
-            			$fromsource = NULL;
397 
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
398 
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
395 
+						$Spotter = new Spotter($this->db);
396 
+						$fromsource = NULL;
397 
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
398 
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
399 399 
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
400 400 
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
401 401 
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
402 
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
402 
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
403 403 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
404 404 
 				$Spotter->db = null;
405 405 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
406 
-			    }
406 
+				}
407 407 
 			}
408 
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
408 
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
409 409
410 410 
 /*
411 411 
 		    if (!isset($line['id'])) {
 
@@ -415,90 +415,90 @@  discard block
 
 block discarded – undo
415 415 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
416 416 
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
417 417 
   */
418 
-		    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']));
418 
+			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']));
419 419
420 
-		    //$putinarchive = true;
421 
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
420 
+			//$putinarchive = true;
421 
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
422 422 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
423 
-		    }
424 
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
423 
+			}
424 
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
425 425 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
426 
-		    }
427 
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
428 
-		    		$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' => ''));
429 
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
426 
+			}
427 
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
428 
+					$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' => ''));
429 
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
430 430 
 			$timeelapsed = microtime(true);
431 431 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
432 432 
 				$Spotter = new Spotter($this->db);
433 433 
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
434 434 
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
435 
-		    		$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' => ''));
435 
+					$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' => ''));
436 436 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
437 
-                        }
438 
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
437 
+						}
438 
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
439 439 
 			$timeelapsed = microtime(true);
440 440 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
441 
-			    $Spotter = new Spotter($this->db);
442 
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
443 
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
441 
+				$Spotter = new Spotter($this->db);
442 
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
443 
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
444 444 
 				$Translation = new Translation($this->db);
445 445 
 				$ident = $Translation->checkTranslation(trim($line['ident']));
446 446 
 				$route = $Spotter->getRouteInfo($ident);
447 447 
 				$Translation->db = null;
448 
-			    }
449 
-			    $Spotter->db = null;
450 
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
451 
-                    	}
448 
+				}
449 
+				$Spotter->db = null;
450 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
451 
+						}
452 452 
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
453 
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
454 
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
453 
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
454 
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
455 455 
 				//    $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']));
456 
-		    		$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']));
457 
-		    	    }
456 
+					$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']));
457 
+					}
458 458 
 			}
459 459 
 			if (!isset($globalFork)) $globalFork = TRUE;
460 460 
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
461 461 
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
462 462 
 			}
463 
-		    }
463 
+			}
464 464 
 		}
465 465
466 466 
 		if (isset($line['speed']) && $line['speed'] != '') {
467 467 
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
468 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
469 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
470 
-		    //$dataFound = true;
468 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
469 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
470 
+			//$dataFound = true;
471 471 
 		} 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'])) {
472 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
473 
-		    if ($distance > 1000 && $distance < 10000) {
474 
-		    // use datetime
472 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
473 
+			if ($distance > 1000 && $distance < 10000) {
474 
+			// use datetime
475 475 
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
476 476 
 			$speed = $speed*3.6;
477 477 
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
478 478 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
479 
-		    }
479 
+			}
480 480 
 		}
481 481
482 482
483 483
484 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
485 
-	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
486 
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
487 
-	    	    	return false;
488 
-	    	    }
489 
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
490 
-	    	    else unset($timediff);
491 
-	    	    if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
484 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
485 
+				if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
486 
+					if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
487 
+					return false;
488 
+				}
489 
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
490 
+				else unset($timediff);
491 
+				if ($this->tmd > 5 || isset($line['format_source']) && $line['format_source'] == 'airwhere' && ((!isset($this->all_flights[$id]['latitude']) || !isset($this->all_flights[$id]['longitude'])) || (isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $this->all_flights[$id]['latitude'] != $line['latitude'] && $this->all_flights[$id]['longitude'] != $line['longitude'])) || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
492 492 
 			if (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'])) {
493 
-			    if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$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'])) {
493 
+				if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || isset($line['format_source']) && $line['format_source'] == 'airwhere' || !$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'])) {
494 494 
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
495 495 
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
496 496 
 				$this->all_flights[$id]['putinarchive'] = true;
497 497 
 				$this->tmd = 0;
498 498 
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
499 
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
500 
-				    $timeelapsed = microtime(true);
501 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
499 
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
500 
+					$timeelapsed = microtime(true);
501 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
502 502 
 					$Spotter = new Spotter($this->db);
503 503 
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
504 504 
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 
@@ -506,18 +506,18 @@  discard block
 
 block discarded – undo
506 506 
 					$Spotter->db = null;
507 507 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
508 508 
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
509 
-				    }
509 
+					}
510 
+				}
510 511 
 				}
511 
-			    }
512 512 
 			}
513 513
514 514 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
515 
-			    //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) {
515 
+				//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) {
516 516 
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
517 517 
 				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) {
518 
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
519 
-				    $dataFound = true;
520 
-				    $this->all_flights[$id]['time_last_coord'] = time();
518 
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
519 
+					$dataFound = true;
520 
+					$this->all_flights[$id]['time_last_coord'] = time();
521 521 
 				}
522 522 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
523 523 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
 
@@ -528,20 +528,20 @@  discard block
 
 block discarded – undo
528 528 
 				    //$putinarchive = true;
529 529 
 				}
530 530 
 				*/
531 
-			    /*
531 
+				/*
532 532 
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
533 533 
 				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";
534 534 
 			    }
535 535 
 			    */
536 536 
 			}
537 537 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
538 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
539 
-			    //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) {
538 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
539 
+				//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) {
540 540 
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
541 541 
 				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) {
542 
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
543 
-				    $dataFound = true;
544 
-				    $this->all_flights[$id]['time_last_coord'] = time();
542 
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
543 
+					$dataFound = true;
544 
+					$this->all_flights[$id]['time_last_coord'] = time();
545 545 
 				}
546 546 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
547 547 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
 
@@ -559,77 +559,77 @@  discard block
 
 block discarded – undo
559 559 
 			    */
560 560 
 			}
561 561
562 
-		    } else if ($globalDebug && $timediff > 30) {
562 
+			} else if ($globalDebug && $timediff > 30) {
563 563 
 			$this->tmd = $this->tmd + 1;
564 564 
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
565 565 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
566 566 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
567 567 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
568 
-		    }
568 
+			}
569 569 
 		}
570 570 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
571 
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
572 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
571 
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
572 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
573 573 
 		}
574 574 
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
575 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
576 
-		    //$dataFound = true;
575 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
576 
+			//$dataFound = true;
577 577 
 		}
578 578 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
579 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
579 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
580 580 
 		}
581 581 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
582 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
582 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
583 583 
 		}
584 584 
 		if (isset($line['emergency']) && $line['emergency'] != '') {
585 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
586 
-		    //$dataFound = true;
585 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
586 
+			//$dataFound = true;
587 587 
 		}
588 588 
 		if (isset($line['ground']) && $line['ground'] != '') {
589 
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
589 
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
590 590 
 			// Here we force archive of flight because after ground it's a new one (or should be)
591 591 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
592 592 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
593 593 
 			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' || $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')));
594 
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
594 
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
595 595 
 			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']));
596 
-		    }
597 
-		    if ($line['ground'] != 1) $line['ground'] = 0;
598 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
599 
-		    //$dataFound = true;
596 
+			}
597 
+			if ($line['ground'] != 1) $line['ground'] = 0;
598 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
599 
+			//$dataFound = true;
600 600 
 		}
601 601 
 		if (isset($line['squawk']) && $line['squawk'] != '') {
602 
-		    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'])) {
603 
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
604 
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
605 
-			    $highlight = '';
606 
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
607 
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
608 
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
609 
-			    if ($highlight != '') {
602 
+			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'])) {
603 
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
604 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
605 
+				$highlight = '';
606 
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
607 
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
608 
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
609 
+				if ($highlight != '') {
610 610 
 				$timeelapsed = microtime(true);
611 611 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
612 
-				    $Spotter = new Spotter($this->db);
613 
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
614 
-				    $Spotter->db = null;
615 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
612 
+					$Spotter = new Spotter($this->db);
613 
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
614 
+					$Spotter->db = null;
615 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
616 616 
 				}
617 617 
 				//$putinarchive = true;
618 618 
 				//$highlight = '';
619 
-			    }
619 
+				}
620 620
621 
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
622 
-		    //$dataFound = true;
621 
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
622 
+			//$dataFound = true;
623 623 
 		}
624 624
625 625 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
626 
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
626 
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
627 627 
 			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;
628 628 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
629 629 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
630 630 
 			//$dataFound = true;
631 
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
632 
-		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
631 
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
632 
+			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
633 633 
 			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) {
634 634 
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
635 635 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 
@@ -638,27 +638,27 @@  discard block
 
 block discarded – undo
638 638 
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
639 639 
 				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']));
640 640 
 			}
641 
-		    }
642 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
641 
+			}
642 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
643 643 
 		}
644 644
645 645 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
646 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
646 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
647 647 
 		}
648 648
649 649 
 		if (isset($line['heading']) && $line['heading'] != '') {
650 
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
651 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
652 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
653 
-		    //$dataFound = true;
650 
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
651 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
652 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
653 
+			//$dataFound = true;
654 654 
   		} 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']) {
655 
-  		    $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']);
656 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
657 
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
658 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
655 
+  			$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']);
656 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
657 
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
658 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
659 659 
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
660 
-  		    // If not enough messages and ACARS set heading to 0
661 
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
660 
+  			// If not enough messages and ACARS set heading to 0
661 
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
662 662 
   		}
663 663 
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
664 664 
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
 
@@ -671,125 +671,125 @@  discard block
 
 block discarded – undo
671 671 
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
672 672 
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
673 673 
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
674 
-		    $this->all_flights[$id]['lastupdate'] = time();
675 
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
676 
-		        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'])) {
677 
-			    //print_r($this->all_flights);
678 
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
679 
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
680 
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
674 
+			$this->all_flights[$id]['lastupdate'] = time();
675 
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
676 
+				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'])) {
677 
+				//print_r($this->all_flights);
678 
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
679 
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
680 
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
681 681 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
682 
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
683 
-				    $timeelapsed = microtime(true);
684 
-				    $SpotterLive = new SpotterLive($this->db);
685 
-				    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' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
682 
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
683 
+					$timeelapsed = microtime(true);
684 
+					$SpotterLive = new SpotterLive($this->db);
685 
+					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' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
686 686 
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
687 687 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
688 
-				    } elseif (isset($line['id'])) {
688 
+					} elseif (isset($line['id'])) {
689 689 
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
690 690 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
691 
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
691 
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
692 692 
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
693 693 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
694 
-				    } else $recent_ident = '';
695 
-				    $SpotterLive->db=null;
696 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
697 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
694 
+					} else $recent_ident = '';
695 
+					$SpotterLive->db=null;
696 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
697 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
698 698 
 				} else $recent_ident = '';
699 
-			    } else {
699 
+				} else {
700 700 
 				$recent_ident = '';
701 701 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
702 
-			    }
703 
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
704 
-			    if($recent_ident == "")
705 
-			    {
702 
+				}
703 
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
704 
+				if($recent_ident == "")
705 
+				{
706 706 
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
707 707 
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
708 708 
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
709 709 
 				//adds the spotter data for the archive
710 710 
 				$ignoreImport = false;
711 711 
 				foreach($globalAirportIgnore as $airportIgnore) {
712 
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
712 
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
713 713 
 					$ignoreImport = true;
714 
-				    }
714 
+					}
715 715 
 				}
716 716 
 				if (count($globalAirportAccept) > 0) {
717 
-				    $ignoreImport = true;
718 
-				    foreach($globalAirportIgnore as $airportIgnore) {
717 
+					$ignoreImport = true;
718 
+					foreach($globalAirportIgnore as $airportIgnore) {
719 719 
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
720 
-					    $ignoreImport = false;
720 
+						$ignoreImport = false;
721 
+					}
721 722 
 					}
722 
-				    }
723 723 
 				}
724 724 
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
725 
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
725 
+					foreach($globalAirlineIgnore as $airlineIgnore) {
726 726 
 					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)) {
727 
-					    $ignoreImport = true;
727 
+						$ignoreImport = true;
728 
+					}
728 729 
 					}
729 
-				    }
730 730 
 				}
731 731 
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
732 
-				    $ignoreImport = true;
733 
-				    foreach($globalAirlineAccept as $airlineAccept) {
732 
+					$ignoreImport = true;
733 
+					foreach($globalAirlineAccept as $airlineAccept) {
734 734 
 					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)) {
735 
-					    $ignoreImport = false;
735 
+						$ignoreImport = false;
736 
+					}
736 737 
 					}
737 
-				    }
738 738 
 				}
739 739 
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
740 
-				    $ignoreImport = true;
741 
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
740 
+					$ignoreImport = true;
741 
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
742 742 
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
743 
-					    $ignoreImport = false;
743 
+						$ignoreImport = false;
744 
+					}
744 745 
 					}
745 
-				    }
746 746 
 				}
747 747
748 748 
 				if (!$ignoreImport) {
749 
-				    $highlight = '';
750 
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
751 
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
752 
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
753 
-				    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')));
754 
-				    $timeelapsed = microtime(true);
755 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
749 
+					$highlight = '';
750 
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
751 
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
752 
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
753 
+					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')));
754 
+					$timeelapsed = microtime(true);
755 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
756 756 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
757 
-					    $Spotter = new Spotter($this->db);
758 
-					    $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']);
759 
-					    $Spotter->db = null;
760 
-					    if ($globalDebug && isset($result)) echo $result."\n";
757 
+						$Spotter = new Spotter($this->db);
758 
+						$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']);
759 
+						$Spotter->db = null;
760 
+						if ($globalDebug && isset($result)) echo $result."\n";
761 761 
 					}
762 
-				    }
763 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
764 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
762 
+					}
763 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
764 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
765 765
766 
-				    // Add source stat in DB
767 
-				    $Stats = new Stats($this->db);
768 
-				    if (!empty($this->stats)) {
766 
+					// Add source stat in DB
767 
+					$Stats = new Stats($this->db);
768 
+					if (!empty($this->stats)) {
769 769 
 					if ($globalDebug) echo 'Add source stats : ';
770 
-				        foreach($this->stats as $date => $data) {
771 
-					    foreach($data as $source => $sourced) {
772 
-					        //print_r($sourced);
773 
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
774 
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
775 
-				    		if (isset($sourced['msg'])) {
776 
-				    		    if (time() - $sourced['msg']['date'] > 10) {
777 
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
778 
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
779 
-			    			        unset($this->stats[$date][$source]['msg']);
780 
-			    			    }
781 
-			    			}
782 
-			    		    }
783 
-			    		    if ($date != date('Y-m-d')) {
784 
-			    			unset($this->stats[$date]);
785 
-			    		    }
786 
-				    	}
787 
-				    	if ($globalDebug) echo 'Done'."\n";
788 
-
789 
-				    }
790 
-				    $Stats->db = null;
791 
-				    }
792 
-				    $this->del();
770 
+						foreach($this->stats as $date => $data) {
771 
+						foreach($data as $source => $sourced) {
772 
+							//print_r($sourced);
773 
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
774 
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
775 
+							if (isset($sourced['msg'])) {
776 
+								if (time() - $sourced['msg']['date'] > 10) {
777 
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
778 
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
779 
+									unset($this->stats[$date][$source]['msg']);
780 
+								}
781 
+							}
782 
+							}
783 
+							if ($date != date('Y-m-d')) {
784 
+							unset($this->stats[$date]);
785 
+							}
786 
+						}
787 
+						if ($globalDebug) echo 'Done'."\n";
788 
+
789 
+					}
790 
+					$Stats->db = null;
791 
+					}
792 
+					$this->del();
793 793 
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
794 794 
 				//$ignoreImport = false;
795 795 
 				$this->all_flights[$id]['addedSpotter'] = 1;
 
@@ -807,41 +807,41 @@  discard block
 
 block discarded – undo
807 807 
 			*/
808 808 
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
809 809 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
810 
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
811 
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
812 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
810 
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
811 
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
812 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
813 813 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
814 
-					    $SpotterLive = new SpotterLive($this->db);
815 
-					    $SpotterLive->deleteLiveSpotterData();
816 
-					    $SpotterLive->db=null;
814 
+						$SpotterLive = new SpotterLive($this->db);
815 
+						$SpotterLive->deleteLiveSpotterData();
816 
+						$SpotterLive->db=null;
817 
+					}
817 818 
 					}
818 
-				    }
819 
-				    if ($globalDebug) echo " Done\n";
820 
-				    $this->last_delete = time();
819 
+					if ($globalDebug) echo " Done\n";
820 
+					$this->last_delete = time();
821 821 
 				}
822 
-			    } else {
822 
+				} else {
823 823 
 				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' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
824 
-				    $this->all_flights[$id]['id'] = $recent_ident;
825 
-				    $this->all_flights[$id]['addedSpotter'] = 1;
824 
+					$this->all_flights[$id]['id'] = $recent_ident;
825 
+					$this->all_flights[$id]['addedSpotter'] = 1;
826 826 
 				}
827 827 
 				if (isset($globalDaemon) && !$globalDaemon) {
828 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
828 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
829 829 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
830 
-					    $Spotter = new Spotter($this->db);
831 
-					    $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']);
832 
-					    $Spotter->db = null;
830 
+						$Spotter = new Spotter($this->db);
831 
+						$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']);
832 
+						$Spotter->db = null;
833 
+					}
833 834 
 					}
834 
-				    }
835 835 
 				}
836 836
837 
-			    }
837 
+				}
838 
+			}
838 839 
 			}
839 
-		    }
840 
-		    //adds the spotter LIVE data
841 
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
842 
-		    //echo "\nAdd in Live !! \n";
843 
-		    //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";
844 
-		    if ($globalDebug) {
840 
+			//adds the spotter LIVE data
841 
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
842 
+			//echo "\nAdd in Live !! \n";
843 
+			//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";
844 
+			if ($globalDebug) {
845 845 
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
846 846 
 				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";
847 847 
 				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";
 
@@ -849,60 +849,60 @@  discard block
 
 block discarded – undo
849 849 
 				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";
850 850 
 				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";
851 851 
 			}
852 
-		    }
853 
-		    $ignoreImport = false;
854 
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
855 
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
852 
+			}
853 
+			$ignoreImport = false;
854 
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
855 
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
856 856
857 
-		    foreach($globalAirportIgnore as $airportIgnore) {
858 
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
859 
-			    $ignoreImport = true;
857 
+			foreach($globalAirportIgnore as $airportIgnore) {
858 
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
859 
+				$ignoreImport = true;
860 860 
 			}
861 
-		    }
862 
-		    if (count($globalAirportAccept) > 0) {
863 
-		        $ignoreImport = true;
864 
-		        foreach($globalAirportIgnore as $airportIgnore) {
865 
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
861 
+			}
862 
+			if (count($globalAirportAccept) > 0) {
863 
+				$ignoreImport = true;
864 
+				foreach($globalAirportIgnore as $airportIgnore) {
865 
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
866 866 
 				$ignoreImport = false;
867 
-			    }
867 
+				}
868 
+			}
868 869 
 			}
869 
-		    }
870 
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
870 
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
871 871 
 			foreach($globalAirlineIgnore as $airlineIgnore) {
872 
-			    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)) {
872 
+				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)) {
873 873 
 				$ignoreImport = true;
874 
-			    }
874 
+				}
875 875 
 			}
876 
-		    }
877 
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
876 
+			}
877 
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
878 878 
 			$ignoreImport = true;
879 879 
 			foreach($globalAirlineAccept as $airlineAccept) {
880 
-			    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)) {
880 
+				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)) {
881 881 
 				$ignoreImport = false;
882 
-			    }
882 
+				}
883 
+			}
883 884 
 			}
884 
-		    }
885 
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
885 
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
886 886 
 			$ignoreImport = true;
887 887 
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
888 
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
889 
-			        $ignoreImport = false;
890 
-			    }
888 
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
889 
+					$ignoreImport = false;
890 
+				}
891 
+			}
891 892 
 			}
892 
-		    }
893 893
894 
-		    if (!$ignoreImport) {
894 
+			if (!$ignoreImport) {
895 895 
 			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'])) {
896 896 
 				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')));
897 897 
 				$timeelapsed = microtime(true);
898 898 
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
899 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
899 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
900 900 
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
901 901 
 					$SpotterLive = new SpotterLive($this->db);
902 902 
 					$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']);
903 903 
 					$SpotterLive->db = null;
904 904 
 					if ($globalDebug) echo $result."\n";
905 
-				    }
905 
+					}
906 906 
 				}
907 907 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
908 908 
 					$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']);
 
@@ -914,7 +914,7 @@  discard block
 
 block discarded – undo
914 914 
 				//if ($line['format_source'] != 'aprs') {
915 915 
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
916 916 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
917 
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
917 
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
918 918 
 					$source = $this->all_flights[$id]['source_name'];
919 919 
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
920 920 
 					if (!isset($this->source_location[$source])) {
 
@@ -940,7 +940,7 @@  discard block
 
 block discarded – undo
940 940 
 					if ($stats_heading == 16) $stats_heading = 0;
941 941 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
942 942 
 						for ($i=0;$i<=15;$i++) {
943 
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
943 
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
944 944 
 						}
945 945 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
946 946 
 					} else {
 
@@ -953,17 +953,17 @@  discard block
 
 block discarded – undo
953 953 
 					//var_dump($this->stats);
954 954 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
955 955 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
956 
-						    end($this->stats[$current_date][$source]['hist']);
957 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
956 
+							end($this->stats[$current_date][$source]['hist']);
957 
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
958 958 
 						} else $mini = 0;
959 959 
 						for ($i=$mini;$i<=$distance;$i+=10) {
960 
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
960 
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
961 961 
 						}
962 962 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
963 963 
 					} else {
964 964 
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
965 965 
 					}
966 
-				    }
966 
+					}
967 967 
 				}
968 968
969 969 
 				$this->all_flights[$id]['lastupdate'] = time();
 
@@ -973,7 +973,7 @@  discard block
 
 block discarded – undo
973 973 
 			//$this->del();
974 974
975 975 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
976 
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
976 
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
977 977 
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
978 978 
 				$SpotterLive = new SpotterLive($this->db);
979 979 
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
 
@@ -981,19 +981,19 @@  discard block
 
 block discarded – undo
981 981 
 				//SpotterLive->deleteLiveSpotterData();
982 982 
 				if ($globalDebug) echo " Done\n";
983 983 
 				$this->last_delete_hourly = time();
984 
-			    } else {
984 
+				} else {
985 985 
 				$this->del();
986 986 
 				$this->last_delete_hourly = time();
987 
-			    }
987 
+				}
988 988 
 			}
989 989
990 
-		    }
991 
-		    //$ignoreImport = false;
990 
+			}
991 
+			//$ignoreImport = false;
992 992 
 		}
993 993 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
994 994 
 		if ($send) return $this->all_flights[$id];
995 
-	    }
995 
+		}
996 
+	}
996 997 
 	}
997 
-    }
998 998 
 }
999 999 
 ?>
Please login to merge, or discard this patch.
require/class.SpotterLive.php 1 patch
Indentation   +204 added lines, -204 removed lines patch added patch discarded remove patch 
@@ -12,10 +12,10 @@  discard block
 
 block discarded – undo
12 12
13 13
14 14 
 	/**
15 
-	* Get SQL query part for filter used
16 
-	* @param Array $filter the filter
17 
-	* @return Array the SQL part
18 
-	*/
15 
+	 * Get SQL query part for filter used
16 
+	 * @param Array $filter the filter
17 
+	 * @return Array the SQL part
18 
+	 */
19 19 
 	public function getFilter($filter = array(),$where = false,$and = false) {
20 20 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
21 21 
 		$filters = array();
 
@@ -128,11 +128,11 @@  discard block
 
 block discarded – undo
128 128 
 	}
129 129
130 130 
 	/**
131 
-	* Gets all the spotter information based on the latest data entry
132 
-	*
133 
-	* @return Array the spotter information
134 
-	*
135 
-	*/
131 
+	 * Gets all the spotter information based on the latest data entry
132 
+	 *
133 
+	 * @return Array the spotter information
134 
+	 *
135 
+	 */
136 136 
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
137 137 
 	{
138 138 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -175,11 +175,11 @@  discard block
 
 block discarded – undo
175 175 
 	}
176 176
177 177 
 	/**
178 
-	* Gets Minimal Live Spotter data
179 
-	*
180 
-	* @return Array the spotter information
181 
-	*
182 
-	*/
178 
+	 * Gets Minimal Live Spotter data
179 
+	 *
180 
+	 * @return Array the spotter information
181 
+	 *
182 
+	 */
183 183 
 	public function getMinLiveSpotterData($filter = array())
184 184 
 	{
185 185 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 
@@ -216,11 +216,11 @@  discard block
 
 block discarded – undo
216 216 
 	}
217 217
218 218 
 	/**
219 
-	* Gets Minimal Live Spotter data since xx seconds
220 
-	*
221 
-	* @return Array the spotter information
222 
-	*
223 
-	*/
219 
+	 * Gets Minimal Live Spotter data since xx seconds
220 
+	 *
221 
+	 * @return Array the spotter information
222 
+	 *
223 
+	 */
224 224 
 	public function getMinLastLiveSpotterData($filter = array())
225 225 
 	{
226 226 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 
@@ -239,7 +239,7 @@  discard block
 
 block discarded – undo
239 239 
 				FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'
240 240 
 				ORDER BY spotter_live.flightaware_id, spotter_live.date";
241 241 
 			}
242 
-                } else {
242 
+				} else {
243 243 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
244 244 
 				$query  = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source
245 245 
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id 
@@ -252,7 +252,7 @@  discard block
 
 block discarded – undo
252 252 
 			}
253 253 
 		}
254 254
255 
-    		try {
255 
+			try {
256 256 
 			$sth = $this->db->prepare($query);
257 257 
 			$sth->execute();
258 258 
 		} catch(PDOException $e) {
 
@@ -264,11 +264,11 @@  discard block
 
 block discarded – undo
264 264 
 	}
265 265
266 266 
 	/**
267 
-	* Gets number of latest data entry
268 
-	*
269 
-	* @return String number of entry
270 
-	*
271 
-	*/
267 
+	 * Gets number of latest data entry
268 
+	 *
269 
+	 * @return String number of entry
270 
+	 *
271 
+	 */
272 272 
 	public function getLiveSpotterCount($filter = array())
273 273 
 	{
274 274 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -295,11 +295,11 @@  discard block
 
 block discarded – undo
295 295 
 	}
296 296
297 297 
 	/**
298 
-	* Gets all the spotter information based on the latest data entry and coord
299 
-	*
300 
-	* @return Array the spotter information
301 
-	*
302 
-	*/
298 
+	 * Gets all the spotter information based on the latest data entry and coord
299 
+	 *
300 
+	 * @return Array the spotter information
301 
+	 *
302 
+	 */
303 303 
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
304 304 
 	{
305 305 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -324,11 +324,11 @@  discard block
 
 block discarded – undo
324 324 
 	}
325 325
326 326 
 	/**
327 
-	* Gets all the spotter information based on the latest data entry and coord
328 
-	*
329 
-	* @return Array the spotter information
330 
-	*
331 
-	*/
327 
+	 * Gets all the spotter information based on the latest data entry and coord
328 
+	 *
329 
+	 * @return Array the spotter information
330 
+	 *
331 
+	 */
332 332 
 	public function getMinLiveSpotterDatabyCoord($coord, $filter = array())
333 333 
 	{
334 334 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 
@@ -393,11 +393,11 @@  discard block
 
 block discarded – undo
393 393 
 	}
394 394
395 395 
 	/**
396 
-	* Gets all the spotter information based on a user's latitude and longitude
397 
-	*
398 
-	* @return Array the spotter information
399 
-	*
400 
-	*/
396 
+	 * Gets all the spotter information based on a user's latitude and longitude
397 
+	 *
398 
+	 * @return Array the spotter information
399 
+	 *
400 
+	 */
401 401 
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
402 402 
 	{
403 403 
 		$Spotter = new Spotter($this->db);
 
@@ -407,117 +407,117 @@  discard block
 
 block discarded – undo
407 407 
 				return false;
408 408 
 			}
409 409 
 		}
410 
-        if ($lng != '')
411 
-                {
412 
-                        if (!is_numeric($lng))
413 
-                        {
414 
-                                return false;
415 
-                        }
416 
-                }
417 
-
418 
-                if ($radius != '')
419 
-                {
420 
-                        if (!is_numeric($radius))
421 
-                        {
422 
-                                return false;
423 
-                        }
424 
-                }
410 
+		if ($lng != '')
411 
+				{
412 
+						if (!is_numeric($lng))
413 
+						{
414 
+								return false;
415 
+						}
416 
+				}
417 
+
418 
+				if ($radius != '')
419 
+				{
420 
+						if (!is_numeric($radius))
421 
+						{
422 
+								return false;
423 
+						}
424 
+				}
425 425 
 		$additional_query = '';
426 
-        if ($interval != '')
427 
-                {
428 
-                        if (!is_string($interval))
429 
-                        {
430 
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
431 
-			        return false;
432 
-                        } else {
433 
-                if ($interval == '1m')
434 
-                {
435 
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
436 
-                } else if ($interval == '15m'){
437 
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
438 
-                }
439 
-            }
440 
-                } else {
441 
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
442 
-        }
443 
-
444 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
426 
+		if ($interval != '')
427 
+				{
428 
+						if (!is_string($interval))
429 
+						{
430 
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
431 
+					return false;
432 
+						} else {
433 
+				if ($interval == '1m')
434 
+				{
435 
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
436 
+				} else if ($interval == '15m'){
437 
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
438 
+				}
439 
+			}
440 
+				} else {
441 
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
442 
+		}
443 
+
444 
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
445 445 
                    WHERE spotter_live.latitude <> ''
446 446 
                                    AND spotter_live.longitude <> ''
447 447 
                    ".$additional_query."
448 448 
                    HAVING distance < :radius
449 449 
                                    ORDER BY distance";
450 450
451 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
451 
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
452 452
453 
-                return $spotter_array;
454 
-        }
453 
+				return $spotter_array;
454 
+		}
455 455
456 456
457 
-        /**
458 
-	* Gets all the spotter information based on a particular callsign
459 
-	*
460 
-	* @return Array the spotter information
461 
-	*
462 
-	*/
457 
+		/**
458 
+		 * Gets all the spotter information based on a particular callsign
459 
+		 *
460 
+		 * @return Array the spotter information
461 
+		 *
462 
+		 */
463 463 
 	public function getLastLiveSpotterDataByIdent($ident)
464 464 
 	{
465 465 
 		$Spotter = new Spotter($this->db);
466 466 
 		date_default_timezone_set('UTC');
467 467
468 468 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
469 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
469 
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
470 470
471 471 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
472 472
473 473 
 		return $spotter_array;
474 474 
 	}
475 475
476 
-        /**
477 
-	* Gets all the spotter information based on a particular callsign
478 
-	*
479 
-	* @return Array the spotter information
480 
-	*
481 
-	*/
476 
+		/**
477 
+		 * Gets all the spotter information based on a particular callsign
478 
+		 *
479 
+		 * @return Array the spotter information
480 
+		 *
481 
+		 */
482 482 
 	public function getDateLiveSpotterDataByIdent($ident,$date)
483 483 
 	{
484 484 
 		$Spotter = new Spotter($this->db);
485 485 
 		date_default_timezone_set('UTC');
486 486
487 487 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
488 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
488 
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
489 489
490 
-                $date = date('c',$date);
490 
+				$date = date('c',$date);
491 491 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
492 492
493 493 
 		return $spotter_array;
494 494 
 	}
495 495
496 
-        /**
497 
-	* Gets last spotter information based on a particular callsign
498 
-	*
499 
-	* @return Array the spotter information
500 
-	*
501 
-	*/
496 
+		/**
497 
+		 * Gets last spotter information based on a particular callsign
498 
+		 *
499 
+		 * @return Array the spotter information
500 
+		 *
501 
+		 */
502 502 
 	public function getLastLiveSpotterDataById($id)
503 503 
 	{
504 504 
 		$Spotter = new Spotter($this->db);
505 505 
 		date_default_timezone_set('UTC');
506 506
507 507 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
508 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
508 
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
509 509
510 510 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
511 511
512 512 
 		return $spotter_array;
513 513 
 	}
514 514
515 
-        /**
516 
-	* Gets last spotter information based on a particular callsign
517 
-	*
518 
-	* @return Array the spotter information
519 
-	*
520 
-	*/
515 
+		/**
516 
+		 * Gets last spotter information based on a particular callsign
517 
+		 *
518 
+		 * @return Array the spotter information
519 
+		 *
520 
+		 */
521 521 
 	public function getDateLiveSpotterDataById($id,$date)
522 522 
 	{
523 523 
 		$Spotter = new Spotter($this->db);
 
@@ -530,21 +530,21 @@  discard block
 
 block discarded – undo
530 530 
 		return $spotter_array;
531 531 
 	}
532 532
533 
-        /**
534 
-	* Gets altitude information based on a particular callsign
535 
-	*
536 
-	* @return Array the spotter information
537 
-	*
538 
-	*/
533 
+		/**
534 
+		 * Gets altitude information based on a particular callsign
535 
+		 *
536 
+		 * @return Array the spotter information
537 
+		 *
538 
+		 */
539 539 
 	public function getAltitudeLiveSpotterDataByIdent($ident)
540 540 
 	{
541 541
542 542 
 		date_default_timezone_set('UTC');
543 543
544 544 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
545 
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
545 
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
546 546
547 
-    		try {
547 
+			try {
548 548
549 549 
 			$sth = $this->db->prepare($query);
550 550 
 			$sth->execute(array(':ident' => $ident));
 
@@ -557,12 +557,12 @@  discard block
 
 block discarded – undo
557 557 
 		return $spotter_array;
558 558 
 	}
559 559
560 
-        /**
561 
-	* Gets all the spotter information based on a particular id
562 
-	*
563 
-	* @return Array the spotter information
564 
-	*
565 
-	*/
560 
+		/**
561 
+		 * Gets all the spotter information based on a particular id
562 
+		 *
563 
+		 * @return Array the spotter information
564 
+		 *
565 
+		 */
566 566 
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
567 567 
 	{
568 568 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -590,18 +590,18 @@  discard block
 
 block discarded – undo
590 590 
 		return $spotter_array;
591 591 
 	}
592 592
593 
-        /**
594 
-	* Gets all the spotter information based on a particular ident
595 
-	*
596 
-	* @return Array the spotter information
597 
-	*
598 
-	*/
593 
+		/**
594 
+		 * Gets all the spotter information based on a particular ident
595 
+		 *
596 
+		 * @return Array the spotter information
597 
+		 *
598 
+		 */
599 599 
 	public function getAllLiveSpotterDataByIdent($ident)
600 600 
 	{
601 601 
 		date_default_timezone_set('UTC');
602 602 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
603 603 
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
604 
-    		try {
604 
+			try {
605 605
606 606 
 			$sth = $this->db->prepare($query);
607 607 
 			$sth->execute(array(':ident' => $ident));
 
@@ -615,23 +615,23 @@  discard block
 
 block discarded – undo
615 615
616 616
617 617 
 	/**
618 
-	* Deletes all info in the table
619 
-	*
620 
-	* @return String success or false
621 
-	*
622 
-	*/
618 
+	 * Deletes all info in the table
619 
+	 *
620 
+	 * @return String success or false
621 
+	 *
622 
+	 */
623 623 
 	public function deleteLiveSpotterData()
624 624 
 	{
625 625 
 		global $globalDBdriver;
626 626 
 		if ($globalDBdriver == 'mysql') {
627 627 
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
628 628 
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
629 
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
629 
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
630 630 
 		} else {
631 631 
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
632 632 
 		}
633 633
634 
-    		try {
634 
+			try {
635 635
636 636 
 			$sth = $this->db->prepare($query);
637 637 
 			$sth->execute();
 
@@ -643,18 +643,18 @@  discard block
 
 block discarded – undo
643 643 
 	}
644 644
645 645 
 	/**
646 
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
647 
-	*
648 
-	* @return String success or false
649 
-	*
650 
-	*/
646 
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
647 
+	 *
648 
+	 * @return String success or false
649 
+	 *
650 
+	 */
651 651 
 	public function deleteLiveSpotterDataNotUpdated()
652 652 
 	{
653 653 
 		global $globalDBdriver, $globalDebug;
654 654 
 		if ($globalDBdriver == 'mysql') {
655 655 
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
656 
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
657 
-    			try {
656 
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
657 
+				try {
658 658
659 659 
 				$sth = $this->db->prepare($query);
660 660 
 				$sth->execute();
 
@@ -662,8 +662,8 @@  discard block
 
 block discarded – undo
662 662 
 				return "error";
663 663 
 			}
664 664 
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
665 
-                        $i = 0;
666 
-                        $j =0;
665 
+						$i = 0;
666 
+						$j =0;
667 667 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
668 668 
 			foreach($all as $row)
669 669 
 			{
 
@@ -671,20 +671,20 @@  discard block
 
 block discarded – undo
671 671 
 				$j++;
672 672 
 				if ($j == 30) {
673 673 
 					if ($globalDebug) echo ".";
674 
-				    	try {
674 
+						try {
675 675
676 676 
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
677 677 
 						$sth->execute();
678 678 
 					} catch(PDOException $e) {
679 679 
 						return "error";
680 680 
 					}
681 
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
682 
-                                	$j = 0;
681 
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
682 
+									$j = 0;
683 683 
 				}
684 684 
 				$query_delete .= "'".$row['flightaware_id']."',";
685 685 
 			}
686 686 
 			if ($i > 0) {
687 
-    				try {
687 
+					try {
688 688
689 689 
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
690 690 
 					$sth->execute();
 
@@ -695,9 +695,9 @@  discard block
 
 block discarded – undo
695 695 
 			return "success";
696 696 
 		} elseif ($globalDBdriver == 'pgsql') {
697 697 
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
698 
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
699 
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
700 
-    			try {
698 
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
699 
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
700 
+				try {
701 701
702 702 
 				$sth = $this->db->prepare($query);
703 703 
 				$sth->execute();
 
@@ -741,17 +741,17 @@  discard block
 
 block discarded – undo
741 741 
 	}
742 742
743 743 
 	/**
744 
-	* Deletes all info in the table for an ident
745 
-	*
746 
-	* @return String success or false
747 
-	*
748 
-	*/
744 
+	 * Deletes all info in the table for an ident
745 
+	 *
746 
+	 * @return String success or false
747 
+	 *
748 
+	 */
749 749 
 	public function deleteLiveSpotterDataByIdent($ident)
750 750 
 	{
751 751 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
752 752 
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
753 753
754 
-    		try {
754 
+			try {
755 755
756 756 
 			$sth = $this->db->prepare($query);
757 757 
 			$sth->execute(array(':ident' => $ident));
 
@@ -763,17 +763,17 @@  discard block
 
 block discarded – undo
763 763 
 	}
764 764
765 765 
 	/**
766 
-	* Deletes all info in the table for an id
767 
-	*
768 
-	* @return String success or false
769 
-	*
770 
-	*/
766 
+	 * Deletes all info in the table for an id
767 
+	 *
768 
+	 * @return String success or false
769 
+	 *
770 
+	 */
771 771 
 	public function deleteLiveSpotterDataById($id)
772 772 
 	{
773 773 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
774 774 
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
775 775
776 
-    		try {
776 
+			try {
777 777
778 778 
 			$sth = $this->db->prepare($query);
779 779 
 			$sth->execute(array(':id' => $id));
 
@@ -786,11 +786,11 @@  discard block
 
 block discarded – undo
786 786
787 787
788 788 
 	/**
789 
-	* Gets the aircraft ident within the last hour
790 
-	*
791 
-	* @return String the ident
792 
-	*
793 
-	*/
789 
+	 * Gets the aircraft ident within the last hour
790 
+	 *
791 
+	 * @return String the ident
792 
+	 *
793 
+	 */
794 794 
 	public function getIdentFromLastHour($ident)
795 795 
 	{
796 796 
 		global $globalDBdriver, $globalTimezone;
 
@@ -816,14 +816,14 @@  discard block
 
 block discarded – undo
816 816 
 			$ident_result = $row['ident'];
817 817 
 		}
818 818 
 		return $ident_result;
819 
-        }
819 
+		}
820 820
821 821 
 	/**
822 
-	* Check recent aircraft
823 
-	*
824 
-	* @return String the ident
825 
-	*
826 
-	*/
822 
+	 * Check recent aircraft
823 
+	 *
824 
+	 * @return String the ident
825 
+	 *
826 
+	 */
827 827 
 	public function checkIdentRecent($ident)
828 828 
 	{
829 829 
 		global $globalDBdriver, $globalTimezone;
 
@@ -849,14 +849,14 @@  discard block
 
 block discarded – undo
849 849 
 			$ident_result = $row['flightaware_id'];
850 850 
 		}
851 851 
 		return $ident_result;
852 
-        }
852 
+		}
853 853
854 854 
 	/**
855 
-	* Check recent aircraft by id
856 
-	*
857 
-	* @return String the ident
858 
-	*
859 
-	*/
855 
+	 * Check recent aircraft by id
856 
+	 *
857 
+	 * @return String the ident
858 
+	 *
859 
+	 */
860 860 
 	public function checkIdRecent($id)
861 861 
 	{
862 862 
 		global $globalDBdriver, $globalTimezone;
 
@@ -882,14 +882,14 @@  discard block
 
 block discarded – undo
882 882 
 			$ident_result = $row['flightaware_id'];
883 883 
 		}
884 884 
 		return $ident_result;
885 
-        }
885 
+		}
886 886
887 887 
 	/**
888 
-	* Check recent aircraft by ModeS
889 
-	*
890 
-	* @return String the ModeS
891 
-	*
892 
-	*/
888 
+	 * Check recent aircraft by ModeS
889 
+	 *
890 
+	 * @return String the ModeS
891 
+	 *
892 
+	 */
893 893 
 	public function checkModeSRecent($modes)
894 894 
 	{
895 895 
 		global $globalDBdriver, $globalTimezone;
 
@@ -916,19 +916,19 @@  discard block
 
 block discarded – undo
916 916 
 			$ident_result = $row['flightaware_id'];
917 917 
 		}
918 918 
 		return $ident_result;
919 
-        }
919 
+		}
920 920
921 921 
 	/**
922 
-	* Adds a new spotter data
923 
-	*
924 
-	* @param String $flightaware_id the ID from flightaware
925 
-	* @param String $ident the flight ident
926 
-	* @param String $aircraft_icao the aircraft type
927 
-	* @param String $departure_airport_icao the departure airport
928 
-	* @param String $arrival_airport_icao the arrival airport
929 
-	* @return String success or false
930 
-	*
931 
-	*/
922 
+	 * Adds a new spotter data
923 
+	 *
924 
+	 * @param String $flightaware_id the ID from flightaware
925 
+	 * @param String $ident the flight ident
926 
+	 * @param String $aircraft_icao the aircraft type
927 
+	 * @param String $departure_airport_icao the departure airport
928 
+	 * @param String $arrival_airport_icao the arrival airport
929 
+	 * @return String success or false
930 
+	 *
931 
+	 */
932 932 
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
933 933 
 	{
934 934 
 		global $globalURL, $globalArchive, $globalDebug;
 
@@ -1064,10 +1064,10 @@  discard block
 
 block discarded – undo
1064 1064 
 		$arrival_airport_country = '';
1065 1065
1066 1066
1067 
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1068 
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1069 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1070 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1067 
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1068 
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1069 
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1070 
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1071 1071
1072 1072 
 		$query = '';
1073 1073 
 		if ($globalArchive) {
 
@@ -1088,10 +1088,10 @@  discard block
 
 block discarded – undo
1088 1088 
 			return "error : ".$e->getMessage();
1089 1089 
 		}
1090 1090 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1091 
-		    if ($globalDebug) echo '(Add to SBS archive : ';
1092 
-		    $SpotterArchive = new SpotterArchive($this->db);
1093 
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1094 
-		    if ($globalDebug) echo $result.')';
1091 
+			if ($globalDebug) echo '(Add to SBS archive : ';
1092 
+			$SpotterArchive = new SpotterArchive($this->db);
1093 
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1094 
+			if ($globalDebug) echo $result.')';
1095 1095 
 		}
1096 1096 
 		return "success";
1097 1097
Please login to merge, or discard this patch.
require/class.Connection.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch 
@@ -7,35 +7,35 @@  discard block
 
 block discarded – undo
7 7 
 	public $latest_schema = 43;
8 8
9 9 
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
10 
-	    global $globalDBdriver, $globalNoDB;
11 
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
10 
+		global $globalDBdriver, $globalNoDB;
11 
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
12 12 
 		$this->db = null;
13 
-	    } else {
13 
+		} else {
14 14 
 		if ($dbc === null) {
15 
-		    if ($this->db === null && $dbname === null) {
15 
+			if ($this->db === null && $dbname === null) {
16 16 
 			if ($user === null && $pass === null) {
17 
-			    $this->createDBConnection();
17 
+				$this->createDBConnection();
18 18 
 			} else {
19 
-			    $this->createDBConnection(null,$user,$pass);
19 
+				$this->createDBConnection(null,$user,$pass);
20 20 
 			}
21 
-		    } else {
21 
+			} else {
22 22 
 			$this->createDBConnection($dbname);
23 
-		    }
23 
+			}
24 24 
 		} elseif ($dbname === null || $dbname === 'default') {
25 
-	    	    $this->db = $dbc;
26 
-	    	    if ($this->connectionExists() === false) {
25 
+				$this->db = $dbc;
26 
+				if ($this->connectionExists() === false) {
27 27 
 			/*
28 28 
 			echo 'Restart Connection !!!'."\n";
29 29 
 			$e = new \Exception;
30 30 
 			var_dump($e->getTraceAsString());
31 31 
 			*/
32 32 
 			$this->createDBConnection();
33 
-		    }
33 
+			}
34 34 
 		} else {
35 
-		    //$this->connectionExists();
36 
-		    $this->dbs[$dbname] = $dbc;
35 
+			//$this->connectionExists();
36 
+			$this->dbs[$dbname] = $dbc;
37 
+		}
37 38 
 		}
38 
-	    }
39 39 
 	}
40 40
41 41 
 	public function db() {
 
@@ -56,11 +56,11 @@  discard block
 
 block discarded – undo
56 56 
 	}
57 57
58 58 
 	/**
59 
-	* Creates the database connection
60 
-	*
61 
-	* @return Boolean of the database connection
62 
-	*
63 
-	*/
59 
+	 * Creates the database connection
60 
+	 *
61 
+	 * @return Boolean of the database connection
62 
+	 *
63 
+	 */
64 64
65 65 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
66 66 
 	{
 
@@ -157,7 +157,7 @@  discard block
 
 block discarded – undo
157 157 
 			return false;
158 158 
 		}
159 159 
 		if($results->rowCount()>0) {
160 
-		    return true;
160 
+			return true;
161 161 
 		}
162 162 
 		else return false;
163 163 
 	}
 
@@ -174,14 +174,14 @@  discard block
 
 block discarded – undo
174 174 
 				$sum = $sum->fetchColumn(0);
175 175 
 			} else $sum = 0;
176 176 
 			if (intval($sum) !== 2) {
177 
-			     return false;
177 
+				 return false;
178 178 
 			}
179 179
180 180 
 		} catch(PDOException $e) {
181 181 
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
182 
-            			throw $e;
183 
-	                }
184 
-	                //echo 'error ! '.$e->getMessage();
182 
+						throw $e;
183 
+					}
184 
+					//echo 'error ! '.$e->getMessage();
185 185 
 			return false;
186 186 
 		}
187 187 
 		return true; 
@@ -285,8 +285,8 @@  discard block
 
 block discarded – undo
285 285 
 		$version = 0;
286 286 
 		if ($this->tableExists('aircraft')) {
287 287 
 			if (!$this->tableExists('config')) {
288 
-	    			$version = '1';
289 
-	    			return $version;
288 
+					$version = '1';
289 
+					return $version;
290 290 
 			} else {
291 291 
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
292 292 
 				try {
 
@@ -307,10 +307,10 @@  discard block
 
 block discarded – undo
307 307 
 	* @return Boolean if latest version or not
308 308 
 	*/
309 309 
 	public function latest() {
310 
-	    global $globalNoDB;
311 
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
312 
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
313 
-	    else return false;
310 
+		global $globalNoDB;
311 
+		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
312 
+		if ($this->check_schema_version() == $this->latest_schema) return true;
313 
+		else return false;
314 314 
 	}
315 315
316 316 
 }
Please login to merge, or discard this patch.