View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 5119c8...9eb73e )
by Yannick
19:43
created
Status
Category
Toggle Patches
tracker-data.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -78,10 +78,10 @@  discard block
 
 block discarded – undo
78 78 
 print '<div class="details">';
79 79 
 print '<div><span>'._("Altitude").'</span>';
80 80 
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
81 
-    try {
81 
+	try {
82 82 
 	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
83 
-    } catch(Exception $e) {
84 
-    }
83 
+	} catch(Exception $e) {
84 
+	}
85 85 
 }
86 86 
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
87 87 
 	print $spotter_item['altitude'].' feet (FL'.$spotter_item['altitude'].')';
 
@@ -89,14 +89,14 @@  discard block
 
 block discarded – undo
89 89 
 	print round($spotter_item['altitude']*0.3048).' m (FL'.round($spotter_item['altitude']/100).')';
90 90 
 }
91 91 
 if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*0.3048) {
92 
-    print '<br>';
93 
-    print '<span>'._("Ground Altitude").'</span>';
94 
-    if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
92 
+	print '<br>';
93 
+	print '<span>'._("Ground Altitude").'</span>';
94 
+	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
95 95 
 	print round($groundAltitude*3.28084).' feet';
96 
-    } else {
96 
+	} else {
97 97 
 	print round($groundAltitude).' m';
98 
-    }
99 
-    print '</i>';
98 
+	}
99 
+	print '</i>';
100 100 
 }
101 101 
 print '</div>';
102 102 
 print '<div><span>'._("Speed").'</span>';
Please login to merge, or discard this patch.
install/class.update_schema.php 2 patches
Indentation   +638 added lines, -638 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);
 
@@ -1723,7 +1723,7 @@  discard block
 
 block discarded – undo
1723 1723 
 			} catch(PDOException $e) {
1724 1724 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1725 1725 
 			}
1726 
-                }
1726 
+				}
1727 1727 
 		$query = "UPDATE config SET value = '38' WHERE name = 'schema_version'";
1728 1728 
 		try {
1729 1729 
 			$sth = $Connection->db->prepare($query);
 
@@ -2088,201 +2088,201 @@  discard block
 
 block discarded – undo
2088 2088
2089 2089
2090 2090
2091 
-    	public static function check_version($update = false) {
2092 
-    	    global $globalDBname;
2093 
-    	    $version = 0;
2094 
-    	    $Connection = new Connection();
2095 
-    	    if ($Connection->tableExists('aircraft')) {
2096 
-    		if (!$Connection->tableExists('config')) {
2097 
-    		    $version = '1';
2098 
-    		    if ($update) return self::update_from_1();
2099 
-    		    else return $version;
2091 
+		public static function check_version($update = false) {
2092 
+			global $globalDBname;
2093 
+			$version = 0;
2094 
+			$Connection = new Connection();
2095 
+			if ($Connection->tableExists('aircraft')) {
2096 
+			if (!$Connection->tableExists('config')) {
2097 
+				$version = '1';
2098 
+				if ($update) return self::update_from_1();
2099 
+				else return $version;
2100 2100 
 		} else {
2101 
-    		    $Connection = new Connection();
2102 
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2103 
-		    try {
2104 
-            		$sth = $Connection->db->prepare($query);
2105 
-		        $sth->execute();
2106 
-		    } catch(PDOException $e) {
2101 
+				$Connection = new Connection();
2102 
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2103 
+			try {
2104 
+					$sth = $Connection->db->prepare($query);
2105 
+				$sth->execute();
2106 
+			} catch(PDOException $e) {
2107 2107 
 			return "error : ".$e->getMessage()."\n";
2108 
-    		    }
2109 
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
2110 
-    		    if ($update) {
2111 
-    			if ($result['value'] == '2') {
2112 
-    			    $error = self::update_from_2();
2113 
-    			    if ($error != '') return $error;
2114 
-    			    else return self::check_version(true);
2115 
-    			} elseif ($result['value'] == '3') {
2116 
-    			    $error = self::update_from_3();
2117 
-    			    if ($error != '') return $error;
2118 
-    			    else return self::check_version(true);
2119 
-    			} elseif ($result['value'] == '4') {
2120 
-    			    $error = self::update_from_4();
2121 
-    			    if ($error != '') return $error;
2122 
-    			    else return self::check_version(true);
2123 
-    			} elseif ($result['value'] == '5') {
2124 
-    			    $error = self::update_from_5();
2125 
-    			    if ($error != '') return $error;
2126 
-    			    else return self::check_version(true);
2127 
-    			} elseif ($result['value'] == '6') {
2128 
-    			    $error = self::update_from_6();
2129 
-    			    if ($error != '') return $error;
2130 
-    			    else return self::check_version(true);
2131 
-    			} elseif ($result['value'] == '7') {
2132 
-    			    $error = self::update_from_7();
2133 
-    			    if ($error != '') return $error;
2134 
-    			    else return self::check_version(true);
2135 
-    			} elseif ($result['value'] == '8') {
2136 
-    			    $error = self::update_from_8();
2137 
-    			    if ($error != '') return $error;
2138 
-    			    else return self::check_version(true);
2139 
-    			} elseif ($result['value'] == '9') {
2140 
-    			    $error = self::update_from_9();
2141 
-    			    if ($error != '') return $error;
2142 
-    			    else return self::check_version(true);
2143 
-    			} elseif ($result['value'] == '10') {
2144 
-    			    $error = self::update_from_10();
2145 
-    			    if ($error != '') return $error;
2146 
-    			    else return self::check_version(true);
2147 
-    			} elseif ($result['value'] == '11') {
2148 
-    			    $error = self::update_from_11();
2149 
-    			    if ($error != '') return $error;
2150 
-    			    else return self::check_version(true);
2151 
-    			} elseif ($result['value'] == '12') {
2152 
-    			    $error = self::update_from_12();
2153 
-    			    if ($error != '') return $error;
2154 
-    			    else return self::check_version(true);
2155 
-    			} elseif ($result['value'] == '13') {
2156 
-    			    $error = self::update_from_13();
2157 
-    			    if ($error != '') return $error;
2158 
-    			    else return self::check_version(true);
2159 
-    			} elseif ($result['value'] == '14') {
2160 
-    			    $error = self::update_from_14();
2161 
-    			    if ($error != '') return $error;
2162 
-    			    else return self::check_version(true);
2163 
-    			} elseif ($result['value'] == '15') {
2164 
-    			    $error = self::update_from_15();
2165 
-    			    if ($error != '') return $error;
2166 
-    			    else return self::check_version(true);
2167 
-    			} elseif ($result['value'] == '16') {
2168 
-    			    $error = self::update_from_16();
2169 
-    			    if ($error != '') return $error;
2170 
-    			    else return self::check_version(true);
2171 
-    			} elseif ($result['value'] == '17') {
2172 
-    			    $error = self::update_from_17();
2173 
-    			    if ($error != '') return $error;
2174 
-    			    else return self::check_version(true);
2175 
-    			} elseif ($result['value'] == '18') {
2176 
-    			    $error = self::update_from_18();
2177 
-    			    if ($error != '') return $error;
2178 
-    			    else return self::check_version(true);
2179 
-    			} elseif ($result['value'] == '19') {
2180 
-    			    $error = self::update_from_19();
2181 
-    			    if ($error != '') return $error;
2182 
-    			    else return self::check_version(true);
2183 
-    			} elseif ($result['value'] == '20') {
2184 
-    			    $error = self::update_from_20();
2185 
-    			    if ($error != '') return $error;
2186 
-    			    else return self::check_version(true);
2187 
-    			} elseif ($result['value'] == '21') {
2188 
-    			    $error = self::update_from_21();
2189 
-    			    if ($error != '') return $error;
2190 
-    			    else return self::check_version(true);
2191 
-    			} elseif ($result['value'] == '22') {
2192 
-    			    $error = self::update_from_22();
2193 
-    			    if ($error != '') return $error;
2194 
-    			    else return self::check_version(true);
2195 
-    			} elseif ($result['value'] == '23') {
2196 
-    			    $error = self::update_from_23();
2197 
-    			    if ($error != '') return $error;
2198 
-    			    else return self::check_version(true);
2199 
-    			} elseif ($result['value'] == '24') {
2200 
-    			    $error = self::update_from_24();
2201 
-    			    if ($error != '') return $error;
2202 
-    			    else return self::check_version(true);
2203 
-    			} elseif ($result['value'] == '25') {
2204 
-    			    $error = self::update_from_25();
2205 
-    			    if ($error != '') return $error;
2206 
-    			    else return self::check_version(true);
2207 
-    			} elseif ($result['value'] == '26') {
2208 
-    			    $error = self::update_from_26();
2209 
-    			    if ($error != '') return $error;
2210 
-    			    else return self::check_version(true);
2211 
-    			} elseif ($result['value'] == '27') {
2212 
-    			    $error = self::update_from_27();
2213 
-    			    if ($error != '') return $error;
2214 
-    			    else return self::check_version(true);
2215 
-    			} elseif ($result['value'] == '28') {
2216 
-    			    $error = self::update_from_28();
2217 
-    			    if ($error != '') return $error;
2218 
-    			    else return self::check_version(true);
2219 
-    			} elseif ($result['value'] == '29') {
2220 
-    			    $error = self::update_from_29();
2221 
-    			    if ($error != '') return $error;
2222 
-    			    else return self::check_version(true);
2223 
-    			} elseif ($result['value'] == '30') {
2224 
-    			    $error = self::update_from_30();
2225 
-    			    if ($error != '') return $error;
2226 
-    			    else return self::check_version(true);
2227 
-    			} elseif ($result['value'] == '31') {
2228 
-    			    $error = self::update_from_31();
2229 
-    			    if ($error != '') return $error;
2230 
-    			    else return self::check_version(true);
2231 
-    			} elseif ($result['value'] == '32') {
2232 
-    			    $error = self::update_from_32();
2233 
-    			    if ($error != '') return $error;
2234 
-    			    else return self::check_version(true);
2235 
-    			} elseif ($result['value'] == '33') {
2236 
-    			    $error = self::update_from_33();
2237 
-    			    if ($error != '') return $error;
2238 
-    			    else return self::check_version(true);
2239 
-    			} elseif ($result['value'] == '34') {
2240 
-    			    $error = self::update_from_34();
2241 
-    			    if ($error != '') return $error;
2242 
-    			    else return self::check_version(true);
2243 
-    			} elseif ($result['value'] == '35') {
2244 
-    			    $error = self::update_from_35();
2245 
-    			    if ($error != '') return $error;
2246 
-    			    else return self::check_version(true);
2247 
-    			} elseif ($result['value'] == '36') {
2248 
-    			    $error = self::update_from_36();
2249 
-    			    if ($error != '') return $error;
2250 
-    			    else return self::check_version(true);
2251 
-    			} elseif ($result['value'] == '37') {
2252 
-    			    $error = self::update_from_37();
2253 
-    			    if ($error != '') return $error;
2254 
-    			    else return self::check_version(true);
2255 
-    			} elseif ($result['value'] == '38') {
2256 
-    			    $error = self::update_from_38();
2257 
-    			    if ($error != '') return $error;
2258 
-    			    else return self::check_version(true);
2259 
-    			} elseif ($result['value'] == '39') {
2260 
-    			    $error = self::update_from_39();
2261 
-    			    if ($error != '') return $error;
2262 
-    			    else return self::check_version(true);
2263 
-    			} elseif ($result['value'] == '40') {
2264 
-    			    $error = self::update_from_40();
2265 
-    			    if ($error != '') return $error;
2266 
-    			    else return self::check_version(true);
2267 
-    			} elseif ($result['value'] == '41') {
2268 
-    			    $error = self::update_from_41();
2269 
-    			    if ($error != '') return $error;
2270 
-    			    else return self::check_version(true);
2271 
-    			} elseif ($result['value'] == '42') {
2272 
-    			    $error = self::update_from_42();
2273 
-    			    if ($error != '') return $error;
2274 
-    			    else return self::check_version(true);
2275 
-    			} elseif ($result['value'] == '43') {
2276 
-    			    $error = self::update_from_43();
2277 
-    			    if ($error != '') return $error;
2278 
-    			    else return self::check_version(true);
2279 
-    			} else return '';
2280 
-    		    }
2281 
-    		    else return $result['value'];
2108 
+				}
2109 
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
2110 
+				if ($update) {
2111 
+				if ($result['value'] == '2') {
2112 
+					$error = self::update_from_2();
2113 
+					if ($error != '') return $error;
2114 
+					else return self::check_version(true);
2115 
+				} elseif ($result['value'] == '3') {
2116 
+					$error = self::update_from_3();
2117 
+					if ($error != '') return $error;
2118 
+					else return self::check_version(true);
2119 
+				} elseif ($result['value'] == '4') {
2120 
+					$error = self::update_from_4();
2121 
+					if ($error != '') return $error;
2122 
+					else return self::check_version(true);
2123 
+				} elseif ($result['value'] == '5') {
2124 
+					$error = self::update_from_5();
2125 
+					if ($error != '') return $error;
2126 
+					else return self::check_version(true);
2127 
+				} elseif ($result['value'] == '6') {
2128 
+					$error = self::update_from_6();
2129 
+					if ($error != '') return $error;
2130 
+					else return self::check_version(true);
2131 
+				} elseif ($result['value'] == '7') {
2132 
+					$error = self::update_from_7();
2133 
+					if ($error != '') return $error;
2134 
+					else return self::check_version(true);
2135 
+				} elseif ($result['value'] == '8') {
2136 
+					$error = self::update_from_8();
2137 
+					if ($error != '') return $error;
2138 
+					else return self::check_version(true);
2139 
+				} elseif ($result['value'] == '9') {
2140 
+					$error = self::update_from_9();
2141 
+					if ($error != '') return $error;
2142 
+					else return self::check_version(true);
2143 
+				} elseif ($result['value'] == '10') {
2144 
+					$error = self::update_from_10();
2145 
+					if ($error != '') return $error;
2146 
+					else return self::check_version(true);
2147 
+				} elseif ($result['value'] == '11') {
2148 
+					$error = self::update_from_11();
2149 
+					if ($error != '') return $error;
2150 
+					else return self::check_version(true);
2151 
+				} elseif ($result['value'] == '12') {
2152 
+					$error = self::update_from_12();
2153 
+					if ($error != '') return $error;
2154 
+					else return self::check_version(true);
2155 
+				} elseif ($result['value'] == '13') {
2156 
+					$error = self::update_from_13();
2157 
+					if ($error != '') return $error;
2158 
+					else return self::check_version(true);
2159 
+				} elseif ($result['value'] == '14') {
2160 
+					$error = self::update_from_14();
2161 
+					if ($error != '') return $error;
2162 
+					else return self::check_version(true);
2163 
+				} elseif ($result['value'] == '15') {
2164 
+					$error = self::update_from_15();
2165 
+					if ($error != '') return $error;
2166 
+					else return self::check_version(true);
2167 
+				} elseif ($result['value'] == '16') {
2168 
+					$error = self::update_from_16();
2169 
+					if ($error != '') return $error;
2170 
+					else return self::check_version(true);
2171 
+				} elseif ($result['value'] == '17') {
2172 
+					$error = self::update_from_17();
2173 
+					if ($error != '') return $error;
2174 
+					else return self::check_version(true);
2175 
+				} elseif ($result['value'] == '18') {
2176 
+					$error = self::update_from_18();
2177 
+					if ($error != '') return $error;
2178 
+					else return self::check_version(true);
2179 
+				} elseif ($result['value'] == '19') {
2180 
+					$error = self::update_from_19();
2181 
+					if ($error != '') return $error;
2182 
+					else return self::check_version(true);
2183 
+				} elseif ($result['value'] == '20') {
2184 
+					$error = self::update_from_20();
2185 
+					if ($error != '') return $error;
2186 
+					else return self::check_version(true);
2187 
+				} elseif ($result['value'] == '21') {
2188 
+					$error = self::update_from_21();
2189 
+					if ($error != '') return $error;
2190 
+					else return self::check_version(true);
2191 
+				} elseif ($result['value'] == '22') {
2192 
+					$error = self::update_from_22();
2193 
+					if ($error != '') return $error;
2194 
+					else return self::check_version(true);
2195 
+				} elseif ($result['value'] == '23') {
2196 
+					$error = self::update_from_23();
2197 
+					if ($error != '') return $error;
2198 
+					else return self::check_version(true);
2199 
+				} elseif ($result['value'] == '24') {
2200 
+					$error = self::update_from_24();
2201 
+					if ($error != '') return $error;
2202 
+					else return self::check_version(true);
2203 
+				} elseif ($result['value'] == '25') {
2204 
+					$error = self::update_from_25();
2205 
+					if ($error != '') return $error;
2206 
+					else return self::check_version(true);
2207 
+				} elseif ($result['value'] == '26') {
2208 
+					$error = self::update_from_26();
2209 
+					if ($error != '') return $error;
2210 
+					else return self::check_version(true);
2211 
+				} elseif ($result['value'] == '27') {
2212 
+					$error = self::update_from_27();
2213 
+					if ($error != '') return $error;
2214 
+					else return self::check_version(true);
2215 
+				} elseif ($result['value'] == '28') {
2216 
+					$error = self::update_from_28();
2217 
+					if ($error != '') return $error;
2218 
+					else return self::check_version(true);
2219 
+				} elseif ($result['value'] == '29') {
2220 
+					$error = self::update_from_29();
2221 
+					if ($error != '') return $error;
2222 
+					else return self::check_version(true);
2223 
+				} elseif ($result['value'] == '30') {
2224 
+					$error = self::update_from_30();
2225 
+					if ($error != '') return $error;
2226 
+					else return self::check_version(true);
2227 
+				} elseif ($result['value'] == '31') {
2228 
+					$error = self::update_from_31();
2229 
+					if ($error != '') return $error;
2230 
+					else return self::check_version(true);
2231 
+				} elseif ($result['value'] == '32') {
2232 
+					$error = self::update_from_32();
2233 
+					if ($error != '') return $error;
2234 
+					else return self::check_version(true);
2235 
+				} elseif ($result['value'] == '33') {
2236 
+					$error = self::update_from_33();
2237 
+					if ($error != '') return $error;
2238 
+					else return self::check_version(true);
2239 
+				} elseif ($result['value'] == '34') {
2240 
+					$error = self::update_from_34();
2241 
+					if ($error != '') return $error;
2242 
+					else return self::check_version(true);
2243 
+				} elseif ($result['value'] == '35') {
2244 
+					$error = self::update_from_35();
2245 
+					if ($error != '') return $error;
2246 
+					else return self::check_version(true);
2247 
+				} elseif ($result['value'] == '36') {
2248 
+					$error = self::update_from_36();
2249 
+					if ($error != '') return $error;
2250 
+					else return self::check_version(true);
2251 
+				} elseif ($result['value'] == '37') {
2252 
+					$error = self::update_from_37();
2253 
+					if ($error != '') return $error;
2254 
+					else return self::check_version(true);
2255 
+				} elseif ($result['value'] == '38') {
2256 
+					$error = self::update_from_38();
2257 
+					if ($error != '') return $error;
2258 
+					else return self::check_version(true);
2259 
+				} elseif ($result['value'] == '39') {
2260 
+					$error = self::update_from_39();
2261 
+					if ($error != '') return $error;
2262 
+					else return self::check_version(true);
2263 
+				} elseif ($result['value'] == '40') {
2264 
+					$error = self::update_from_40();
2265 
+					if ($error != '') return $error;
2266 
+					else return self::check_version(true);
2267 
+				} elseif ($result['value'] == '41') {
2268 
+					$error = self::update_from_41();
2269 
+					if ($error != '') return $error;
2270 
+					else return self::check_version(true);
2271 
+				} elseif ($result['value'] == '42') {
2272 
+					$error = self::update_from_42();
2273 
+					if ($error != '') return $error;
2274 
+					else return self::check_version(true);
2275 
+				} elseif ($result['value'] == '43') {
2276 
+					$error = self::update_from_43();
2277 
+					if ($error != '') return $error;
2278 
+					else return self::check_version(true);
2279 
+				} else return '';
2280 
+				}
2281 
+				else return $result['value'];
2282 2282 
 		}
2283 2283
2284 
-	    } else return $version;
2285 
-    	}
2284 
+		} else return $version;
2285 
+		}
2286 2286
2287 2287 
 }
2288 2288 
 //echo update_schema::check_version();
Please login to merge, or discard this patch.
Braces   +394 added lines, -146 removed lines patch added patch discarded remove patch 
@@ -258,7 +258,9 @@  discard block
 
 block discarded – undo
258 258 
     		// Update table countries
259 259 
     		if ($Connection->tableExists('airspace')) {
260 260 
     		    $error .= update_db::update_countries();
261 
-		    if ($error != '') return $error;
261 
+		    if ($error != '') {
262 
+		    	return $error;
263 
+		    }
262 264 
 		}
263 265 
 		// Update schema_version to 7
264 266 
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
 
@@ -314,7 +316,9 @@  discard block
 
 block discarded – undo
314 316 
     		$error = '';
315 317 
     		// Update table aircraft
316 318 
 		$error .= create_db::import_file('../db/source_location.sql');
317 
-		if ($error != '') return $error;
319 
+		if ($error != '') {
320 
+			return $error;
321 
+		}
318 322 
 		// Update schema_version to 6
319 323 
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 324 
         	try {
 
@@ -331,7 +335,9 @@  discard block
 
 block discarded – undo
331 335 
     		$error = '';
332 336 
     		// Update table aircraft
333 337 
 		$error .= create_db::import_file('../db/notam.sql');
334 
-		if ($error != '') return $error;
338 
+		if ($error != '') {
339 
+			return $error;
340 
+		}
335 341 
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 342 
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 343 
                         DELETE FROM config WHERE name = 'last_update_notam_db';
 
@@ -365,7 +371,9 @@  discard block
 
 block discarded – undo
365 371 
 		$error = '';
366 372 
     		// Update table atc
367 373 
 		$error .= create_db::import_file('../db/atc.sql');
368 
-		if ($error != '') return $error;
374 
+		if ($error != '') {
375 
+			return $error;
376 
+		}
369 377
370 378 
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 379 
         	try {
 
@@ -389,13 +397,21 @@  discard block
 
 block discarded – undo
389 397 
 		$error = '';
390 398 
     		// Add tables
391 399 
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 
-		if ($error != '') return $error;
400 
+		if ($error != '') {
401 
+			return $error;
402 
+		}
393 403 
 		$error .= create_db::import_file('../db/metar.sql');
394 
-		if ($error != '') return $error;
404 
+		if ($error != '') {
405 
+			return $error;
406 
+		}
395 407 
 		$error .= create_db::import_file('../db/taf.sql');
396 
-		if ($error != '') return $error;
408 
+		if ($error != '') {
409 
+			return $error;
410 
+		}
397 411 
 		$error .= create_db::import_file('../db/airport.sql');
398 
-		if ($error != '') return $error;
412 
+		if ($error != '') {
413 
+			return $error;
414 
+		}
399 415
400 416 
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 417 
         	try {
 
@@ -469,19 +485,33 @@  discard block
 
 block discarded – undo
469 485 
 		$error = '';
470 486 
     		// Add tables
471 487 
 		$error .= create_db::import_file('../db/stats.sql');
472 
-		if ($error != '') return $error;
488 
+		if ($error != '') {
489 
+			return $error;
490 
+		}
473 491 
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
474 
-		if ($error != '') return $error;
492 
+		if ($error != '') {
493 
+			return $error;
494 
+		}
475 495 
 		$error .= create_db::import_file('../db/stats_airline.sql');
476 
-		if ($error != '') return $error;
496 
+		if ($error != '') {
497 
+			return $error;
498 
+		}
477 499 
 		$error .= create_db::import_file('../db/stats_airport.sql');
478 
-		if ($error != '') return $error;
500 
+		if ($error != '') {
501 
+			return $error;
502 
+		}
479 503 
 		$error .= create_db::import_file('../db/stats_owner.sql');
480 
-		if ($error != '') return $error;
504 
+		if ($error != '') {
505 
+			return $error;
506 
+		}
481 507 
 		$error .= create_db::import_file('../db/stats_pilot.sql');
482 
-		if ($error != '') return $error;
508 
+		if ($error != '') {
509 
+			return $error;
510 
+		}
483 511 
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
484 
-		if ($error != '') return $error;
512 
+		if ($error != '') {
513 
+			return $error;
514 
+		}
485 515
486 516 
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 517 
         	try {
 
@@ -521,7 +551,9 @@  discard block
 
 block discarded – undo
521 551 
     		// Add tables
522 552 
     		if (!$Connection->tableExists('stats_flight')) {
523 553 
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 
-			if ($error != '') return $error;
554 
+			if ($error != '') {
555 
+				return $error;
556 
+			}
525 557 
 		}
526 558 
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 559 
         	try {
 
@@ -545,7 +577,9 @@  discard block
 
 block discarded – undo
545 577 
     		} catch(PDOException $e) {
546 578 
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 579 
     		}
548 
-		if ($error != '') return $error;
580 
+		if ($error != '') {
581 
+			return $error;
582 
+		}
549 583 
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 584 
         	try {
551 585 
             	    $sth = $Connection->db->prepare($query);
 
@@ -566,7 +600,9 @@  discard block
 
 block discarded – undo
566 600 
     		if (!$Connection->tableExists('stats_callsign')) {
567 601 
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 602 
 		}
569 
-		if ($error != '') return $error;
603 
+		if ($error != '') {
604 
+			return $error;
605 
+		}
570 606 
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 607 
         	try {
572 608 
             	    $sth = $Connection->db->prepare($query);
 
@@ -584,7 +620,9 @@  discard block
 
 block discarded – undo
584 620 
     		if (!$Connection->tableExists('stats_country')) {
585 621 
 			$error .= create_db::import_file('../db/stats_country.sql');
586 622 
 		}
587 
-		if ($error != '') return $error;
623 
+		if ($error != '') {
624 
+			return $error;
625 
+		}
588 626 
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 627 
         	try {
590 628 
             	    $sth = $Connection->db->prepare($query);
 
@@ -607,7 +645,9 @@  discard block
 
 block discarded – undo
607 645 
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 646 
     			}
609 647 
     		}
610 
-		if ($error != '') return $error;
648 
+		if ($error != '') {
649 
+			return $error;
650 
+		}
611 651 
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 652 
         	try {
613 653 
             	    $sth = $Connection->db->prepare($query);
 
@@ -623,7 +663,9 @@  discard block
 
 block discarded – undo
623 663 
 		$error = '';
624 664 
     		// Update airport table
625 665 
 		$error .= create_db::import_file('../db/airport.sql');
626 
-		if ($error != '') return 'Import airport.sql : '.$error;
666 
+		if ($error != '') {
667 
+			return 'Import airport.sql : '.$error;
668 
+		}
627 669 
 		// Remove primary key on Spotter_Archive
628 670 
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 671 
         	try {
 
@@ -699,7 +741,9 @@  discard block
 
 block discarded – undo
699 741 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 742 
     			}
701 743 
     		}
702 
-		if ($error != '') return $error;
744 
+		if ($error != '') {
745 
+			return $error;
746 
+		}
703 747 
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 748 
         	try {
705 749 
             	    $sth = $Connection->db->prepare($query);
 
@@ -717,7 +761,9 @@  discard block
 
 block discarded – undo
717 761 
     		// Update airline table
718 762 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 763 
 			$error .= create_db::import_file('../db/airlines.sql');
720 
-			if ($error != '') return 'Import airlines.sql : '.$error;
764 
+			if ($error != '') {
765 
+				return 'Import airlines.sql : '.$error;
766 
+			}
721 767 
 		}
722 768 
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 769 
 			// Add column over_country
 
@@ -729,7 +775,9 @@  discard block
 
 block discarded – undo
729 775 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 776 
     			}
731 777 
     		}
732 
-		if ($error != '') return $error;
778 
+		if ($error != '') {
779 
+			return $error;
780 
+		}
733 781 
 		/*
734 782 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
735 783 
 			// Force update ModeS (this will put type_flight data
 
@@ -759,7 +807,9 @@  discard block
 
 block discarded – undo
759 807 
 			} catch(PDOException $e) {
760 808 
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 809 
 			}
762 
-			if ($error != '') return $error;
810 
+			if ($error != '') {
811 
+				return $error;
812 
+			}
763 813 
 		}
764 814 
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 815 
         	try {
 
@@ -782,7 +832,9 @@  discard block
 
 block discarded – undo
782 832 
 			} else {
783 833 
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 834 
 			}
785 
-			if ($error != '') return $error;
835 
+			if ($error != '') {
836 
+				return $error;
837 
+			}
786 838 
 		}
787 839 
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 840 
         	try {
 
@@ -804,12 +856,16 @@  discard block
 
 block discarded – undo
804 856 
 		if ($globalDBdriver == 'mysql') {
805 857 
 			if (!$Connection->tableExists('tle')) {
806 858 
 				$error .= create_db::import_file('../db/tle.sql');
807 
-				if ($error != '') return $error;
859 
+				if ($error != '') {
860 
+					return $error;
861 
+				}
808 862 
 			}
809 863 
 		} else {
810 864 
 			if (!$Connection->tableExists('tle')) {
811 865 
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
812 
-				if ($error != '') return $error;
866 
+				if ($error != '') {
867 
+					return $error;
868 
+				}
813 869 
 			}
814 870 
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
815 871 
 			try {
 
@@ -849,7 +905,9 @@  discard block
 
 block discarded – undo
849 905 
 		} else {
850 906 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
851 907 
 		}
852 
-		if ($error != '') return 'Import airlines.sql : '.$error;
908 
+		if ($error != '') {
909 
+			return 'Import airlines.sql : '.$error;
910 
+		}
853 911 
 		if (!$Connection->checkColumnName('airlines','forsource')) {
854 912 
 			// Add forsource to airlines
855 913 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 
@@ -1332,20 +1390,28 @@  discard block
 
 block discarded – undo
1332 1390 
 		}
1333 1391 
 		if ($globalDBdriver == 'mysql') {
1334 1392 
 			$error .= create_db::import_file('../db/airlines.sql');
1335 
-			if ($error != '') return $error;
1393 
+			if ($error != '') {
1394 
+				return $error;
1395 
+			}
1336 1396 
 		} else {
1337 1397 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
1338 
-			if ($error != '') return $error;
1398 
+			if ($error != '') {
1399 
+				return $error;
1400 
+			}
1339 1401 
 		}
1340 1402 
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
1341 1403 
 			include_once(dirname(__FILE__).'/class.update_db.php');
1342 1404 
 			if (isset($globalVATSIM) && $globalVATSIM) {
1343 1405 
 				$error .= update_db::update_vatsim();
1344 
-				if ($error != '') return $error;
1406 
+				if ($error != '') {
1407 
+					return $error;
1408 
+				}
1345 1409 
 			}
1346 1410 
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
1347 1411 
 				$error .= update_db::update_IVAO();
1348 
-				if ($error != '') return $error;
1412 
+				if ($error != '') {
1413 
+					return $error;
1414 
+				}
1349 1415 
 			}
1350 1416 
 		}
1351 1417 
 
@@ -1608,41 +1674,65 @@  discard block
 
 block discarded – undo
1608 1674 
 		if ($globalDBdriver == 'mysql') {
1609 1675 
 			if (!$Connection->tableExists('tracker_output')) {
1610 1676 
 				$error .= create_db::import_file('../db/tracker_output.sql');
1611 
-				if ($error != '') return $error;
1677 
+				if ($error != '') {
1678 
+					return $error;
1679 
+				}
1612 1680 
 			}
1613 1681 
 			if (!$Connection->tableExists('tracker_live')) {
1614 1682 
 				$error .= create_db::import_file('../db/tracker_live.sql');
1615 
-				if ($error != '') return $error;
1683 
+				if ($error != '') {
1684 
+					return $error;
1685 
+				}
1616 1686 
 			}
1617 1687 
 			if (!$Connection->tableExists('marine_output')) {
1618 1688 
 				$error .= create_db::import_file('../db/marine_output.sql');
1619 
-				if ($error != '') return $error;
1689 
+				if ($error != '') {
1690 
+					return $error;
1691 
+				}
1620 1692 
 			}
1621 1693 
 			if (!$Connection->tableExists('marine_live')) {
1622 1694 
 				$error .= create_db::import_file('../db/marine_live.sql');
1623 
-				if ($error != '') return $error;
1695 
+				if ($error != '') {
1696 
+					return $error;
1697 
+				}
1624 1698 
 			}
1625 1699 
 			if (!$Connection->tableExists('marine_identity')) {
1626 1700 
 				$error .= create_db::import_file('../db/marine_identity.sql');
1627 
-				if ($error != '') return $error;
1701 
+				if ($error != '') {
1702 
+					return $error;
1703 
+				}
1628 1704 
 			}
1629 1705 
 			if (!$Connection->tableExists('marine_mid')) {
1630 1706 
 				$error .= create_db::import_file('../db/marine_mid.sql');
1631 
-				if ($error != '') return $error;
1707 
+				if ($error != '') {
1708 
+					return $error;
1709 
+				}
1632 1710 
 			}
1633 1711 
 		} else {
1634 1712 
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
1635 
-			if ($error != '') return $error;
1713 
+			if ($error != '') {
1714 
+				return $error;
1715 
+			}
1636 1716 
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
1637 
-			if ($error != '') return $error;
1717 
+			if ($error != '') {
1718 
+				return $error;
1719 
+			}
1638 1720 
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
1639 
-			if ($error != '') return $error;
1721 
+			if ($error != '') {
1722 
+				return $error;
1723 
+			}
1640 1724 
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
1641 
-			if ($error != '') return $error;
1725 
+			if ($error != '') {
1726 
+				return $error;
1727 
+			}
1642 1728 
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
1643 
-			if ($error != '') return $error;
1729 
+			if ($error != '') {
1730 
+				return $error;
1731 
+			}
1644 1732 
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
1645 
-			if ($error != '') return $error;
1733 
+			if ($error != '') {
1734 
+				return $error;
1735 
+			}
1646 1736 
 		}
1647 1737 
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
1648 1738 
 		try {
 
@@ -1661,39 +1751,61 @@  discard block
 
 block discarded – undo
1661 1751 
 		if ($globalDBdriver == 'mysql') {
1662 1752 
 			if (!$Connection->tableExists('marine_image')) {
1663 1753 
 				$error .= create_db::import_file('../db/marine_image.sql');
1664 
-				if ($error != '') return $error;
1754 
+				if ($error != '') {
1755 
+					return $error;
1756 
+				}
1665 1757 
 			}
1666 1758 
 			if (!$Connection->tableExists('marine_archive')) {
1667 1759 
 				$error .= create_db::import_file('../db/marine_archive.sql');
1668 
-				if ($error != '') return $error;
1760 
+				if ($error != '') {
1761 
+					return $error;
1762 
+				}
1669 1763 
 			}
1670 1764 
 			if (!$Connection->tableExists('marine_archive_output')) {
1671 1765 
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
1672 
-				if ($error != '') return $error;
1766 
+				if ($error != '') {
1767 
+					return $error;
1768 
+				}
1673 1769 
 			}
1674 1770 
 			if (!$Connection->tableExists('tracker_archive')) {
1675 1771 
 				$error .= create_db::import_file('../db/tracker_archive.sql');
1676 
-				if ($error != '') return $error;
1772 
+				if ($error != '') {
1773 
+					return $error;
1774 
+				}
1677 1775 
 			}
1678 1776 
 			if (!$Connection->tableExists('tracker_archive_output')) {
1679 1777 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1680 
-				if ($error != '') return $error;
1778 
+				if ($error != '') {
1779 
+					return $error;
1780 
+				}
1681 1781 
 			}
1682 1782 
 			if (!$Connection->tableExists('marine_archive_output')) {
1683 1783 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1684 
-				if ($error != '') return $error;
1784 
+				if ($error != '') {
1785 
+					return $error;
1786 
+				}
1685 1787 
 			}
1686 1788 
 		} else {
1687 1789 
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
1688 
-			if ($error != '') return $error;
1790 
+			if ($error != '') {
1791 
+				return $error;
1792 
+			}
1689 1793 
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
1690 
-			if ($error != '') return $error;
1794 
+			if ($error != '') {
1795 
+				return $error;
1796 
+			}
1691 1797 
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
1692 
-			if ($error != '') return $error;
1798 
+			if ($error != '') {
1799 
+				return $error;
1800 
+			}
1693 1801 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
1694 
-			if ($error != '') return $error;
1802 
+			if ($error != '') {
1803 
+				return $error;
1804 
+			}
1695 1805 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
1696 
-			if ($error != '') return $error;
1806 
+			if ($error != '') {
1807 
+				return $error;
1808 
+			}
1697 1809 
 		}
1698 1810 
 		if ($globalDBdriver == 'mysql') {
1699 1811 
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
 
@@ -2064,7 +2176,9 @@  discard block
 
 block discarded – undo
2064 2176 
 		if ($globalDBdriver == 'mysql') {
2065 2177 
 			if (!$Connection->tableExists('tracker_archive_output')) {
2066 2178 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
2067 
-				if ($error != '') return $error;
2179 
+				if ($error != '') {
2180 
+					return $error;
2181 
+				}
2068 2182 
 			}
2069 2183 
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
2070 2184 
 		} else {
 
@@ -2095,8 +2209,11 @@  discard block
 
 block discarded – undo
2095 2209 
     	    if ($Connection->tableExists('aircraft')) {
2096 2210 
     		if (!$Connection->tableExists('config')) {
2097 2211 
     		    $version = '1';
2098 
-    		    if ($update) return self::update_from_1();
2099 
-    		    else return $version;
2212 
+    		    if ($update) {
2213 
+    		    	return self::update_from_1();
2214 
+    		    } else {
2215 
+    		    	return $version;
2216 
+    		    }
2100 2217 
 		} else {
2101 2218 
     		    $Connection = new Connection();
2102 2219 
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 
@@ -2110,178 +2227,309 @@  discard block
 
 block discarded – undo
2110 2227 
     		    if ($update) {
2111 2228 
     			if ($result['value'] == '2') {
2112 2229 
     			    $error = self::update_from_2();
2113 
-    			    if ($error != '') return $error;
2114 
-    			    else return self::check_version(true);
2230 
+    			    if ($error != '') {
2231 
+    			    	return $error;
2232 
+    			    } else {
2233 
+    			    	return self::check_version(true);
2234 
+    			    }
2115 2235 
     			} elseif ($result['value'] == '3') {
2116 2236 
     			    $error = self::update_from_3();
2117 
-    			    if ($error != '') return $error;
2118 
-    			    else return self::check_version(true);
2237 
+    			    if ($error != '') {
2238 
+    			    	return $error;
2239 
+    			    } else {
2240 
+    			    	return self::check_version(true);
2241 
+    			    }
2119 2242 
     			} elseif ($result['value'] == '4') {
2120 2243 
     			    $error = self::update_from_4();
2121 
-    			    if ($error != '') return $error;
2122 
-    			    else return self::check_version(true);
2244 
+    			    if ($error != '') {
2245 
+    			    	return $error;
2246 
+    			    } else {
2247 
+    			    	return self::check_version(true);
2248 
+    			    }
2123 2249 
     			} elseif ($result['value'] == '5') {
2124 2250 
     			    $error = self::update_from_5();
2125 
-    			    if ($error != '') return $error;
2126 
-    			    else return self::check_version(true);
2251 
+    			    if ($error != '') {
2252 
+    			    	return $error;
2253 
+    			    } else {
2254 
+    			    	return self::check_version(true);
2255 
+    			    }
2127 2256 
     			} elseif ($result['value'] == '6') {
2128 2257 
     			    $error = self::update_from_6();
2129 
-    			    if ($error != '') return $error;
2130 
-    			    else return self::check_version(true);
2258 
+    			    if ($error != '') {
2259 
+    			    	return $error;
2260 
+    			    } else {
2261 
+    			    	return self::check_version(true);
2262 
+    			    }
2131 2263 
     			} elseif ($result['value'] == '7') {
2132 2264 
     			    $error = self::update_from_7();
2133 
-    			    if ($error != '') return $error;
2134 
-    			    else return self::check_version(true);
2265 
+    			    if ($error != '') {
2266 
+    			    	return $error;
2267 
+    			    } else {
2268 
+    			    	return self::check_version(true);
2269 
+    			    }
2135 2270 
     			} elseif ($result['value'] == '8') {
2136 2271 
     			    $error = self::update_from_8();
2137 
-    			    if ($error != '') return $error;
2138 
-    			    else return self::check_version(true);
2272 
+    			    if ($error != '') {
2273 
+    			    	return $error;
2274 
+    			    } else {
2275 
+    			    	return self::check_version(true);
2276 
+    			    }
2139 2277 
     			} elseif ($result['value'] == '9') {
2140 2278 
     			    $error = self::update_from_9();
2141 
-    			    if ($error != '') return $error;
2142 
-    			    else return self::check_version(true);
2279 
+    			    if ($error != '') {
2280 
+    			    	return $error;
2281 
+    			    } else {
2282 
+    			    	return self::check_version(true);
2283 
+    			    }
2143 2284 
     			} elseif ($result['value'] == '10') {
2144 2285 
     			    $error = self::update_from_10();
2145 
-    			    if ($error != '') return $error;
2146 
-    			    else return self::check_version(true);
2286 
+    			    if ($error != '') {
2287 
+    			    	return $error;
2288 
+    			    } else {
2289 
+    			    	return self::check_version(true);
2290 
+    			    }
2147 2291 
     			} elseif ($result['value'] == '11') {
2148 2292 
     			    $error = self::update_from_11();
2149 
-    			    if ($error != '') return $error;
2150 
-    			    else return self::check_version(true);
2293 
+    			    if ($error != '') {
2294 
+    			    	return $error;
2295 
+    			    } else {
2296 
+    			    	return self::check_version(true);
2297 
+    			    }
2151 2298 
     			} elseif ($result['value'] == '12') {
2152 2299 
     			    $error = self::update_from_12();
2153 
-    			    if ($error != '') return $error;
2154 
-    			    else return self::check_version(true);
2300 
+    			    if ($error != '') {
2301 
+    			    	return $error;
2302 
+    			    } else {
2303 
+    			    	return self::check_version(true);
2304 
+    			    }
2155 2305 
     			} elseif ($result['value'] == '13') {
2156 2306 
     			    $error = self::update_from_13();
2157 
-    			    if ($error != '') return $error;
2158 
-    			    else return self::check_version(true);
2307 
+    			    if ($error != '') {
2308 
+    			    	return $error;
2309 
+    			    } else {
2310 
+    			    	return self::check_version(true);
2311 
+    			    }
2159 2312 
     			} elseif ($result['value'] == '14') {
2160 2313 
     			    $error = self::update_from_14();
2161 
-    			    if ($error != '') return $error;
2162 
-    			    else return self::check_version(true);
2314 
+    			    if ($error != '') {
2315 
+    			    	return $error;
2316 
+    			    } else {
2317 
+    			    	return self::check_version(true);
2318 
+    			    }
2163 2319 
     			} elseif ($result['value'] == '15') {
2164 2320 
     			    $error = self::update_from_15();
2165 
-    			    if ($error != '') return $error;
2166 
-    			    else return self::check_version(true);
2321 
+    			    if ($error != '') {
2322 
+    			    	return $error;
2323 
+    			    } else {
2324 
+    			    	return self::check_version(true);
2325 
+    			    }
2167 2326 
     			} elseif ($result['value'] == '16') {
2168 2327 
     			    $error = self::update_from_16();
2169 
-    			    if ($error != '') return $error;
2170 
-    			    else return self::check_version(true);
2328 
+    			    if ($error != '') {
2329 
+    			    	return $error;
2330 
+    			    } else {
2331 
+    			    	return self::check_version(true);
2332 
+    			    }
2171 2333 
     			} elseif ($result['value'] == '17') {
2172 2334 
     			    $error = self::update_from_17();
2173 
-    			    if ($error != '') return $error;
2174 
-    			    else return self::check_version(true);
2335 
+    			    if ($error != '') {
2336 
+    			    	return $error;
2337 
+    			    } else {
2338 
+    			    	return self::check_version(true);
2339 
+    			    }
2175 2340 
     			} elseif ($result['value'] == '18') {
2176 2341 
     			    $error = self::update_from_18();
2177 
-    			    if ($error != '') return $error;
2178 
-    			    else return self::check_version(true);
2342 
+    			    if ($error != '') {
2343 
+    			    	return $error;
2344 
+    			    } else {
2345 
+    			    	return self::check_version(true);
2346 
+    			    }
2179 2347 
     			} elseif ($result['value'] == '19') {
2180 2348 
     			    $error = self::update_from_19();
2181 
-    			    if ($error != '') return $error;
2182 
-    			    else return self::check_version(true);
2349 
+    			    if ($error != '') {
2350 
+    			    	return $error;
2351 
+    			    } else {
2352 
+    			    	return self::check_version(true);
2353 
+    			    }
2183 2354 
     			} elseif ($result['value'] == '20') {
2184 2355 
     			    $error = self::update_from_20();
2185 
-    			    if ($error != '') return $error;
2186 
-    			    else return self::check_version(true);
2356 
+    			    if ($error != '') {
2357 
+    			    	return $error;
2358 
+    			    } else {
2359 
+    			    	return self::check_version(true);
2360 
+    			    }
2187 2361 
     			} elseif ($result['value'] == '21') {
2188 2362 
     			    $error = self::update_from_21();
2189 
-    			    if ($error != '') return $error;
2190 
-    			    else return self::check_version(true);
2363 
+    			    if ($error != '') {
2364 
+    			    	return $error;
2365 
+    			    } else {
2366 
+    			    	return self::check_version(true);
2367 
+    			    }
2191 2368 
     			} elseif ($result['value'] == '22') {
2192 2369 
     			    $error = self::update_from_22();
2193 
-    			    if ($error != '') return $error;
2194 
-    			    else return self::check_version(true);
2370 
+    			    if ($error != '') {
2371 
+    			    	return $error;
2372 
+    			    } else {
2373 
+    			    	return self::check_version(true);
2374 
+    			    }
2195 2375 
     			} elseif ($result['value'] == '23') {
2196 2376 
     			    $error = self::update_from_23();
2197 
-    			    if ($error != '') return $error;
2198 
-    			    else return self::check_version(true);
2377 
+    			    if ($error != '') {
2378 
+    			    	return $error;
2379 
+    			    } else {
2380 
+    			    	return self::check_version(true);
2381 
+    			    }
2199 2382 
     			} elseif ($result['value'] == '24') {
2200 2383 
     			    $error = self::update_from_24();
2201 
-    			    if ($error != '') return $error;
2202 
-    			    else return self::check_version(true);
2384 
+    			    if ($error != '') {
2385 
+    			    	return $error;
2386 
+    			    } else {
2387 
+    			    	return self::check_version(true);
2388 
+    			    }
2203 2389 
     			} elseif ($result['value'] == '25') {
2204 2390 
     			    $error = self::update_from_25();
2205 
-    			    if ($error != '') return $error;
2206 
-    			    else return self::check_version(true);
2391 
+    			    if ($error != '') {
2392 
+    			    	return $error;
2393 
+    			    } else {
2394 
+    			    	return self::check_version(true);
2395 
+    			    }
2207 2396 
     			} elseif ($result['value'] == '26') {
2208 2397 
     			    $error = self::update_from_26();
2209 
-    			    if ($error != '') return $error;
2210 
-    			    else return self::check_version(true);
2398 
+    			    if ($error != '') {
2399 
+    			    	return $error;
2400 
+    			    } else {
2401 
+    			    	return self::check_version(true);
2402 
+    			    }
2211 2403 
     			} elseif ($result['value'] == '27') {
2212 2404 
     			    $error = self::update_from_27();
2213 
-    			    if ($error != '') return $error;
2214 
-    			    else return self::check_version(true);
2405 
+    			    if ($error != '') {
2406 
+    			    	return $error;
2407 
+    			    } else {
2408 
+    			    	return self::check_version(true);
2409 
+    			    }
2215 2410 
     			} elseif ($result['value'] == '28') {
2216 2411 
     			    $error = self::update_from_28();
2217 
-    			    if ($error != '') return $error;
2218 
-    			    else return self::check_version(true);
2412 
+    			    if ($error != '') {
2413 
+    			    	return $error;
2414 
+    			    } else {
2415 
+    			    	return self::check_version(true);
2416 
+    			    }
2219 2417 
     			} elseif ($result['value'] == '29') {
2220 2418 
     			    $error = self::update_from_29();
2221 
-    			    if ($error != '') return $error;
2222 
-    			    else return self::check_version(true);
2419 
+    			    if ($error != '') {
2420 
+    			    	return $error;
2421 
+    			    } else {
2422 
+    			    	return self::check_version(true);
2423 
+    			    }
2223 2424 
     			} elseif ($result['value'] == '30') {
2224 2425 
     			    $error = self::update_from_30();
2225 
-    			    if ($error != '') return $error;
2226 
-    			    else return self::check_version(true);
2426 
+    			    if ($error != '') {
2427 
+    			    	return $error;
2428 
+    			    } else {
2429 
+    			    	return self::check_version(true);
2430 
+    			    }
2227 2431 
     			} elseif ($result['value'] == '31') {
2228 2432 
     			    $error = self::update_from_31();
2229 
-    			    if ($error != '') return $error;
2230 
-    			    else return self::check_version(true);
2433 
+    			    if ($error != '') {
2434 
+    			    	return $error;
2435 
+    			    } else {
2436 
+    			    	return self::check_version(true);
2437 
+    			    }
2231 2438 
     			} elseif ($result['value'] == '32') {
2232 2439 
     			    $error = self::update_from_32();
2233 
-    			    if ($error != '') return $error;
2234 
-    			    else return self::check_version(true);
2440 
+    			    if ($error != '') {
2441 
+    			    	return $error;
2442 
+    			    } else {
2443 
+    			    	return self::check_version(true);
2444 
+    			    }
2235 2445 
     			} elseif ($result['value'] == '33') {
2236 2446 
     			    $error = self::update_from_33();
2237 
-    			    if ($error != '') return $error;
2238 
-    			    else return self::check_version(true);
2447 
+    			    if ($error != '') {
2448 
+    			    	return $error;
2449 
+    			    } else {
2450 
+    			    	return self::check_version(true);
2451 
+    			    }
2239 2452 
     			} elseif ($result['value'] == '34') {
2240 2453 
     			    $error = self::update_from_34();
2241 
-    			    if ($error != '') return $error;
2242 
-    			    else return self::check_version(true);
2454 
+    			    if ($error != '') {
2455 
+    			    	return $error;
2456 
+    			    } else {
2457 
+    			    	return self::check_version(true);
2458 
+    			    }
2243 2459 
     			} elseif ($result['value'] == '35') {
2244 2460 
     			    $error = self::update_from_35();
2245 
-    			    if ($error != '') return $error;
2246 
-    			    else return self::check_version(true);
2461 
+    			    if ($error != '') {
2462 
+    			    	return $error;
2463 
+    			    } else {
2464 
+    			    	return self::check_version(true);
2465 
+    			    }
2247 2466 
     			} elseif ($result['value'] == '36') {
2248 2467 
     			    $error = self::update_from_36();
2249 
-    			    if ($error != '') return $error;
2250 
-    			    else return self::check_version(true);
2468 
+    			    if ($error != '') {
2469 
+    			    	return $error;
2470 
+    			    } else {
2471 
+    			    	return self::check_version(true);
2472 
+    			    }
2251 2473 
     			} elseif ($result['value'] == '37') {
2252 2474 
     			    $error = self::update_from_37();
2253 
-    			    if ($error != '') return $error;
2254 
-    			    else return self::check_version(true);
2475 
+    			    if ($error != '') {
2476 
+    			    	return $error;
2477 
+    			    } else {
2478 
+    			    	return self::check_version(true);
2479 
+    			    }
2255 2480 
     			} elseif ($result['value'] == '38') {
2256 2481 
     			    $error = self::update_from_38();
2257 
-    			    if ($error != '') return $error;
2258 
-    			    else return self::check_version(true);
2482 
+    			    if ($error != '') {
2483 
+    			    	return $error;
2484 
+    			    } else {
2485 
+    			    	return self::check_version(true);
2486 
+    			    }
2259 2487 
     			} elseif ($result['value'] == '39') {
2260 2488 
     			    $error = self::update_from_39();
2261 
-    			    if ($error != '') return $error;
2262 
-    			    else return self::check_version(true);
2489 
+    			    if ($error != '') {
2490 
+    			    	return $error;
2491 
+    			    } else {
2492 
+    			    	return self::check_version(true);
2493 
+    			    }
2263 2494 
     			} elseif ($result['value'] == '40') {
2264 2495 
     			    $error = self::update_from_40();
2265 
-    			    if ($error != '') return $error;
2266 
-    			    else return self::check_version(true);
2496 
+    			    if ($error != '') {
2497 
+    			    	return $error;
2498 
+    			    } else {
2499 
+    			    	return self::check_version(true);
2500 
+    			    }
2267 2501 
     			} elseif ($result['value'] == '41') {
2268 2502 
     			    $error = self::update_from_41();
2269 
-    			    if ($error != '') return $error;
2270 
-    			    else return self::check_version(true);
2503 
+    			    if ($error != '') {
2504 
+    			    	return $error;
2505 
+    			    } else {
2506 
+    			    	return self::check_version(true);
2507 
+    			    }
2271 2508 
     			} elseif ($result['value'] == '42') {
2272 2509 
     			    $error = self::update_from_42();
2273 
-    			    if ($error != '') return $error;
2274 
-    			    else return self::check_version(true);
2510 
+    			    if ($error != '') {
2511 
+    			    	return $error;
2512 
+    			    } else {
2513 
+    			    	return self::check_version(true);
2514 
+    			    }
2275 2515 
     			} elseif ($result['value'] == '43') {
2276 2516 
     			    $error = self::update_from_43();
2277 
-    			    if ($error != '') return $error;
2278 
-    			    else return self::check_version(true);
2279 
-    			} else return '';
2517 
+    			    if ($error != '') {
2518 
+    			    	return $error;
2519 
+    			    } else {
2520 
+    			    	return self::check_version(true);
2521 
+    			    }
2522 
+    			} else {
2523 
+    				return '';
2524 
+    			}
2525 
+    		    } else {
2526 
+    		    	return $result['value'];
2280 2527 
     		    }
2281 
-    		    else return $result['value'];
2282 2528 
 		}
2283 2529
2284 
-	    } else return $version;
2530 
+	    } else {
2531 
+	    	return $version;
2532 
+	    }
2285 2533 
     	}
2286 2534
2287 2535 
 }
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 = 44;
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.
require/class.TrackerImport.php 2 patches
Indentation   +174 added lines, -174 removed lines patch added patch discarded remove patch 
@@ -7,16 +7,16 @@  discard block
 
 block discarded – undo
7 7 
 require_once(dirname(__FILE__).'/class.Source.php');
8 8
9 9 
 class TrackerImport {
10 
-    private $all_tracked = array();
11 
-    private $last_delete_hourly = 0;
12 
-    private $last_delete = 0;
13 
-    private $stats = array();
14 
-    private $tmd = 0;
15 
-    private $source_location = array();
16 
-    public $db = null;
17 
-    public $nb = 0;
10 
+	private $all_tracked = array();
11 
+	private $last_delete_hourly = 0;
12 
+	private $last_delete = 0;
13 
+	private $stats = array();
14 
+	private $tmd = 0;
15 
+	private $source_location = array();
16 
+	public $db = null;
17 
+	public $nb = 0;
18 18
19 
-    public function __construct($dbc = null) {
19 
+	public function __construct($dbc = null) {
20 20 
 	global $globalBeta;
21 21 
 	$Connection = new Connection($dbc);
22 22 
 	$this->db = $Connection->db();
 
@@ -38,50 +38,50 @@  discard block
 
 block discarded – undo
38 38 
 	    }
39 39 
 	}
40 40 
 	*/
41 
-    }
41 
+	}
42 42
43 
-    public function checkAll() {
43 
+	public function checkAll() {
44 44 
 	global $globalDebug;
45 45 
 	if ($globalDebug) echo "Update last seen tracked data...\n";
46 46 
 	foreach ($this->all_tracked as $key => $flight) {
47 
-	    if (isset($this->all_tracked[$key]['id'])) {
47 
+		if (isset($this->all_tracked[$key]['id'])) {
48 48 
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
49 
-    		$Tracker = new Tracker($this->db);
50 
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51 
-            }
49 
+			$Tracker = new Tracker($this->db);
50 
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51 
+			}
52 
+	}
52 53 
 	}
53 
-    }
54 54
55 
-    public function del() {
55 
+	public function del() {
56 56 
 	global $globalDebug;
57 57 
 	// Delete old infos
58 58 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
59 59 
 	foreach ($this->all_tracked as $key => $flight) {
60 
-    	    if (isset($flight['lastupdate'])) {
61 
-        	if ($flight['lastupdate'] < (time()-3000)) {
62 
-            	    if (isset($this->all_tracked[$key]['id'])) {
63 
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
60 
+			if (isset($flight['lastupdate'])) {
61 
+			if ($flight['lastupdate'] < (time()-3000)) {
62 
+					if (isset($this->all_tracked[$key]['id'])) {
63 
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
64 64 
 			/*
65 65 
 			$TrackerLive = new TrackerLive();
66 66 
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
67 67 
 			$TrackerLive->db = null;
68 68 
 			*/
69 
-            		//$real_arrival = $this->arrival($key);
70 
-            		$Tracker = new Tracker($this->db);
71 
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
69 
+					//$real_arrival = $this->arrival($key);
70 
+					$Tracker = new Tracker($this->db);
71 
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72 72 
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
73 73 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
74 74 
 			}
75 75 
 			// Put in archive
76 76 
 //			$Tracker->db = null;
77 
-            	    }
78 
-            	    unset($this->all_tracked[$key]);
79 
-    	        }
80 
-	    }
81 
-        }
82 
-    }
77 
+					}
78 
+					unset($this->all_tracked[$key]);
79 
+				}
80 
+		}
81 
+		}
82 
+	}
83 83
84 
-    public function add($line) {
84 
+	public function add($line) {
85 85 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
86 86 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
87 87 
 	date_default_timezone_set('UTC');
 
@@ -90,47 +90,47 @@  discard block
 
 block discarded – undo
90 90
91 91 
 	// SBS format is CSV format
92 92 
 	if(is_array($line) && isset($line['ident'])) {
93 
-	    //print_r($line);
94 
-  	    if (isset($line['ident'])) {
93 
+		//print_r($line);
94 
+  		if (isset($line['ident'])) {
95 95
96 96
97 97 
 		// Increment message number
98 98 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
99 
-		    $current_date = date('Y-m-d');
100 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
101 
-		    else $source = '';
102 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103 
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
104 
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
105 
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
106 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
99 
+			$current_date = date('Y-m-d');
100 
+			if (isset($line['source_name'])) $source = $line['source_name'];
101 
+			else $source = '';
102 
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103 
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
104 
+				$this->stats[$current_date][$source]['msg']['date'] = time();
105 
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
106 
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
107 107 
 		}
108 108
109 109
110 110 
 		$Common = new Common();
111 
-	        if (!isset($line['id'])) $id = trim($line['ident']);
112 
-	        else $id = trim($line['id']);
111 
+			if (!isset($line['id'])) $id = trim($line['ident']);
112 
+			else $id = trim($line['id']);
113 113
114 114 
 		if (!isset($this->all_tracked[$id])) {
115 
-		    $this->all_tracked[$id] = array();
116 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119 
-		    if (!isset($line['id'])) {
115 
+			$this->all_tracked[$id] = array();
116 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119 
+			if (!isset($line['id'])) {
120 120 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
121 121 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
122 
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123 
+			if ($globalAllTracked !== FALSE) $dataFound = true;
124 124 
 		}
125 125
126 126 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
127 
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
127 
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128 128 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
129 
-		    } else {
129 
+			} else {
130 130 
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131 131 
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
132 132 
 				return '';
133 
-		    }
133 
+			}
134 134 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
135 135 
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
136 136 
 			return '';
 
@@ -147,38 +147,38 @@  discard block
 
 block discarded – undo
147 147
148 148 
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
149 149 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
150 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151 
-		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
150 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151 
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
152 152 
 			$timeelapsed = microtime(true);
153 
-            		$Tracker = new Tracker($this->db);
154 
-            		$fromsource = NULL;
155 
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
153 
+					$Tracker = new Tracker($this->db);
154 
+					$fromsource = NULL;
155 
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
156 156 
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
157 157 
 			$Tracker->db = null;
158 158 
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
159 
-		    }
160 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
159 
+			}
160 
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
161 161 
 		}
162 162
163 163 
 		if (isset($line['speed']) && $line['speed'] != '') {
164 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
164 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
166 166 
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
167 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168 
-		    if ($distance > 100 && $distance < 10000) {
167 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168 
+			if ($distance > 100 && $distance < 10000) {
169 169 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 170 
 			$speed = $speed*3.6;
171 171 
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
172 172 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
173 
-		    }
173 
+			}
174 174 
 		}
175 175
176 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178 
-	    	    else unset($timediff);
179 
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
176 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177 
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178 
+				else unset($timediff);
179 
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
180 180 
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181 
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
181 
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
182 182 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
183 183 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 184 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -192,160 +192,160 @@  discard block
 
 block discarded – undo
192 192 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
193 193 
 				$this->tmd = 0;
194 194 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
195 
-			    }
195 
+				}
196 196 
 			}
197 197
198 198 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199 199 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
200 200 
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
201 
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202 
-				    $dataFound = true;
203 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
201 
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202 
+					$dataFound = true;
203 
+					$this->all_tracked[$id]['time_last_coord'] = time();
204 204 
 				}
205 205 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
206 206 
 			}
207 207 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
208 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209 209 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
210 210 
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
211 
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212 
-				    $dataFound = true;
213 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
211 
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212 
+					$dataFound = true;
213 
+					$this->all_tracked[$id]['time_last_coord'] = time();
214 214 
 				}
215 215 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
216 216 
 			}
217 217
218 
-		    } else if ($globalDebug && $timediff > 20) {
218 
+			} else if ($globalDebug && $timediff > 20) {
219 219 
 			$this->tmd = $this->tmd + 1;
220 220 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
221 221 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
222 222 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
223 223 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
224 
-		    }
224 
+			}
225 225 
 		}
226 226 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
227 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
228 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
227 
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
228 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
229 229 
 		}
230 230 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
231 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
231 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
232 232 
 		}
233 233 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
234 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
234 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
235 235 
 		}
236 236 
 		if (isset($line['comment']) && $line['comment'] != '') {
237 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
238 
-		    //$dataFound = true;
237 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
238 
+			//$dataFound = true;
239 239 
 		}
240 240 
 		if (isset($line['type']) && $line['type'] != '') {
241 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
242 
-		    //$dataFound = true;
241 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
242 
+			//$dataFound = true;
243 243 
 		}
244 244
245 245 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
246 
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
246 
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
247 247 
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
248 248 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
249 249 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
250 250 
 			//$dataFound = true;
251 
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
251 
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
252 252 
   		}
253 253
254 254 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
255 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
255 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
256 256 
 		}
257 257
258 258 
 		if (isset($line['heading']) && $line['heading'] != '') {
259 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
260 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
261 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
262 
-		    //$dataFound = true;
259 
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
260 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
261 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
262 
+			//$dataFound = true;
263 263 
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
264 
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
265 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
266 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
267 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
264 
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
265 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
266 
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
267 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
268 268 
   		}
269 269 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
270 270
271 271 
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
272 
-		    $this->all_tracked[$id]['lastupdate'] = time();
273 
-		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
274 
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
275 
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
272 
+			$this->all_tracked[$id]['lastupdate'] = time();
273 
+			if ($this->all_tracked[$id]['addedTracker'] == 0) {
274 
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
275 
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
276 276 
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
277 277 
 				$timeelapsed = microtime(true);
278 278 
 				$TrackerLive = new TrackerLive($this->db);
279 279 
 				if (isset($line['id'])) {
280 
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
281 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
280 
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
281 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
282 282 
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
283 
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
284 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
283 
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
284 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
285 285 
 				} else $recent_ident = '';
286 286 
 				$TrackerLive->db=null;
287 287
288 288 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
289 289 
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
290 
-			    } else {
290 
+				} else {
291 291 
 				$recent_ident = '';
292 292 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
293 
-			    }
294 
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
295 
-			    if($recent_ident == "")
296 
-			    {
293 
+				}
294 
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
295 
+				if($recent_ident == "")
296 
+				{
297 297 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
298 298 
 				//adds the spotter data for the archive
299 
-				    $highlight = '';
300 
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
301 
-				    $timeelapsed = microtime(true);
302 
-				    $Tracker = new Tracker($this->db);
303 
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
304 
-				    $Tracker->db = null;
305 
-				    if ($globalDebug && isset($result)) echo $result."\n";
306 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
299 
+					$highlight = '';
300 
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
301 
+					$timeelapsed = microtime(true);
302 
+					$Tracker = new Tracker($this->db);
303 
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
304 
+					$Tracker->db = null;
305 
+					if ($globalDebug && isset($result)) echo $result."\n";
306 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
307 307
308 308
309 
-				    // Add source stat in DB
310 
-				    $Stats = new Stats($this->db);
311 
-				    if (!empty($this->stats)) {
309 
+					// Add source stat in DB
310 
+					$Stats = new Stats($this->db);
311 
+					if (!empty($this->stats)) {
312 312 
 					if ($globalDebug) echo 'Add source stats : ';
313 
-				        foreach($this->stats as $date => $data) {
314 
-					    foreach($data as $source => $sourced) {
315 
-					        //print_r($sourced);
316 
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
317 
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
318 
-				    		if (isset($sourced['msg'])) {
319 
-				    		    if (time() - $sourced['msg']['date'] > 10) {
320 
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
321 
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
322 
-			    			        unset($this->stats[$date][$source]['msg']);
323 
-			    			    }
324 
-			    			}
325 
-			    		    }
326 
-			    		    if ($date != date('Y-m-d')) {
327 
-			    			unset($this->stats[$date]);
328 
-			    		    }
329 
-				    	}
330 
-				    	if ($globalDebug) echo 'Done'."\n";
313 
+						foreach($this->stats as $date => $data) {
314 
+						foreach($data as $source => $sourced) {
315 
+							//print_r($sourced);
316 
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
317 
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
318 
+							if (isset($sourced['msg'])) {
319 
+								if (time() - $sourced['msg']['date'] > 10) {
320 
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
321 
+									echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
322 
+									unset($this->stats[$date][$source]['msg']);
323 
+								}
324 
+							}
325 
+							}
326 
+							if ($date != date('Y-m-d')) {
327 
+							unset($this->stats[$date]);
328 
+							}
329 
+						}
330 
+						if ($globalDebug) echo 'Done'."\n";
331 331
332 
-				    }
333 
-				    $Stats->db = null;
332 
+					}
333 
+					$Stats->db = null;
334 334
335 
-				    $this->del();
335 
+					$this->del();
336 336 
 				//$ignoreImport = false;
337 337 
 				$this->all_tracked[$id]['addedTracker'] = 1;
338 338 
 				//print_r($this->all_tracked[$id]);
339 339 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
340 
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
341 
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
342 
-				    $TrackerLive = new TrackerLive($this->db);
343 
-				    $TrackerLive->deleteLiveTrackerData();
344 
-				    $TrackerLive->db=null;
345 
-				    if ($globalDebug) echo " Done\n";
346 
-				    $this->last_delete = time();
340 
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
341 
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
342 
+					$TrackerLive = new TrackerLive($this->db);
343 
+					$TrackerLive->deleteLiveTrackerData();
344 
+					$TrackerLive->db=null;
345 
+					if ($globalDebug) echo " Done\n";
346 
+					$this->last_delete = time();
347 347 
 				}
348 
-			    } else {
348 
+				} else {
349 349 
 				$this->all_tracked[$id]['id'] = $recent_ident;
350 350 
 				$this->all_tracked[$id]['addedTracker'] = 1;
351 351 
 				if (isset($globalDaemon) && !$globalDaemon) {
 
@@ -354,16 +354,16 @@  discard block
 
 block discarded – undo
354 354 
 					$Tracker->db = null;
355 355 
 				}
356 356
357 
-			    }
357 
+				}
358 358 
 			}
359 
-		    }
360 
-		    //adds the spotter LIVE data
361 
-		    if ($globalDebug) {
359 
+			}
360 
+			//adds the spotter LIVE data
361 
+			if ($globalDebug) {
362 362 
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
363 
-		    }
364 
-		    $ignoreImport = false;
363 
+			}
364 
+			$ignoreImport = false;
365 365
366 
-		    if (!$ignoreImport) {
366 
+			if (!$ignoreImport) {
367 367 
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
368 368 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
369 369 
 				$timeelapsed = microtime(true);
 
@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
 					if ($stats_heading == 16) $stats_heading = 0;
402 402 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
403 403 
 						for ($i=0;$i<=15;$i++) {
404 
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
404 
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
405 405 
 						}
406 406 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
407 407 
 					} else {
 
@@ -414,11 +414,11 @@  discard block
 
 block discarded – undo
414 414 
 					//var_dump($this->stats);
415 415 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
416 416 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
417 
-						    end($this->stats[$current_date][$source]['hist']);
418 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
417 
+							end($this->stats[$current_date][$source]['hist']);
418 
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
419 419 
 						} else $mini = 0;
420 420 
 						for ($i=$mini;$i<=$distance;$i+=10) {
421 
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
421 
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
422 422 
 						}
423 423 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
424 424 
 					} else {
 
@@ -434,22 +434,22 @@  discard block
 
 block discarded – undo
434 434
435 435
436 436 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
437 
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
438 
-			    $TrackerLive = new TrackerLive($this->db);
439 
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
440 
-			    $TrackerLive->db = null;
441 
-			    //TrackerLive->deleteLiveTrackerData();
442 
-			    if ($globalDebug) echo " Done\n";
443 
-			    $this->last_delete_hourly = time();
437 
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
438 
+				$TrackerLive = new TrackerLive($this->db);
439 
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
440 
+				$TrackerLive->db = null;
441 
+				//TrackerLive->deleteLiveTrackerData();
442 
+				if ($globalDebug) echo " Done\n";
443 
+				$this->last_delete_hourly = time();
444 444 
 			}
445 445
446 
-		    }
447 
-		    //$ignoreImport = false;
446 
+			}
447 
+			//$ignoreImport = false;
448 448 
 		}
449 449 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
450 450 
 		if ($send) return $this->all_tracked[$id];
451 
-	    }
451 
+		}
452 
+	}
452 453 
 	}
453 
-    }
454 454 
 }
455 455 
 ?>
Please login to merge, or discard this patch.
Braces   +190 added lines, -65 removed lines patch added patch discarded remove patch 
@@ -42,7 +42,9 @@  discard block
 
 block discarded – undo
42 42
43 43 
     public function checkAll() {
44 44 
 	global $globalDebug;
45 
-	if ($globalDebug) echo "Update last seen tracked data...\n";
45 
+	if ($globalDebug) {
46 
+		echo "Update last seen tracked data...\n";
47 
+	}
46 48 
 	foreach ($this->all_tracked as $key => $flight) {
47 49 
 	    if (isset($this->all_tracked[$key]['id'])) {
48 50 
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
 
@@ -55,12 +57,16 @@  discard block
 
 block discarded – undo
55 57 
     public function del() {
56 58 
 	global $globalDebug;
57 59 
 	// Delete old infos
58 
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
60 
+	if ($globalDebug) {
61 
+		echo 'Delete old values and update latest data...'."\n";
62 
+	}
59 63 
 	foreach ($this->all_tracked as $key => $flight) {
60 64 
     	    if (isset($flight['lastupdate'])) {
61 65 
         	if ($flight['lastupdate'] < (time()-3000)) {
62 66 
             	    if (isset($this->all_tracked[$key]['id'])) {
63 
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
67 
+            		if ($globalDebug) {
68 
+            			echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
69 
+            		}
64 70 
 			/*
65 71 
 			$TrackerLive = new TrackerLive();
66 72 
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
 
@@ -70,7 +76,9 @@  discard block
 
 block discarded – undo
70 76 
             		$Tracker = new Tracker($this->db);
71 77 
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72 78 
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
73 
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
79 
+				if ($globalDebug && $result != 'success') {
80 
+					echo '!!! ERROR : '.$result."\n";
81 
+				}
74 82 
 			}
75 83 
 			// Put in archive
76 84 
 //			$Tracker->db = null;
 
@@ -83,7 +91,9 @@  discard block
 
 block discarded – undo
83 91
84 92 
     public function add($line) {
85 93 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
86 
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
94 
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
95 
+		$globalCoordMinChange = '0.02';
96 
+	}
87 97 
 	date_default_timezone_set('UTC');
88 98 
 	$dataFound = false;
89 99 
 	$send = false;
 
@@ -97,19 +107,29 @@  discard block
 
 block discarded – undo
97 107 
 		// Increment message number
98 108 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
99 109 
 		    $current_date = date('Y-m-d');
100 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
101 
-		    else $source = '';
102 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
110 
+		    if (isset($line['source_name'])) {
111 
+		    	$source = $line['source_name'];
112 
+		    } else {
113 
+		    	$source = '';
114 
+		    }
115 
+		    if ($source == '' || $line['format_source'] == 'aprs') {
116 
+		    	$source = $line['format_source'];
117 
+		    }
103 118 
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
104 119 
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
105 120 
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
106 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
121 
+		    } else {
122 
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
123 
+		    }
107 124 
 		}
108 125
109 126
110 127 
 		$Common = new Common();
111 
-	        if (!isset($line['id'])) $id = trim($line['ident']);
112 
-	        else $id = trim($line['id']);
128 
+	        if (!isset($line['id'])) {
129 
+	        	$id = trim($line['ident']);
130 
+	        } else {
131 
+	        	$id = trim($line['id']);
132 
+	        }
113 133
114 134 
 		if (!isset($this->all_tracked[$id])) {
115 135 
 		    $this->all_tracked[$id] = array();
 
@@ -117,31 +137,46 @@  discard block
 
 block discarded – undo
117 137 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118 138 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119 139 
 		    if (!isset($line['id'])) {
120 
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
140 
+			if (!isset($globalDaemon)) {
141 
+				$globalDaemon = TRUE;
142 
+			}
121 143 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
144 
+		     } else {
145 
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
146 
+		     }
147 
+		    if ($globalAllTracked !== FALSE) {
148 
+		    	$dataFound = true;
149 
+		    }
124 150 
 		}
125 151
126 152 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
127 153 
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128 154 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
129 155 
 		    } else {
130 
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131 
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
156 
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
157 
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
158 
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
159 
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
160 
+				}
132 161 
 				return '';
133 162 
 		    }
134 163 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
135 
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
164 
+			if ($globalDebug) {
165 
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
166 
+			}
136 167 
 			return '';
137 168 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
138 
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
169 
+			if ($globalDebug) {
170 
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
171 
+			}
139 172 
 			return '';
140 173 
 		} elseif (!isset($line['datetime'])) {
141 174 
 			date_default_timezone_set('UTC');
142 175 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
143 176 
 		} else {
144 
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
177 
+			if ($globalDebug) {
178 
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
179 
+			}
145 180 
 			return '';
146 181 
 		}
147 182 
 		
@@ -153,11 +188,17 @@  discard block
 
 block discarded – undo
153 188 
             		$Tracker = new Tracker($this->db);
154 189 
             		$fromsource = NULL;
155 190 
             		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
156 
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
191 
+			if ($globalDebug && $result != 'success') {
192 
+				echo '!!! ERROR : '.$result."\n";
193 
+			}
157 194 
 			$Tracker->db = null;
158 
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
195 
+			if ($globalDebugTimeElapsed) {
196 
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
197 
+			}
198 
+		    }
199 
+		    if (!isset($this->all_tracked[$id]['id'])) {
200 
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
159 201 
 		    }
160 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
161 202 
 		}
162 203
163 204 
 		if (isset($line['speed']) && $line['speed'] != '') {
 
@@ -168,14 +209,21 @@  discard block
 
 block discarded – undo
168 209 
 		    if ($distance > 100 && $distance < 10000) {
169 210 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 211 
 			$speed = $speed*3.6;
171 
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
172 
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
212 
+			if ($speed < 1000) {
213 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
214 
+			}
215 
+  			if ($globalDebug) {
216 
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
217 
+  			}
173 218 
 		    }
174 219 
 		}
175 220
176 221 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178 
-	    	    else unset($timediff);
222 
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
223 
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
224 
+	    	    } else {
225 
+	    	    	unset($timediff);
226 
+	    	    }
179 227 
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
180 228 
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181 229 
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 
@@ -183,20 +231,30 @@  discard block
 
 block discarded – undo
183 231 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 232 
 				$this->all_tracked[$id]['putinarchive'] = true;
185 233
186 
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
234 
+				if ($globalDebug) {
235 
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
236 
+				}
187 237 
 				$timeelapsed = microtime(true);
188 238 
 				$Tracker = new Tracker($this->db);
189 239 
 				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
190 
-				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
240 
+				if (!empty($all_country)) {
241 
+					$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
242 
+				}
191 243 
 				$Tracker->db = null;
192 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
244 
+				if ($globalDebugTimeElapsed) {
245 
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
246 
+				}
193 247 
 				$this->tmd = 0;
194 
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
248 
+				if ($globalDebug) {
249 
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
250 
+				}
195 251 
 			    }
196 252 
 			}
197 253
198 254 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199 
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
255 
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
256 
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
257 
+				}
200 258 
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
201 259 
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202 260 
 				    $dataFound = true;
 
@@ -205,8 +263,12 @@  discard block
 
 block discarded – undo
205 263 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
206 264 
 			}
207 265 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209 
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
266 
+			    if ($line['longitude'] > 180) {
267 
+			    	$line['longitude'] = $line['longitude'] - 360;
268 
+			    }
269 
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
270 
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
271 
+				}
210 272 
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
211 273 
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212 274 
 				    $dataFound = true;
 
@@ -224,7 +286,9 @@  discard block
 
 block discarded – undo
224 286 
 		    }
225 287 
 		}
226 288 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
227 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
289 
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
290 
+		    	$dataFound = true;
291 
+		    }
228 292 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
229 293 
 		}
230 294 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
 
@@ -244,7 +308,9 @@  discard block
 
 block discarded – undo
244 308
245 309 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
246 310 
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
247 
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
311 
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
312 
+				$this->all_tracked[$id]['putinarchive'] = true;
313 
+			}
248 314 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
249 315 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
250 316 
 			//$dataFound = true;
 
@@ -256,15 +322,21 @@  discard block
 
 block discarded – undo
256 322 
 		}
257 323
258 324 
 		if (isset($line['heading']) && $line['heading'] != '') {
259 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
325 
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
326 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
327 
+		    }
260 328 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
261 329 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
262 330 
 		    //$dataFound = true;
263 331 
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
264 332 
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
265 333 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
266 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
267 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
334 
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
335 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
336 
+		    }
337 
+  		    if ($globalDebug) {
338 
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
339 
+  		    }
268 340 
   		}
269 341 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
270 342 
 
@@ -273,20 +345,31 @@  discard block
 
 block discarded – undo
273 345 
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
274 346 
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
275 347 
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
276 
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
348 
+				if ($globalDebug) {
349 
+					echo "Check if aircraft is already in DB...";
350 
+				}
277 351 
 				$timeelapsed = microtime(true);
278 352 
 				$TrackerLive = new TrackerLive($this->db);
279 353 
 				if (isset($line['id'])) {
280 354 
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
281 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
355 
+				    if ($globalDebugTimeElapsed) {
356 
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
357 
+				    }
282 358 
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
283 359 
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
284 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
285 
-				} else $recent_ident = '';
360 
+				    if ($globalDebugTimeElapsed) {
361 
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
362 
+				    }
363 
+				} else {
364 
+					$recent_ident = '';
365 
+				}
286 366 
 				$TrackerLive->db=null;
287 367
288 
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
289 
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
368 
+				if ($globalDebug && $recent_ident == '') {
369 
+					echo " Not in DB.\n";
370 
+				} elseif ($globalDebug && $recent_ident != '') {
371 
+					echo " Already in DB.\n";
372 
+				}
290 373 
 			    } else {
291 374 
 				$recent_ident = '';
292 375 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
 
@@ -294,27 +377,41 @@  discard block
 
 block discarded – undo
294 377 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
295 378 
 			    if($recent_ident == "")
296 379 
 			    {
297 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
380 
+				if ($globalDebug) {
381 
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
382 
+				}
298 383 
 				//adds the spotter data for the archive
299 384 
 				    $highlight = '';
300 
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
385 
+				    if (!isset($this->all_tracked[$id]['id'])) {
386 
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
387 
+				    }
301 388 
 				    $timeelapsed = microtime(true);
302 389 
 				    $Tracker = new Tracker($this->db);
303 390 
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
304 391 
 				    $Tracker->db = null;
305 
-				    if ($globalDebug && isset($result)) echo $result."\n";
306 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
392 
+				    if ($globalDebug && isset($result)) {
393 
+				    	echo $result."\n";
394 
+				    }
395 
+				    if ($globalDebugTimeElapsed) {
396 
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
397 
+				    }
307 398
308 399
309 400 
 				    // Add source stat in DB
310 401 
 				    $Stats = new Stats($this->db);
311 402 
 				    if (!empty($this->stats)) {
312 
-					if ($globalDebug) echo 'Add source stats : ';
403 
+					if ($globalDebug) {
404 
+						echo 'Add source stats : ';
405 
+					}
313 406 
 				        foreach($this->stats as $date => $data) {
314 407 
 					    foreach($data as $source => $sourced) {
315 408 
 					        //print_r($sourced);
316 
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
317 
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
409 
+				    	        if (isset($sourced['polar'])) {
410 
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
411 
+				    	        }
412 
+				    	        if (isset($sourced['hist'])) {
413 
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
414 
+				    	        }
318 415 
 				    		if (isset($sourced['msg'])) {
319 416 
 				    		    if (time() - $sourced['msg']['date'] > 10) {
320 417 
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
 
@@ -327,7 +424,9 @@  discard block
 
 block discarded – undo
327 424 
 			    			unset($this->stats[$date]);
328 425 
 			    		    }
329 426 
 				    	}
330 
-				    	if ($globalDebug) echo 'Done'."\n";
427 
+				    	if ($globalDebug) {
428 
+				    		echo 'Done'."\n";
429 
+				    	}
331 430
332 431 
 				    }
333 432 
 				    $Stats->db = null;
 
@@ -337,12 +436,16 @@  discard block
 
 block discarded – undo
337 436 
 				$this->all_tracked[$id]['addedTracker'] = 1;
338 437 
 				//print_r($this->all_tracked[$id]);
339 438 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
340 
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
439 
+				    if ($globalDebug) {
440 
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
441 
+				    }
341 442 
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
342 443 
 				    $TrackerLive = new TrackerLive($this->db);
343 444 
 				    $TrackerLive->deleteLiveTrackerData();
344 445 
 				    $TrackerLive->db=null;
345 
-				    if ($globalDebug) echo " Done\n";
446 
+				    if ($globalDebug) {
447 
+				    	echo " Done\n";
448 
+				    }
346 449 
 				    $this->last_delete = time();
347 450 
 				}
348 451 
 			    } else {
 
@@ -365,19 +468,25 @@  discard block
 
 block discarded – undo
365 468
366 469 
 		    if (!$ignoreImport) {
367 470 
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
368 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
471 
+				if ($globalDebug) {
472 
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
473 
+				}
369 474 
 				$timeelapsed = microtime(true);
370 475 
 				$TrackerLive = new TrackerLive($this->db);
371 476 
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
372 477 
 				$TrackerLive->db = null;
373 478 
 				$this->all_tracked[$id]['putinarchive'] = false;
374 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
479 
+				if ($globalDebugTimeElapsed) {
480 
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
481 
+				}
375 482
376 483 
 				// Put statistics in $this->stats variable
377 484
378 485 
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
379 486 
 					$source = $this->all_tracked[$id]['source_name'];
380 
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
487 
+					if ($source == '') {
488 
+						$source = $this->all_tracked[$id]['format_source'];
489 
+					}
381 490 
 					if (!isset($this->source_location[$source])) {
382 491 
 						$Location = new Source();
383 492 
 						$coord = $Location->getLocationInfobySourceName($source);
 
@@ -398,7 +507,9 @@  discard block
 
 block discarded – undo
398 507 
 					$stats_heading = round($stats_heading/22.5);
399 508 
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
400 509 
 					$current_date = date('Y-m-d');
401 
-					if ($stats_heading == 16) $stats_heading = 0;
510 
+					if ($stats_heading == 16) {
511 
+						$stats_heading = 0;
512 
+					}
402 513 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
403 514 
 						for ($i=0;$i<=15;$i++) {
404 515 
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 
@@ -416,7 +527,9 @@  discard block
 
 block discarded – undo
416 527 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
417 528 
 						    end($this->stats[$current_date][$source]['hist']);
418 529 
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
419 
-						} else $mini = 0;
530 
+						} else {
531 
+							$mini = 0;
532 
+						}
420 533 
 						for ($i=$mini;$i<=$distance;$i+=10) {
421 534 
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
422 535 
 						}
 
@@ -427,19 +540,29 @@  discard block
 
 block discarded – undo
427 540 
 				}
428 541
429 542 
 				$this->all_tracked[$id]['lastupdate'] = time();
430 
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
431 
-				if ($globalDebug) echo $result."\n";
432 
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
543 
+				if ($this->all_tracked[$id]['putinarchive']) {
544 
+					$send = true;
545 
+				}
546 
+				if ($globalDebug) {
547 
+					echo $result."\n";
548 
+				}
549 
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
550 
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
551 
+			}
433 552 
 			//$this->del();
434 553
435 554
436 555 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
437 
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
556 
+			    if ($globalDebug) {
557 
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
558 
+			    }
438 559 
 			    $TrackerLive = new TrackerLive($this->db);
439 560 
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
440 561 
 			    $TrackerLive->db = null;
441 562 
 			    //TrackerLive->deleteLiveTrackerData();
442 
-			    if ($globalDebug) echo " Done\n";
563 
+			    if ($globalDebug) {
564 
+			    	echo " Done\n";
565 
+			    }
443 566 
 			    $this->last_delete_hourly = time();
444 567 
 			}
445 568 
 			
@@ -447,7 +570,9 @@  discard block
 
 block discarded – undo
447 570 
 		    //$ignoreImport = false;
448 571 
 		}
449 572 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
450 
-		if ($send) return $this->all_tracked[$id];
573 
+		if ($send) {
574 
+			return $this->all_tracked[$id];
575 
+		}
451 576 
 	    }
452 577 
 	}
453 578 
     }
Please login to merge, or discard this patch.