| @@ -14,11 +14,11 @@ discard block | ||
| 14 | 14 |              try { | 
| 15 | 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 | 19 | } | 
| 20 | 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']); | |
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | 24 | } | 
| @@ -50,7 +50,7 @@ discard block | ||
| 50 | 50 |          	try { | 
| 51 | 51 | $sth = $Connection->db->prepare($query); | 
| 52 | 52 | $sth->execute(); | 
| 53 | -    		} catch(PDOException $e) { | |
| 53 | +    		} catch (PDOException $e) { | |
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; | 
| 55 | 55 | } | 
| 56 | 56 | // Copy schedules data to routes table | 
| @@ -60,7 +60,7 @@ discard block | ||
| 60 | 60 |          	try { | 
| 61 | 61 | $sth = $Connection->db->prepare($query); | 
| 62 | 62 | $sth->execute(); | 
| 63 | -    		} catch(PDOException $e) { | |
| 63 | +    		} catch (PDOException $e) { | |
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; | 
| 65 | 65 | } | 
| 66 | 66 | // Add source column | 
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 |      		try { | 
| 69 | 69 | $sth = $Connection->db->prepare($query); | 
| 70 | 70 | $sth->execute(); | 
| 71 | -    		} catch(PDOException $e) { | |
| 71 | +    		} catch (PDOException $e) { | |
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; | 
| 73 | 73 | } | 
| 74 | 74 | // Delete unused column | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 |      		try { | 
| 77 | 77 | $sth = $Connection->db->prepare($query); | 
| 78 | 78 | $sth->execute(); | 
| 79 | -    		} catch(PDOException $e) { | |
| 79 | +    		} catch (PDOException $e) { | |
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; | 
| 81 | 81 | } | 
| 82 | 82 | // Add ModeS column | 
| @@ -84,14 +84,14 @@ discard block | ||
| 84 | 84 |      		try { | 
| 85 | 85 | $sth = $Connection->db->prepare($query); | 
| 86 | 86 | $sth->execute(); | 
| 87 | -    		} catch(PDOException $e) { | |
| 87 | +    		} catch (PDOException $e) { | |
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; | 
| 89 | 89 | } | 
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; | 
| 91 | 91 |      		try { | 
| 92 | 92 | $sth = $Connection->db->prepare($query); | 
| 93 | 93 | $sth->execute(); | 
| 94 | -    		} catch(PDOException $e) { | |
| 94 | +    		} catch (PDOException $e) { | |
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; | 
| 96 | 96 | } | 
| 97 | 97 | // Add auto_increment for aircraft_modes | 
| @@ -99,7 +99,7 @@ discard block | ||
| 99 | 99 |      		try { | 
| 100 | 100 | $sth = $Connection->db->prepare($query); | 
| 101 | 101 | $sth->execute(); | 
| 102 | -    		} catch(PDOException $e) { | |
| 102 | +    		} catch (PDOException $e) { | |
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; | 
| 104 | 104 | } | 
| 105 | 105 | $error = ''; | 
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 |          	try { | 
| 111 | 111 | $sth = $Connection->db->prepare($query); | 
| 112 | 112 | $sth->execute(); | 
| 113 | -    		} catch(PDOException $e) { | |
| 113 | +    		} catch (PDOException $e) { | |
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 115 | 115 | } | 
| 116 | 116 | return $error; | 
| @@ -123,7 +123,7 @@ discard block | ||
| 123 | 123 |          	try { | 
| 124 | 124 | $sth = $Connection->db->prepare($query); | 
| 125 | 125 | $sth->execute(); | 
| 126 | -    		} catch(PDOException $e) { | |
| 126 | +    		} catch (PDOException $e) { | |
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; | 
| 128 | 128 | } | 
| 129 | 129 | $error = ''; | 
| @@ -134,7 +134,7 @@ discard block | ||
| 134 | 134 |          	try { | 
| 135 | 135 | $sth = $Connection->db->prepare($query); | 
| 136 | 136 | $sth->execute(); | 
| 137 | -    		} catch(PDOException $e) { | |
| 137 | +    		} catch (PDOException $e) { | |
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 139 | 139 | } | 
| 140 | 140 | return $error; | 
| @@ -147,7 +147,7 @@ discard block | ||
| 147 | 147 |          	try { | 
| 148 | 148 | $sth = $Connection->db->prepare($query); | 
| 149 | 149 | $sth->execute(); | 
| 150 | -    		} catch(PDOException $e) { | |
| 150 | +    		} catch (PDOException $e) { | |
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; | 
| 152 | 152 | } | 
| 153 | 153 | // Add image_source_website column to spotter_image | 
| @@ -155,7 +155,7 @@ discard block | ||
| 155 | 155 |          	try { | 
| 156 | 156 | $sth = $Connection->db->prepare($query); | 
| 157 | 157 | $sth->execute(); | 
| 158 | -    		} catch(PDOException $e) { | |
| 158 | +    		} catch (PDOException $e) { | |
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; | 
| 160 | 160 | } | 
| 161 | 161 | $error = ''; | 
| @@ -164,7 +164,7 @@ discard block | ||
| 164 | 164 |          	try { | 
| 165 | 165 | $sth = $Connection->db->prepare($query); | 
| 166 | 166 | $sth->execute(); | 
| 167 | -    		} catch(PDOException $e) { | |
| 167 | +    		} catch (PDOException $e) { | |
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 169 | 169 | } | 
| 170 | 170 | return $error; | 
| @@ -182,7 +182,7 @@ discard block | ||
| 182 | 182 |          	    try { | 
| 183 | 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 | 187 | } | 
| 188 | 188 | } | 
| @@ -196,7 +196,7 @@ discard block | ||
| 196 | 196 |          	try { | 
| 197 | 197 | $sth = $Connection->db->prepare($query); | 
| 198 | 198 | $sth->execute(); | 
| 199 | -    		} catch(PDOException $e) { | |
| 199 | +    		} catch (PDOException $e) { | |
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; | 
| 201 | 201 | } | 
| 202 | 202 | // Add aircraft_shadow column to aircraft | 
| @@ -204,7 +204,7 @@ discard block | ||
| 204 | 204 |          	try { | 
| 205 | 205 | $sth = $Connection->db->prepare($query); | 
| 206 | 206 | $sth->execute(); | 
| 207 | -    		} catch(PDOException $e) { | |
| 207 | +    		} catch (PDOException $e) { | |
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; | 
| 209 | 209 | } | 
| 210 | 210 | // Add aircraft_shadow column to spotter_live | 
| @@ -212,7 +212,7 @@ discard block | ||
| 212 | 212 |          	try { | 
| 213 | 213 | $sth = $Connection->db->prepare($query); | 
| 214 | 214 | $sth->execute(); | 
| 215 | -    		} catch(PDOException $e) { | |
| 215 | +    		} catch (PDOException $e) { | |
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; | 
| 217 | 217 | } | 
| 218 | 218 | $error = ''; | 
| @@ -225,7 +225,7 @@ discard block | ||
| 225 | 225 |          	try { | 
| 226 | 226 | $sth = $Connection->db->prepare($query); | 
| 227 | 227 | $sth->execute(); | 
| 228 | -    		} catch(PDOException $e) { | |
| 228 | +    		} catch (PDOException $e) { | |
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 230 | 230 | } | 
| 231 | 231 | return $error; | 
| @@ -233,7 +233,7 @@ discard block | ||
| 233 | 233 | |
| 234 | 234 |  	private static function update_from_6() { | 
| 235 | 235 | $Connection = new Connection(); | 
| 236 | -    		if (!$Connection->indexExists('spotter_output','flightaware_id')) { | |
| 236 | +    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { | |
| 237 | 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); | 
| @@ -250,7 +250,7 @@ discard block | ||
| 250 | 250 |          	    try { | 
| 251 | 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 | 255 | } | 
| 256 | 256 | } | 
| @@ -265,7 +265,7 @@ discard block | ||
| 265 | 265 |          	try { | 
| 266 | 266 | $sth = $Connection->db->prepare($query); | 
| 267 | 267 | $sth->execute(); | 
| 268 | -    		} catch(PDOException $e) { | |
| 268 | +    		} catch (PDOException $e) { | |
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 270 | 270 | } | 
| 271 | 271 | return $error; | 
| @@ -274,12 +274,12 @@ discard block | ||
| 274 | 274 |  	private static function update_from_7() { | 
| 275 | 275 | global $globalDBname, $globalDBdriver; | 
| 276 | 276 | $Connection = new Connection(); | 
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; | |
| 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 | 279 |          	try { | 
| 280 | 280 | $sth = $Connection->db->prepare($query); | 
| 281 | 281 | $sth->execute(); | 
| 282 | -    		} catch(PDOException $e) { | |
| 282 | +    		} catch (PDOException $e) { | |
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; | 
| 284 | 284 | } | 
| 285 | 285 |      		if ($globalDBdriver == 'mysql') { | 
| @@ -287,7 +287,7 @@ discard block | ||
| 287 | 287 |  		    try { | 
| 288 | 288 | $sth = $Connection->db->prepare($query); | 
| 289 | 289 | $sth->execute(); | 
| 290 | -    		    } catch(PDOException $e) { | |
| 290 | +    		    } catch (PDOException $e) { | |
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; | 
| 292 | 292 | } | 
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); | 
| @@ -299,15 +299,15 @@ discard block | ||
| 299 | 299 | DROP TABLE spotter_archive; | 
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; | 
| 301 | 301 |              	    } else { | 
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; | |
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; | |
| 303 | 303 | } | 
| 304 | 304 |                  } else { | 
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; | |
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; | |
| 306 | 306 | } | 
| 307 | 307 |          	try { | 
| 308 | 308 | $sth = $Connection->db->prepare($query); | 
| 309 | 309 | $sth->execute(); | 
| 310 | -    		} catch(PDOException $e) { | |
| 310 | +    		} catch (PDOException $e) { | |
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; | 
| 312 | 312 | } | 
| 313 | 313 | |
| @@ -320,7 +320,7 @@ discard block | ||
| 320 | 320 |          	try { | 
| 321 | 321 | $sth = $Connection->db->prepare($query); | 
| 322 | 322 | $sth->execute(); | 
| 323 | -    		} catch(PDOException $e) { | |
| 323 | +    		} catch (PDOException $e) { | |
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 325 | 325 | } | 
| 326 | 326 | return $error; | 
| @@ -339,14 +339,14 @@ discard block | ||
| 339 | 339 |          	try { | 
| 340 | 340 | $sth = $Connection->db->prepare($query); | 
| 341 | 341 | $sth->execute(); | 
| 342 | -    		} catch(PDOException $e) { | |
| 342 | +    		} catch (PDOException $e) { | |
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; | 
| 344 | 344 | } | 
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; | 
| 346 | 346 |          	try { | 
| 347 | 347 | $sth = $Connection->db->prepare($query); | 
| 348 | 348 | $sth->execute(); | 
| 349 | -    		} catch(PDOException $e) { | |
| 349 | +    		} catch (PDOException $e) { | |
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 351 | 351 | } | 
| 352 | 352 | return $error; | 
| @@ -354,12 +354,12 @@ discard block | ||
| 354 | 354 | |
| 355 | 355 |  	private static function update_from_9() { | 
| 356 | 356 | $Connection = new Connection(); | 
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; | |
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; | |
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; | 
| 359 | 359 |          	try { | 
| 360 | 360 | $sth = $Connection->db->prepare($query); | 
| 361 | 361 | $sth->execute(); | 
| 362 | -    		} catch(PDOException $e) { | |
| 362 | +    		} catch (PDOException $e) { | |
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; | 
| 364 | 364 | } | 
| 365 | 365 | $error = ''; | 
| @@ -371,7 +371,7 @@ discard block | ||
| 371 | 371 |          	try { | 
| 372 | 372 | $sth = $Connection->db->prepare($query); | 
| 373 | 373 | $sth->execute(); | 
| 374 | -    		} catch(PDOException $e) { | |
| 374 | +    		} catch (PDOException $e) { | |
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 376 | 376 | } | 
| 377 | 377 | return $error; | 
| @@ -379,11 +379,11 @@ discard block | ||
| 379 | 379 | |
| 380 | 380 |  	private static function update_from_10() { | 
| 381 | 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"; | |
| 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 | 383 |          	try { | 
| 384 | 384 | $sth = $Connection->db->prepare($query); | 
| 385 | 385 | $sth->execute(); | 
| 386 | -    		} catch(PDOException $e) { | |
| 386 | +    		} catch (PDOException $e) { | |
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; | 
| 388 | 388 | } | 
| 389 | 389 | $error = ''; | 
| @@ -401,7 +401,7 @@ discard block | ||
| 401 | 401 |          	try { | 
| 402 | 402 | $sth = $Connection->db->prepare($query); | 
| 403 | 403 | $sth->execute(); | 
| 404 | -    		} catch(PDOException $e) { | |
| 404 | +    		} catch (PDOException $e) { | |
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 406 | 406 | } | 
| 407 | 407 | return $error; | 
| @@ -410,18 +410,18 @@ discard block | ||
| 410 | 410 |  	private static function update_from_11() { | 
| 411 | 411 | global $globalDBdriver, $globalDBname; | 
| 412 | 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)"; | |
| 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 | 414 |          	try { | 
| 415 | 415 | $sth = $Connection->db->prepare($query); | 
| 416 | 416 | $sth->execute(); | 
| 417 | -    		} catch(PDOException $e) { | |
| 417 | +    		} catch (PDOException $e) { | |
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; | 
| 419 | 419 | } | 
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; | |
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; | |
| 421 | 421 |          	try { | 
| 422 | 422 | $sth = $Connection->db->prepare($query); | 
| 423 | 423 | $sth->execute(); | 
| 424 | -    		} catch(PDOException $e) { | |
| 424 | +    		} catch (PDOException $e) { | |
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; | 
| 426 | 426 | } | 
| 427 | 427 |      		if ($globalDBdriver == 'mysql') { | 
| @@ -429,7 +429,7 @@ discard block | ||
| 429 | 429 |  		    try { | 
| 430 | 430 | $sth = $Connection->db->prepare($query); | 
| 431 | 431 | $sth->execute(); | 
| 432 | -    		    } catch(PDOException $e) { | |
| 432 | +    		    } catch (PDOException $e) { | |
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; | 
| 434 | 434 | } | 
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); | 
| @@ -441,15 +441,15 @@ discard block | ||
| 441 | 441 | DROP TABLE spotter_archive; | 
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; | 
| 443 | 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"; | |
| 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 | 445 | } | 
| 446 | 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"; | |
| 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 | 448 | } | 
| 449 | 449 |          	try { | 
| 450 | 450 | $sth = $Connection->db->prepare($query); | 
| 451 | 451 | $sth->execute(); | 
| 452 | -    		} catch(PDOException $e) { | |
| 452 | +    		} catch (PDOException $e) { | |
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; | 
| 454 | 454 | } | 
| 455 | 455 | |
| @@ -459,7 +459,7 @@ discard block | ||
| 459 | 459 |          	try { | 
| 460 | 460 | $sth = $Connection->db->prepare($query); | 
| 461 | 461 | $sth->execute(); | 
| 462 | -    		} catch(PDOException $e) { | |
| 462 | +    		} catch (PDOException $e) { | |
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 464 | 464 | } | 
| 465 | 465 | return $error; | 
| @@ -487,7 +487,7 @@ discard block | ||
| 487 | 487 |          	try { | 
| 488 | 488 | $sth = $Connection->db->prepare($query); | 
| 489 | 489 | $sth->execute(); | 
| 490 | -    		} catch(PDOException $e) { | |
| 490 | +    		} catch (PDOException $e) { | |
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 492 | 492 | } | 
| 493 | 493 | return $error; | 
| @@ -495,12 +495,12 @@ discard block | ||
| 495 | 495 | |
| 496 | 496 |  	private static function update_from_13() { | 
| 497 | 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)"; | |
| 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 | } | 
| @@ -509,7 +509,7 @@ discard block | ||
| 509 | 509 |          	try { | 
| 510 | 510 | $sth = $Connection->db->prepare($query); | 
| 511 | 511 | $sth->execute(); | 
| 512 | -    		} catch(PDOException $e) { | |
| 512 | +    		} catch (PDOException $e) { | |
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 514 | 514 | } | 
| 515 | 515 | return $error; | 
| @@ -527,7 +527,7 @@ discard block | ||
| 527 | 527 |          	try { | 
| 528 | 528 | $sth = $Connection->db->prepare($query); | 
| 529 | 529 | $sth->execute(); | 
| 530 | -    		} catch(PDOException $e) { | |
| 530 | +    		} catch (PDOException $e) { | |
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 532 | 532 | } | 
| 533 | 533 | return $error; | 
| @@ -538,11 +538,11 @@ discard block | ||
| 538 | 538 | $Connection = new Connection(); | 
| 539 | 539 | $error = ''; | 
| 540 | 540 | // Add tables | 
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; | |
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; | |
| 542 | 542 |          	try { | 
| 543 | 543 | $sth = $Connection->db->prepare($query); | 
| 544 | 544 | $sth->execute(); | 
| 545 | -    		} catch(PDOException $e) { | |
| 545 | +    		} catch (PDOException $e) { | |
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; | 
| 547 | 547 | } | 
| 548 | 548 | if ($error != '') return $error; | 
| @@ -550,7 +550,7 @@ discard block | ||
| 550 | 550 |          	try { | 
| 551 | 551 | $sth = $Connection->db->prepare($query); | 
| 552 | 552 | $sth->execute(); | 
| 553 | -    		} catch(PDOException $e) { | |
| 553 | +    		} catch (PDOException $e) { | |
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 555 | 555 | } | 
| 556 | 556 | return $error; | 
| @@ -571,7 +571,7 @@ discard block | ||
| 571 | 571 |          	try { | 
| 572 | 572 | $sth = $Connection->db->prepare($query); | 
| 573 | 573 | $sth->execute(); | 
| 574 | -    		} catch(PDOException $e) { | |
| 574 | +    		} catch (PDOException $e) { | |
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 576 | 576 | } | 
| 577 | 577 | return $error; | 
| @@ -589,7 +589,7 @@ discard block | ||
| 589 | 589 |          	try { | 
| 590 | 590 | $sth = $Connection->db->prepare($query); | 
| 591 | 591 | $sth->execute(); | 
| 592 | -    		} catch(PDOException $e) { | |
| 592 | +    		} catch (PDOException $e) { | |
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 594 | 594 | } | 
| 595 | 595 | return $error; | 
| @@ -598,12 +598,12 @@ discard block | ||
| 598 | 598 | $Connection = new Connection(); | 
| 599 | 599 | $error = ''; | 
| 600 | 600 | // Modify stats_airport table | 
| 601 | -    		if (!$Connection->checkColumnName('stats_airport','airport_name')) { | |
| 601 | +    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { | |
| 602 | 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 | 603 |      	        	try { | 
| 604 | 604 | $sth = $Connection->db->prepare($query); | 
| 605 | 605 | $sth->execute(); | 
| 606 | -    			} catch(PDOException $e) { | |
| 606 | +    			} catch (PDOException $e) { | |
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; | 
| 608 | 608 | } | 
| 609 | 609 | } | 
| @@ -612,7 +612,7 @@ discard block | ||
| 612 | 612 |          	try { | 
| 613 | 613 | $sth = $Connection->db->prepare($query); | 
| 614 | 614 | $sth->execute(); | 
| 615 | -    		} catch(PDOException $e) { | |
| 615 | +    		} catch (PDOException $e) { | |
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 617 | 617 | } | 
| 618 | 618 | return $error; | 
| @@ -629,73 +629,73 @@ discard block | ||
| 629 | 629 |          	try { | 
| 630 | 630 | $sth = $Connection->db->prepare($query); | 
| 631 | 631 | $sth->execute(); | 
| 632 | -    		} catch(PDOException $e) { | |
| 632 | +    		} catch (PDOException $e) { | |
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; | 
| 634 | 634 | } | 
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; | 
| 636 | 636 |          	try { | 
| 637 | 637 | $sth = $Connection->db->prepare($query); | 
| 638 | 638 | $sth->execute(); | 
| 639 | -    		} catch(PDOException $e) { | |
| 639 | +    		} catch (PDOException $e) { | |
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; | 
| 641 | 641 | } | 
| 642 | -		if (!$Connection->checkColumnName('spotter_archive','over_country')) { | |
| 642 | +		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { | |
| 643 | 643 | // Add column over_country | 
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; | 
| 645 | 645 |  			try { | 
| 646 | 646 | $sth = $Connection->db->prepare($query); | 
| 647 | 647 | $sth->execute(); | 
| 648 | -			} catch(PDOException $e) { | |
| 648 | +			} catch (PDOException $e) { | |
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; | 
| 650 | 650 | } | 
| 651 | 651 | } | 
| 652 | -		if (!$Connection->checkColumnName('spotter_live','over_country')) { | |
| 652 | +		if (!$Connection->checkColumnName('spotter_live', 'over_country')) { | |
| 653 | 653 | // Add column over_country | 
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; | 
| 655 | 655 |  			try { | 
| 656 | 656 | $sth = $Connection->db->prepare($query); | 
| 657 | 657 | $sth->execute(); | 
| 658 | -			} catch(PDOException $e) { | |
| 658 | +			} catch (PDOException $e) { | |
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; | 
| 660 | 660 | } | 
| 661 | 661 | } | 
| 662 | -		if (!$Connection->checkColumnName('spotter_output','source_name')) { | |
| 662 | +		if (!$Connection->checkColumnName('spotter_output', 'source_name')) { | |
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output | 
| 664 | 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 | -			} catch(PDOException $e) { | |
| 668 | +			} catch (PDOException $e) { | |
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; | 
| 670 | 670 | } | 
| 671 | 671 | } | 
| 672 | -		if (!$Connection->checkColumnName('spotter_live','source_name')) { | |
| 672 | +		if (!$Connection->checkColumnName('spotter_live', 'source_name')) { | |
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output | 
| 674 | 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 | -			} catch(PDOException $e) { | |
| 678 | +			} catch (PDOException $e) { | |
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; | 
| 680 | 680 | } | 
| 681 | 681 | } | 
| 682 | -		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { | |
| 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 | 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 | -			} catch(PDOException $e) { | |
| 688 | +			} catch (PDOException $e) { | |
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; | 
| 690 | 690 | } | 
| 691 | 691 | } | 
| 692 | -		if (!$Connection->checkColumnName('spotter_archive','source_name')) { | |
| 692 | +		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { | |
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output | 
| 694 | 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 | -			} catch(PDOException $e) { | |
| 698 | +			} catch (PDOException $e) { | |
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; | 
| 700 | 700 | } | 
| 701 | 701 | } | 
| @@ -704,7 +704,7 @@ discard block | ||
| 704 | 704 |          	try { | 
| 705 | 705 | $sth = $Connection->db->prepare($query); | 
| 706 | 706 | $sth->execute(); | 
| 707 | -    		} catch(PDOException $e) { | |
| 707 | +    		} catch (PDOException $e) { | |
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 709 | 709 | } | 
| 710 | 710 | return $error; | 
| @@ -719,13 +719,13 @@ discard block | ||
| 719 | 719 |  			$error .= create_db::import_file('../db/airlines.sql'); | 
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; | 
| 721 | 721 | } | 
| 722 | -		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { | |
| 722 | +		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { | |
| 723 | 723 | // Add column over_country | 
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; | 
| 725 | 725 |          		try { | 
| 726 | 726 | $sth = $Connection->db->prepare($query); | 
| 727 | 727 | $sth->execute(); | 
| 728 | -			} catch(PDOException $e) { | |
| 728 | +			} catch (PDOException $e) { | |
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; | 
| 730 | 730 | } | 
| 731 | 731 | } | 
| @@ -741,7 +741,7 @@ discard block | ||
| 741 | 741 |          	try { | 
| 742 | 742 | $sth = $Connection->db->prepare($query); | 
| 743 | 743 | $sth->execute(); | 
| 744 | -    		} catch(PDOException $e) { | |
| 744 | +    		} catch (PDOException $e) { | |
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 746 | 746 | } | 
| 747 | 747 | return $error; | 
| @@ -750,13 +750,13 @@ discard block | ||
| 750 | 750 |  	private static function update_from_21() { | 
| 751 | 751 | $Connection = new Connection(); | 
| 752 | 752 | $error = ''; | 
| 753 | -		if (!$Connection->checkColumnName('stats_airport','stats_type')) { | |
| 753 | +		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { | |
| 754 | 754 | // Rename type to stats_type | 
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; | 
| 756 | 756 |  			try { | 
| 757 | 757 | $sth = $Connection->db->prepare($query); | 
| 758 | 758 | $sth->execute(); | 
| 759 | -			} catch(PDOException $e) { | |
| 759 | +			} catch (PDOException $e) { | |
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; | 
| 761 | 761 | } | 
| 762 | 762 | if ($error != '') return $error; | 
| @@ -765,7 +765,7 @@ discard block | ||
| 765 | 765 |          	try { | 
| 766 | 766 | $sth = $Connection->db->prepare($query); | 
| 767 | 767 | $sth->execute(); | 
| 768 | -    		} catch(PDOException $e) { | |
| 768 | +    		} catch (PDOException $e) { | |
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 770 | 770 | } | 
| 771 | 771 | return $error; | 
| @@ -788,7 +788,7 @@ discard block | ||
| 788 | 788 |          	try { | 
| 789 | 789 | $sth = $Connection->db->prepare($query); | 
| 790 | 790 | $sth->execute(); | 
| 791 | -    		} catch(PDOException $e) { | |
| 791 | +    		} catch (PDOException $e) { | |
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 793 | 793 | } | 
| 794 | 794 | return $error; | 
| @@ -814,17 +814,17 @@ discard block | ||
| 814 | 814 |  			try { | 
| 815 | 815 | $sth = $Connection->db->prepare($query); | 
| 816 | 816 | $sth->execute(); | 
| 817 | -			} catch(PDOException $e) { | |
| 817 | +			} catch (PDOException $e) { | |
| 818 | 818 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; | 
| 819 | 819 | } | 
| 820 | 820 | } | 
| 821 | -		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { | |
| 821 | +		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { | |
| 822 | 822 | // Add aircraft_manufacturer to stats_aircraft | 
| 823 | 823 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; | 
| 824 | 824 |  			try { | 
| 825 | 825 | $sth = $Connection->db->prepare($query); | 
| 826 | 826 | $sth->execute(); | 
| 827 | -			} catch(PDOException $e) { | |
| 827 | +			} catch (PDOException $e) { | |
| 828 | 828 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; | 
| 829 | 829 | } | 
| 830 | 830 | } | 
| @@ -833,7 +833,7 @@ discard block | ||
| 833 | 833 |  		try { | 
| 834 | 834 | $sth = $Connection->db->prepare($query); | 
| 835 | 835 | $sth->execute(); | 
| 836 | -		} catch(PDOException $e) { | |
| 836 | +		} catch (PDOException $e) { | |
| 837 | 837 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 838 | 838 | } | 
| 839 | 839 | return $error; | 
| @@ -849,23 +849,23 @@ discard block | ||
| 849 | 849 |  			$error .= create_db::import_file('../db/pgsql/airlines.sql'); | 
| 850 | 850 | } | 
| 851 | 851 | if ($error != '') return 'Import airlines.sql : '.$error; | 
| 852 | -		if (!$Connection->checkColumnName('airlines','forsource')) { | |
| 852 | +		if (!$Connection->checkColumnName('airlines', 'forsource')) { | |
| 853 | 853 | // Add forsource to airlines | 
| 854 | 854 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; | 
| 855 | 855 |  			try { | 
| 856 | 856 | $sth = $Connection->db->prepare($query); | 
| 857 | 857 | $sth->execute(); | 
| 858 | -			} catch(PDOException $e) { | |
| 858 | +			} catch (PDOException $e) { | |
| 859 | 859 | return "error (add forsource column) : ".$e->getMessage()."\n"; | 
| 860 | 860 | } | 
| 861 | 861 | } | 
| 862 | -		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { | |
| 862 | +		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { | |
| 863 | 863 | // Add forsource to airlines | 
| 864 | 864 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 865 | 865 |  			try { | 
| 866 | 866 | $sth = $Connection->db->prepare($query); | 
| 867 | 867 | $sth->execute(); | 
| 868 | -			} catch(PDOException $e) { | |
| 868 | +			} catch (PDOException $e) { | |
| 869 | 869 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; | 
| 870 | 870 | } | 
| 871 | 871 | // Add unique key | 
| @@ -877,17 +877,17 @@ discard block | ||
| 877 | 877 |  			try { | 
| 878 | 878 | $sth = $Connection->db->prepare($query); | 
| 879 | 879 | $sth->execute(); | 
| 880 | -			} catch(PDOException $e) { | |
| 880 | +			} catch (PDOException $e) { | |
| 881 | 881 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; | 
| 882 | 882 | } | 
| 883 | 883 | } | 
| 884 | -		if (!$Connection->checkColumnName('stats_airport','stats_airline')) { | |
| 884 | +		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { | |
| 885 | 885 | // Add forsource to airlines | 
| 886 | 886 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 887 | 887 |  			try { | 
| 888 | 888 | $sth = $Connection->db->prepare($query); | 
| 889 | 889 | $sth->execute(); | 
| 890 | -			} catch(PDOException $e) { | |
| 890 | +			} catch (PDOException $e) { | |
| 891 | 891 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; | 
| 892 | 892 | } | 
| 893 | 893 | // Add unique key | 
| @@ -899,17 +899,17 @@ discard block | ||
| 899 | 899 |  			try { | 
| 900 | 900 | $sth = $Connection->db->prepare($query); | 
| 901 | 901 | $sth->execute(); | 
| 902 | -			} catch(PDOException $e) { | |
| 902 | +			} catch (PDOException $e) { | |
| 903 | 903 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; | 
| 904 | 904 | } | 
| 905 | 905 | } | 
| 906 | -		if (!$Connection->checkColumnName('stats_country','stats_airline')) { | |
| 906 | +		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { | |
| 907 | 907 | // Add forsource to airlines | 
| 908 | 908 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 909 | 909 |  			try { | 
| 910 | 910 | $sth = $Connection->db->prepare($query); | 
| 911 | 911 | $sth->execute(); | 
| 912 | -			} catch(PDOException $e) { | |
| 912 | +			} catch (PDOException $e) { | |
| 913 | 913 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; | 
| 914 | 914 | } | 
| 915 | 915 | // Add unique key | 
| @@ -921,36 +921,36 @@ discard block | ||
| 921 | 921 |  			try { | 
| 922 | 922 | $sth = $Connection->db->prepare($query); | 
| 923 | 923 | $sth->execute(); | 
| 924 | -			} catch(PDOException $e) { | |
| 924 | +			} catch (PDOException $e) { | |
| 925 | 925 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; | 
| 926 | 926 | } | 
| 927 | 927 | } | 
| 928 | -		if (!$Connection->checkColumnName('stats_flight','stats_airline')) { | |
| 928 | +		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { | |
| 929 | 929 | // Add forsource to airlines | 
| 930 | 930 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 931 | 931 |  			try { | 
| 932 | 932 | $sth = $Connection->db->prepare($query); | 
| 933 | 933 | $sth->execute(); | 
| 934 | -			} catch(PDOException $e) { | |
| 934 | +			} catch (PDOException $e) { | |
| 935 | 935 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; | 
| 936 | 936 | } | 
| 937 | 937 | } | 
| 938 | -		if (!$Connection->checkColumnName('stats','stats_airline')) { | |
| 938 | +		if (!$Connection->checkColumnName('stats', 'stats_airline')) { | |
| 939 | 939 | // Add forsource to airlines | 
| 940 | 940 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 941 | 941 |  			try { | 
| 942 | 942 | $sth = $Connection->db->prepare($query); | 
| 943 | 943 | $sth->execute(); | 
| 944 | -			} catch(PDOException $e) { | |
| 944 | +			} catch (PDOException $e) { | |
| 945 | 945 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; | 
| 946 | 946 | } | 
| 947 | -			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { | |
| 947 | +			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { | |
| 948 | 948 | // Add unique key | 
| 949 | 949 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; | 
| 950 | 950 |  				try { | 
| 951 | 951 | $sth = $Connection->db->prepare($query); | 
| 952 | 952 | $sth->execute(); | 
| 953 | -				} catch(PDOException $e) { | |
| 953 | +				} catch (PDOException $e) { | |
| 954 | 954 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; | 
| 955 | 955 | } | 
| 956 | 956 |  			} else { | 
| @@ -963,18 +963,18 @@ discard block | ||
| 963 | 963 |  				try { | 
| 964 | 964 | $sth = $Connection->db->prepare($query); | 
| 965 | 965 | $sth->execute(); | 
| 966 | -				} catch(PDOException $e) { | |
| 966 | +				} catch (PDOException $e) { | |
| 967 | 967 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; | 
| 968 | 968 | } | 
| 969 | 969 | } | 
| 970 | 970 | } | 
| 971 | -		if (!$Connection->checkColumnName('stats_registration','stats_airline')) { | |
| 971 | +		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { | |
| 972 | 972 | // Add forsource to airlines | 
| 973 | 973 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 974 | 974 |  			try { | 
| 975 | 975 | $sth = $Connection->db->prepare($query); | 
| 976 | 976 | $sth->execute(); | 
| 977 | -			} catch(PDOException $e) { | |
| 977 | +			} catch (PDOException $e) { | |
| 978 | 978 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; | 
| 979 | 979 | } | 
| 980 | 980 | // Add unique key | 
| @@ -986,17 +986,17 @@ discard block | ||
| 986 | 986 |  			try { | 
| 987 | 987 | $sth = $Connection->db->prepare($query); | 
| 988 | 988 | $sth->execute(); | 
| 989 | -			} catch(PDOException $e) { | |
| 989 | +			} catch (PDOException $e) { | |
| 990 | 990 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; | 
| 991 | 991 | } | 
| 992 | 992 | } | 
| 993 | -		if (!$Connection->checkColumnName('stats_callsign','filter_name')) { | |
| 993 | +		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { | |
| 994 | 994 | // Add forsource to airlines | 
| 995 | 995 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 996 | 996 |  			try { | 
| 997 | 997 | $sth = $Connection->db->prepare($query); | 
| 998 | 998 | $sth->execute(); | 
| 999 | -			} catch(PDOException $e) { | |
| 999 | +			} catch (PDOException $e) { | |
| 1000 | 1000 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; | 
| 1001 | 1001 | } | 
| 1002 | 1002 | // Add unique key | 
| @@ -1008,17 +1008,17 @@ discard block | ||
| 1008 | 1008 |  			try { | 
| 1009 | 1009 | $sth = $Connection->db->prepare($query); | 
| 1010 | 1010 | $sth->execute(); | 
| 1011 | -			} catch(PDOException $e) { | |
| 1011 | +			} catch (PDOException $e) { | |
| 1012 | 1012 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; | 
| 1013 | 1013 | } | 
| 1014 | 1014 | } | 
| 1015 | -		if (!$Connection->checkColumnName('stats_airline','filter_name')) { | |
| 1015 | +		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { | |
| 1016 | 1016 | // Add forsource to airlines | 
| 1017 | 1017 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 1018 | 1018 |  			try { | 
| 1019 | 1019 | $sth = $Connection->db->prepare($query); | 
| 1020 | 1020 | $sth->execute(); | 
| 1021 | -			} catch(PDOException $e) { | |
| 1021 | +			} catch (PDOException $e) { | |
| 1022 | 1022 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; | 
| 1023 | 1023 | } | 
| 1024 | 1024 | // Add unique key | 
| @@ -1030,7 +1030,7 @@ discard block | ||
| 1030 | 1030 |  			try { | 
| 1031 | 1031 | $sth = $Connection->db->prepare($query); | 
| 1032 | 1032 | $sth->execute(); | 
| 1033 | -			} catch(PDOException $e) { | |
| 1033 | +			} catch (PDOException $e) { | |
| 1034 | 1034 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; | 
| 1035 | 1035 | } | 
| 1036 | 1036 | } | 
| @@ -1039,7 +1039,7 @@ discard block | ||
| 1039 | 1039 |  		try { | 
| 1040 | 1040 | $sth = $Connection->db->prepare($query); | 
| 1041 | 1041 | $sth->execute(); | 
| 1042 | -		} catch(PDOException $e) { | |
| 1042 | +		} catch (PDOException $e) { | |
| 1043 | 1043 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1044 | 1044 | } | 
| 1045 | 1045 | return $error; | 
| @@ -1049,13 +1049,13 @@ discard block | ||
| 1049 | 1049 | global $globalDBdriver; | 
| 1050 | 1050 | $Connection = new Connection(); | 
| 1051 | 1051 | $error = ''; | 
| 1052 | -		if (!$Connection->checkColumnName('stats_owner','stats_airline')) { | |
| 1052 | +		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { | |
| 1053 | 1053 | // Add forsource to airlines | 
| 1054 | 1054 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 1055 | 1055 |  			try { | 
| 1056 | 1056 | $sth = $Connection->db->prepare($query); | 
| 1057 | 1057 | $sth->execute(); | 
| 1058 | -			} catch(PDOException $e) { | |
| 1058 | +			} catch (PDOException $e) { | |
| 1059 | 1059 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; | 
| 1060 | 1060 | } | 
| 1061 | 1061 | // Add unique key | 
| @@ -1067,17 +1067,17 @@ discard block | ||
| 1067 | 1067 |  			try { | 
| 1068 | 1068 | $sth = $Connection->db->prepare($query); | 
| 1069 | 1069 | $sth->execute(); | 
| 1070 | -			} catch(PDOException $e) { | |
| 1070 | +			} catch (PDOException $e) { | |
| 1071 | 1071 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; | 
| 1072 | 1072 | } | 
| 1073 | 1073 | } | 
| 1074 | -		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { | |
| 1074 | +		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { | |
| 1075 | 1075 | // Add forsource to airlines | 
| 1076 | 1076 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; | 
| 1077 | 1077 |  			try { | 
| 1078 | 1078 | $sth = $Connection->db->prepare($query); | 
| 1079 | 1079 | $sth->execute(); | 
| 1080 | -			} catch(PDOException $e) { | |
| 1080 | +			} catch (PDOException $e) { | |
| 1081 | 1081 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1082 | 1082 | } | 
| 1083 | 1083 | // Add unique key | 
| @@ -1089,7 +1089,7 @@ discard block | ||
| 1089 | 1089 |  			try { | 
| 1090 | 1090 | $sth = $Connection->db->prepare($query); | 
| 1091 | 1091 | $sth->execute(); | 
| 1092 | -			} catch(PDOException $e) { | |
| 1092 | +			} catch (PDOException $e) { | |
| 1093 | 1093 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1094 | 1094 | } | 
| 1095 | 1095 | } | 
| @@ -1097,7 +1097,7 @@ discard block | ||
| 1097 | 1097 |  		try { | 
| 1098 | 1098 | $sth = $Connection->db->prepare($query); | 
| 1099 | 1099 | $sth->execute(); | 
| 1100 | -		} catch(PDOException $e) { | |
| 1100 | +		} catch (PDOException $e) { | |
| 1101 | 1101 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1102 | 1102 | } | 
| 1103 | 1103 | return $error; | 
| @@ -1107,12 +1107,12 @@ discard block | ||
| 1107 | 1107 | global $globalDBdriver; | 
| 1108 | 1108 | $Connection = new Connection(); | 
| 1109 | 1109 | $error = ''; | 
| 1110 | -		if (!$Connection->checkColumnName('atc','format_source')) { | |
| 1110 | +		if (!$Connection->checkColumnName('atc', 'format_source')) { | |
| 1111 | 1111 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; | 
| 1112 | 1112 |  			try { | 
| 1113 | 1113 | $sth = $Connection->db->prepare($query); | 
| 1114 | 1114 | $sth->execute(); | 
| 1115 | -			} catch(PDOException $e) { | |
| 1115 | +			} catch (PDOException $e) { | |
| 1116 | 1116 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; | 
| 1117 | 1117 | } | 
| 1118 | 1118 | } | 
| @@ -1120,7 +1120,7 @@ discard block | ||
| 1120 | 1120 |  		try { | 
| 1121 | 1121 | $sth = $Connection->db->prepare($query); | 
| 1122 | 1122 | $sth->execute(); | 
| 1123 | -		} catch(PDOException $e) { | |
| 1123 | +		} catch (PDOException $e) { | |
| 1124 | 1124 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1125 | 1125 | } | 
| 1126 | 1126 | return $error; | 
| @@ -1130,13 +1130,13 @@ discard block | ||
| 1130 | 1130 | global $globalDBdriver; | 
| 1131 | 1131 | $Connection = new Connection(); | 
| 1132 | 1132 | $error = ''; | 
| 1133 | -		if (!$Connection->checkColumnName('stats_pilot','format_source')) { | |
| 1133 | +		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { | |
| 1134 | 1134 | // Add forsource to airlines | 
| 1135 | 1135 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; | 
| 1136 | 1136 |  			try { | 
| 1137 | 1137 | $sth = $Connection->db->prepare($query); | 
| 1138 | 1138 | $sth->execute(); | 
| 1139 | -			} catch(PDOException $e) { | |
| 1139 | +			} catch (PDOException $e) { | |
| 1140 | 1140 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1141 | 1141 | } | 
| 1142 | 1142 | // Add unique key | 
| @@ -1148,7 +1148,7 @@ discard block | ||
| 1148 | 1148 |  			try { | 
| 1149 | 1149 | $sth = $Connection->db->prepare($query); | 
| 1150 | 1150 | $sth->execute(); | 
| 1151 | -			} catch(PDOException $e) { | |
| 1151 | +			} catch (PDOException $e) { | |
| 1152 | 1152 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1153 | 1153 | } | 
| 1154 | 1154 | } | 
| @@ -1156,7 +1156,7 @@ discard block | ||
| 1156 | 1156 |  		try { | 
| 1157 | 1157 | $sth = $Connection->db->prepare($query); | 
| 1158 | 1158 | $sth->execute(); | 
| 1159 | -		} catch(PDOException $e) { | |
| 1159 | +		} catch (PDOException $e) { | |
| 1160 | 1160 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1161 | 1161 | } | 
| 1162 | 1162 | return $error; | 
| @@ -1166,23 +1166,23 @@ discard block | ||
| 1166 | 1166 | global $globalDBdriver; | 
| 1167 | 1167 | $Connection = new Connection(); | 
| 1168 | 1168 | $error = ''; | 
| 1169 | -		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { | |
| 1169 | +		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { | |
| 1170 | 1170 | // Add unique key | 
| 1171 | 1171 | $query = "alter table spotter_live add index(latitude,longitude)"; | 
| 1172 | 1172 |  			try { | 
| 1173 | 1173 | $sth = $Connection->db->prepare($query); | 
| 1174 | 1174 | $sth->execute(); | 
| 1175 | -			} catch(PDOException $e) { | |
| 1175 | +			} catch (PDOException $e) { | |
| 1176 | 1176 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; | 
| 1177 | 1177 | } | 
| 1178 | 1178 | } | 
| 1179 | -		if (!$Connection->checkColumnName('aircraft','mfr')) { | |
| 1179 | +		if (!$Connection->checkColumnName('aircraft', 'mfr')) { | |
| 1180 | 1180 | // Add mfr to aircraft | 
| 1181 | 1181 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; | 
| 1182 | 1182 |  			try { | 
| 1183 | 1183 | $sth = $Connection->db->prepare($query); | 
| 1184 | 1184 | $sth->execute(); | 
| 1185 | -			} catch(PDOException $e) { | |
| 1185 | +			} catch (PDOException $e) { | |
| 1186 | 1186 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; | 
| 1187 | 1187 | } | 
| 1188 | 1188 | } | 
| @@ -1198,7 +1198,7 @@ discard block | ||
| 1198 | 1198 |  		try { | 
| 1199 | 1199 | $sth = $Connection->db->prepare($query); | 
| 1200 | 1200 | $sth->execute(); | 
| 1201 | -		} catch(PDOException $e) { | |
| 1201 | +		} catch (PDOException $e) { | |
| 1202 | 1202 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1203 | 1203 | } | 
| 1204 | 1204 | return $error; | 
| @@ -1208,13 +1208,13 @@ discard block | ||
| 1208 | 1208 | global $globalDBdriver; | 
| 1209 | 1209 | $Connection = new Connection(); | 
| 1210 | 1210 | $error = ''; | 
| 1211 | -		if ($Connection->checkColumnName('aircraft','mfr')) { | |
| 1211 | +		if ($Connection->checkColumnName('aircraft', 'mfr')) { | |
| 1212 | 1212 | // drop mfr to aircraft | 
| 1213 | 1213 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; | 
| 1214 | 1214 |  			try { | 
| 1215 | 1215 | $sth = $Connection->db->prepare($query); | 
| 1216 | 1216 | $sth->execute(); | 
| 1217 | -			} catch(PDOException $e) { | |
| 1217 | +			} catch (PDOException $e) { | |
| 1218 | 1218 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; | 
| 1219 | 1219 | } | 
| 1220 | 1220 | } | 
| @@ -1230,7 +1230,7 @@ discard block | ||
| 1230 | 1230 |  		try { | 
| 1231 | 1231 | $sth = $Connection->db->prepare($query); | 
| 1232 | 1232 | $sth->execute(); | 
| 1233 | -		} catch(PDOException $e) { | |
| 1233 | +		} catch (PDOException $e) { | |
| 1234 | 1234 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1235 | 1235 | } | 
| 1236 | 1236 | return $error; | 
| @@ -1240,33 +1240,33 @@ discard block | ||
| 1240 | 1240 | global $globalDBdriver; | 
| 1241 | 1241 | $Connection = new Connection(); | 
| 1242 | 1242 | $error = ''; | 
| 1243 | -		if (!$Connection->indexExists('notam','ref_idx')) { | |
| 1243 | +		if (!$Connection->indexExists('notam', 'ref_idx')) { | |
| 1244 | 1244 | // Add index key | 
| 1245 | 1245 | $query = "create index ref_idx on notam (ref)"; | 
| 1246 | 1246 |  			try { | 
| 1247 | 1247 | $sth = $Connection->db->prepare($query); | 
| 1248 | 1248 | $sth->execute(); | 
| 1249 | -			} catch(PDOException $e) { | |
| 1249 | +			} catch (PDOException $e) { | |
| 1250 | 1250 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; | 
| 1251 | 1251 | } | 
| 1252 | 1252 | } | 
| 1253 | -		if (!$Connection->indexExists('accidents','registration_idx')) { | |
| 1253 | +		if (!$Connection->indexExists('accidents', 'registration_idx')) { | |
| 1254 | 1254 | // Add index key | 
| 1255 | 1255 | $query = "create index registration_idx on accidents (registration)"; | 
| 1256 | 1256 |  			try { | 
| 1257 | 1257 | $sth = $Connection->db->prepare($query); | 
| 1258 | 1258 | $sth->execute(); | 
| 1259 | -			} catch(PDOException $e) { | |
| 1259 | +			} catch (PDOException $e) { | |
| 1260 | 1260 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; | 
| 1261 | 1261 | } | 
| 1262 | 1262 | } | 
| 1263 | -		if (!$Connection->indexExists('accidents','rdts')) { | |
| 1263 | +		if (!$Connection->indexExists('accidents', 'rdts')) { | |
| 1264 | 1264 | // Add index key | 
| 1265 | 1265 | $query = "create index rdts on accidents (registration,date,type,source)"; | 
| 1266 | 1266 |  			try { | 
| 1267 | 1267 | $sth = $Connection->db->prepare($query); | 
| 1268 | 1268 | $sth->execute(); | 
| 1269 | -			} catch(PDOException $e) { | |
| 1269 | +			} catch (PDOException $e) { | |
| 1270 | 1270 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; | 
| 1271 | 1271 | } | 
| 1272 | 1272 | } | 
| @@ -1275,7 +1275,7 @@ discard block | ||
| 1275 | 1275 |  		try { | 
| 1276 | 1276 | $sth = $Connection->db->prepare($query); | 
| 1277 | 1277 | $sth->execute(); | 
| 1278 | -		} catch(PDOException $e) { | |
| 1278 | +		} catch (PDOException $e) { | |
| 1279 | 1279 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1280 | 1280 | } | 
| 1281 | 1281 | return $error; | 
| @@ -1285,23 +1285,23 @@ discard block | ||
| 1285 | 1285 | global $globalDBdriver; | 
| 1286 | 1286 | $Connection = new Connection(); | 
| 1287 | 1287 | $error = ''; | 
| 1288 | -		if (!$Connection->checkColumnName('accidents','airline_name')) { | |
| 1288 | +		if (!$Connection->checkColumnName('accidents', 'airline_name')) { | |
| 1289 | 1289 | // Add airline_name to accidents | 
| 1290 | 1290 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; | 
| 1291 | 1291 |  			try { | 
| 1292 | 1292 | $sth = $Connection->db->prepare($query); | 
| 1293 | 1293 | $sth->execute(); | 
| 1294 | -			} catch(PDOException $e) { | |
| 1294 | +			} catch (PDOException $e) { | |
| 1295 | 1295 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; | 
| 1296 | 1296 | } | 
| 1297 | 1297 | } | 
| 1298 | -		if (!$Connection->checkColumnName('accidents','airline_icao')) { | |
| 1298 | +		if (!$Connection->checkColumnName('accidents', 'airline_icao')) { | |
| 1299 | 1299 | // Add airline_icao to accidents | 
| 1300 | 1300 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; | 
| 1301 | 1301 |  			try { | 
| 1302 | 1302 | $sth = $Connection->db->prepare($query); | 
| 1303 | 1303 | $sth->execute(); | 
| 1304 | -			} catch(PDOException $e) { | |
| 1304 | +			} catch (PDOException $e) { | |
| 1305 | 1305 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; | 
| 1306 | 1306 | } | 
| 1307 | 1307 | } | 
| @@ -1309,7 +1309,7 @@ discard block | ||
| 1309 | 1309 |  		try { | 
| 1310 | 1310 | $sth = $Connection->db->prepare($query); | 
| 1311 | 1311 | $sth->execute(); | 
| 1312 | -		} catch(PDOException $e) { | |
| 1312 | +		} catch (PDOException $e) { | |
| 1313 | 1313 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1314 | 1314 | } | 
| 1315 | 1315 | return $error; | 
| @@ -1319,13 +1319,13 @@ discard block | ||
| 1319 | 1319 | global $globalDBdriver, $globalVATSIM, $globalIVAO; | 
| 1320 | 1320 | $Connection = new Connection(); | 
| 1321 | 1321 | $error = ''; | 
| 1322 | -		if (!$Connection->checkColumnName('airlines','alliance')) { | |
| 1322 | +		if (!$Connection->checkColumnName('airlines', 'alliance')) { | |
| 1323 | 1323 | // Add alliance to airlines | 
| 1324 | 1324 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; | 
| 1325 | 1325 |  			try { | 
| 1326 | 1326 | $sth = $Connection->db->prepare($query); | 
| 1327 | 1327 | $sth->execute(); | 
| 1328 | -			} catch(PDOException $e) { | |
| 1328 | +			} catch (PDOException $e) { | |
| 1329 | 1329 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; | 
| 1330 | 1330 | } | 
| 1331 | 1331 | } | 
| @@ -1352,7 +1352,7 @@ discard block | ||
| 1352 | 1352 |  		try { | 
| 1353 | 1353 | $sth = $Connection->db->prepare($query); | 
| 1354 | 1354 | $sth->execute(); | 
| 1355 | -		} catch(PDOException $e) { | |
| 1355 | +		} catch (PDOException $e) { | |
| 1356 | 1356 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1357 | 1357 | } | 
| 1358 | 1358 | return $error; | 
| @@ -1362,13 +1362,13 @@ discard block | ||
| 1362 | 1362 | global $globalDBdriver, $globalVATSIM, $globalIVAO; | 
| 1363 | 1363 | $Connection = new Connection(); | 
| 1364 | 1364 | $error = ''; | 
| 1365 | -		if (!$Connection->checkColumnName('airlines','ban_eu')) { | |
| 1365 | +		if (!$Connection->checkColumnName('airlines', 'ban_eu')) { | |
| 1366 | 1366 | // Add ban_eu to airlines | 
| 1367 | 1367 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; | 
| 1368 | 1368 |  			try { | 
| 1369 | 1369 | $sth = $Connection->db->prepare($query); | 
| 1370 | 1370 | $sth->execute(); | 
| 1371 | -			} catch(PDOException $e) { | |
| 1371 | +			} catch (PDOException $e) { | |
| 1372 | 1372 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; | 
| 1373 | 1373 | } | 
| 1374 | 1374 | } | 
| @@ -1376,7 +1376,7 @@ discard block | ||
| 1376 | 1376 |  		try { | 
| 1377 | 1377 | $sth = $Connection->db->prepare($query); | 
| 1378 | 1378 | $sth->execute(); | 
| 1379 | -		} catch(PDOException $e) { | |
| 1379 | +		} catch (PDOException $e) { | |
| 1380 | 1380 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1381 | 1381 | } | 
| 1382 | 1382 | return $error; | 
| @@ -1387,19 +1387,19 @@ discard block | ||
| 1387 | 1387 | $Connection = new Connection(); | 
| 1388 | 1388 | $error = ''; | 
| 1389 | 1389 |  		if ($globalDBdriver == 'mysql') { | 
| 1390 | -			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { | |
| 1390 | +			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { | |
| 1391 | 1391 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; | 
| 1392 | 1392 |  				try { | 
| 1393 | 1393 | $sth = $Connection->db->prepare($query); | 
| 1394 | 1394 | $sth->execute(); | 
| 1395 | -				} catch(PDOException $e) { | |
| 1395 | +				} catch (PDOException $e) { | |
| 1396 | 1396 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; | 
| 1397 | 1397 | } | 
| 1398 | 1398 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; | 
| 1399 | 1399 |  				try { | 
| 1400 | 1400 | $sth = $Connection->db->prepare($query); | 
| 1401 | 1401 | $sth->execute(); | 
| 1402 | -				} catch(PDOException $e) { | |
| 1402 | +				} catch (PDOException $e) { | |
| 1403 | 1403 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; | 
| 1404 | 1404 | } | 
| 1405 | 1405 | |
| @@ -1407,7 +1407,7 @@ discard block | ||
| 1407 | 1407 |  				try { | 
| 1408 | 1408 | $sth = $Connection->db->prepare($query); | 
| 1409 | 1409 | $sth->execute(); | 
| 1410 | -				} catch(PDOException $e) { | |
| 1410 | +				} catch (PDOException $e) { | |
| 1411 | 1411 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; | 
| 1412 | 1412 | } | 
| 1413 | 1413 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; | 
| @@ -1458,7 +1458,7 @@ discard block | ||
| 1458 | 1458 |  				try { | 
| 1459 | 1459 | $sth = $Connection->db->prepare($query); | 
| 1460 | 1460 | $sth->execute(); | 
| 1461 | -				} catch(PDOException $e) { | |
| 1461 | +				} catch (PDOException $e) { | |
| 1462 | 1462 | return "error (fix date) : ".$e->getMessage()."\n"; | 
| 1463 | 1463 | } | 
| 1464 | 1464 | } | 
| @@ -1543,7 +1543,7 @@ discard block | ||
| 1543 | 1543 |  		try { | 
| 1544 | 1544 | $sth = $Connection->db->prepare($query); | 
| 1545 | 1545 | $sth->execute(); | 
| 1546 | -		} catch(PDOException $e) { | |
| 1546 | +		} catch (PDOException $e) { | |
| 1547 | 1547 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1548 | 1548 | } | 
| 1549 | 1549 | return $error; | 
| @@ -1552,13 +1552,13 @@ discard block | ||
| 1552 | 1552 | global $globalDBdriver; | 
| 1553 | 1553 | $Connection = new Connection(); | 
| 1554 | 1554 | $error = ''; | 
| 1555 | -		if (!$Connection->indexExists('accidents','type')) { | |
| 1555 | +		if (!$Connection->indexExists('accidents', 'type')) { | |
| 1556 | 1556 | // Add index key | 
| 1557 | 1557 | $query = "create index type on accidents (type,date)"; | 
| 1558 | 1558 |  			try { | 
| 1559 | 1559 | $sth = $Connection->db->prepare($query); | 
| 1560 | 1560 | $sth->execute(); | 
| 1561 | -			} catch(PDOException $e) { | |
| 1561 | +			} catch (PDOException $e) { | |
| 1562 | 1562 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; | 
| 1563 | 1563 | } | 
| 1564 | 1564 | } | 
| @@ -1566,7 +1566,7 @@ discard block | ||
| 1566 | 1566 |  		try { | 
| 1567 | 1567 | $sth = $Connection->db->prepare($query); | 
| 1568 | 1568 | $sth->execute(); | 
| 1569 | -		} catch(PDOException $e) { | |
| 1569 | +		} catch (PDOException $e) { | |
| 1570 | 1570 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1571 | 1571 | } | 
| 1572 | 1572 | return $error; | 
| @@ -1576,12 +1576,12 @@ discard block | ||
| 1576 | 1576 | global $globalDBdriver; | 
| 1577 | 1577 | $Connection = new Connection(); | 
| 1578 | 1578 | $error = ''; | 
| 1579 | -		if (!$Connection->checkColumnName('aircraft_modes','source_type')) { | |
| 1579 | +		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { | |
| 1580 | 1580 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; | 
| 1581 | 1581 |  			try { | 
| 1582 | 1582 | $sth = $Connection->db->prepare($query); | 
| 1583 | 1583 | $sth->execute(); | 
| 1584 | -			} catch(PDOException $e) { | |
| 1584 | +			} catch (PDOException $e) { | |
| 1585 | 1585 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; | 
| 1586 | 1586 | } | 
| 1587 | 1587 | } | 
| @@ -1647,7 +1647,7 @@ discard block | ||
| 1647 | 1647 |  		try { | 
| 1648 | 1648 | $sth = $Connection->db->prepare($query); | 
| 1649 | 1649 | $sth->execute(); | 
| 1650 | -		} catch(PDOException $e) { | |
| 1650 | +		} catch (PDOException $e) { | |
| 1651 | 1651 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1652 | 1652 | } | 
| 1653 | 1653 | return $error; | 
| @@ -1699,7 +1699,7 @@ discard block | ||
| 1699 | 1699 |  			try { | 
| 1700 | 1700 | $sth = $Connection->db->prepare($query); | 
| 1701 | 1701 | $sth->execute(); | 
| 1702 | -			} catch(PDOException $e) { | |
| 1702 | +			} catch (PDOException $e) { | |
| 1703 | 1703 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; | 
| 1704 | 1704 | } | 
| 1705 | 1705 | $row = $sth->fetch(PDO::FETCH_ASSOC); | 
| @@ -1708,18 +1708,18 @@ discard block | ||
| 1708 | 1708 |  				try { | 
| 1709 | 1709 | $sth = $Connection->db->prepare($query); | 
| 1710 | 1710 | $sth->execute(); | 
| 1711 | -				} catch(PDOException $e) { | |
| 1711 | +				} catch (PDOException $e) { | |
| 1712 | 1712 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; | 
| 1713 | 1713 | } | 
| 1714 | 1714 | } | 
| 1715 | 1715 | } | 
| 1716 | -		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { | |
| 1716 | +		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { | |
| 1717 | 1717 | // Add index key | 
| 1718 | 1718 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; | 
| 1719 | 1719 |  			try { | 
| 1720 | 1720 | $sth = $Connection->db->prepare($query); | 
| 1721 | 1721 | $sth->execute(); | 
| 1722 | -			} catch(PDOException $e) { | |
| 1722 | +			} catch (PDOException $e) { | |
| 1723 | 1723 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; | 
| 1724 | 1724 | } | 
| 1725 | 1725 | } | 
| @@ -1727,7 +1727,7 @@ discard block | ||
| 1727 | 1727 |  		try { | 
| 1728 | 1728 | $sth = $Connection->db->prepare($query); | 
| 1729 | 1729 | $sth->execute(); | 
| 1730 | -		} catch(PDOException $e) { | |
| 1730 | +		} catch (PDOException $e) { | |
| 1731 | 1731 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1732 | 1732 | } | 
| 1733 | 1733 | return $error; | 
| @@ -1738,148 +1738,148 @@ discard block | ||
| 1738 | 1738 | $Connection = new Connection(); | 
| 1739 | 1739 | $error = ''; | 
| 1740 | 1740 |  		if ($globalDBdriver == 'mysql') { | 
| 1741 | -			if (!$Connection->checkColumnName('marine_output','type_id')) { | |
| 1741 | +			if (!$Connection->checkColumnName('marine_output', 'type_id')) { | |
| 1742 | 1742 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; | 
| 1743 | 1743 |  				try { | 
| 1744 | 1744 | $sth = $Connection->db->prepare($query); | 
| 1745 | 1745 | $sth->execute(); | 
| 1746 | -				} catch(PDOException $e) { | |
| 1746 | +				} catch (PDOException $e) { | |
| 1747 | 1747 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; | 
| 1748 | 1748 | } | 
| 1749 | 1749 | } | 
| 1750 | -			if (!$Connection->checkColumnName('marine_live','type_id')) { | |
| 1750 | +			if (!$Connection->checkColumnName('marine_live', 'type_id')) { | |
| 1751 | 1751 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; | 
| 1752 | 1752 |  				try { | 
| 1753 | 1753 | $sth = $Connection->db->prepare($query); | 
| 1754 | 1754 | $sth->execute(); | 
| 1755 | -				} catch(PDOException $e) { | |
| 1755 | +				} catch (PDOException $e) { | |
| 1756 | 1756 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; | 
| 1757 | 1757 | } | 
| 1758 | 1758 | } | 
| 1759 | -			if (!$Connection->checkColumnName('marine_archive','type_id')) { | |
| 1759 | +			if (!$Connection->checkColumnName('marine_archive', 'type_id')) { | |
| 1760 | 1760 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; | 
| 1761 | 1761 |  				try { | 
| 1762 | 1762 | $sth = $Connection->db->prepare($query); | 
| 1763 | 1763 | $sth->execute(); | 
| 1764 | -				} catch(PDOException $e) { | |
| 1764 | +				} catch (PDOException $e) { | |
| 1765 | 1765 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; | 
| 1766 | 1766 | } | 
| 1767 | 1767 | } | 
| 1768 | -			if (!$Connection->checkColumnName('marine_archive_output','type_id')) { | |
| 1768 | +			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { | |
| 1769 | 1769 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; | 
| 1770 | 1770 |  				try { | 
| 1771 | 1771 | $sth = $Connection->db->prepare($query); | 
| 1772 | 1772 | $sth->execute(); | 
| 1773 | -				} catch(PDOException $e) { | |
| 1773 | +				} catch (PDOException $e) { | |
| 1774 | 1774 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 1775 | 1775 | } | 
| 1776 | 1776 | } | 
| 1777 | -			if (!$Connection->checkColumnName('marine_output','status_id')) { | |
| 1777 | +			if (!$Connection->checkColumnName('marine_output', 'status_id')) { | |
| 1778 | 1778 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; | 
| 1779 | 1779 |  				try { | 
| 1780 | 1780 | $sth = $Connection->db->prepare($query); | 
| 1781 | 1781 | $sth->execute(); | 
| 1782 | -				} catch(PDOException $e) { | |
| 1782 | +				} catch (PDOException $e) { | |
| 1783 | 1783 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; | 
| 1784 | 1784 | } | 
| 1785 | 1785 | } | 
| 1786 | -			if (!$Connection->checkColumnName('marine_live','status_id')) { | |
| 1786 | +			if (!$Connection->checkColumnName('marine_live', 'status_id')) { | |
| 1787 | 1787 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; | 
| 1788 | 1788 |  				try { | 
| 1789 | 1789 | $sth = $Connection->db->prepare($query); | 
| 1790 | 1790 | $sth->execute(); | 
| 1791 | -				} catch(PDOException $e) { | |
| 1791 | +				} catch (PDOException $e) { | |
| 1792 | 1792 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; | 
| 1793 | 1793 | } | 
| 1794 | 1794 | } | 
| 1795 | -			if (!$Connection->checkColumnName('marine_archive','status_id')) { | |
| 1795 | +			if (!$Connection->checkColumnName('marine_archive', 'status_id')) { | |
| 1796 | 1796 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; | 
| 1797 | 1797 |  				try { | 
| 1798 | 1798 | $sth = $Connection->db->prepare($query); | 
| 1799 | 1799 | $sth->execute(); | 
| 1800 | -				} catch(PDOException $e) { | |
| 1800 | +				} catch (PDOException $e) { | |
| 1801 | 1801 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; | 
| 1802 | 1802 | } | 
| 1803 | 1803 | } | 
| 1804 | -			if (!$Connection->checkColumnName('marine_archive_output','status_id')) { | |
| 1804 | +			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { | |
| 1805 | 1805 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; | 
| 1806 | 1806 |  				try { | 
| 1807 | 1807 | $sth = $Connection->db->prepare($query); | 
| 1808 | 1808 | $sth->execute(); | 
| 1809 | -				} catch(PDOException $e) { | |
| 1809 | +				} catch (PDOException $e) { | |
| 1810 | 1810 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 1811 | 1811 | } | 
| 1812 | 1812 | } | 
| 1813 | 1813 |  		} else { | 
| 1814 | -			if (!$Connection->checkColumnName('marine_output','type_id')) { | |
| 1814 | +			if (!$Connection->checkColumnName('marine_output', 'type_id')) { | |
| 1815 | 1815 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; | 
| 1816 | 1816 |  				try { | 
| 1817 | 1817 | $sth = $Connection->db->prepare($query); | 
| 1818 | 1818 | $sth->execute(); | 
| 1819 | -				} catch(PDOException $e) { | |
| 1819 | +				} catch (PDOException $e) { | |
| 1820 | 1820 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; | 
| 1821 | 1821 | } | 
| 1822 | 1822 | } | 
| 1823 | -			if (!$Connection->checkColumnName('marine_live','type_id')) { | |
| 1823 | +			if (!$Connection->checkColumnName('marine_live', 'type_id')) { | |
| 1824 | 1824 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; | 
| 1825 | 1825 |  				try { | 
| 1826 | 1826 | $sth = $Connection->db->prepare($query); | 
| 1827 | 1827 | $sth->execute(); | 
| 1828 | -				} catch(PDOException $e) { | |
| 1828 | +				} catch (PDOException $e) { | |
| 1829 | 1829 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; | 
| 1830 | 1830 | } | 
| 1831 | 1831 | } | 
| 1832 | -			if (!$Connection->checkColumnName('marine_archive','type_id')) { | |
| 1832 | +			if (!$Connection->checkColumnName('marine_archive', 'type_id')) { | |
| 1833 | 1833 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; | 
| 1834 | 1834 |  				try { | 
| 1835 | 1835 | $sth = $Connection->db->prepare($query); | 
| 1836 | 1836 | $sth->execute(); | 
| 1837 | -				} catch(PDOException $e) { | |
| 1837 | +				} catch (PDOException $e) { | |
| 1838 | 1838 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; | 
| 1839 | 1839 | } | 
| 1840 | 1840 | } | 
| 1841 | -			if (!$Connection->checkColumnName('marine_archive_output','type_id')) { | |
| 1841 | +			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { | |
| 1842 | 1842 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; | 
| 1843 | 1843 |  				try { | 
| 1844 | 1844 | $sth = $Connection->db->prepare($query); | 
| 1845 | 1845 | $sth->execute(); | 
| 1846 | -				} catch(PDOException $e) { | |
| 1846 | +				} catch (PDOException $e) { | |
| 1847 | 1847 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 1848 | 1848 | } | 
| 1849 | 1849 | } | 
| 1850 | -			if (!$Connection->checkColumnName('marine_output','status_id')) { | |
| 1850 | +			if (!$Connection->checkColumnName('marine_output', 'status_id')) { | |
| 1851 | 1851 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; | 
| 1852 | 1852 |  				try { | 
| 1853 | 1853 | $sth = $Connection->db->prepare($query); | 
| 1854 | 1854 | $sth->execute(); | 
| 1855 | -				} catch(PDOException $e) { | |
| 1855 | +				} catch (PDOException $e) { | |
| 1856 | 1856 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; | 
| 1857 | 1857 | } | 
| 1858 | 1858 | } | 
| 1859 | -			if (!$Connection->checkColumnName('marine_live','status_id')) { | |
| 1859 | +			if (!$Connection->checkColumnName('marine_live', 'status_id')) { | |
| 1860 | 1860 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; | 
| 1861 | 1861 |  				try { | 
| 1862 | 1862 | $sth = $Connection->db->prepare($query); | 
| 1863 | 1863 | $sth->execute(); | 
| 1864 | -				} catch(PDOException $e) { | |
| 1864 | +				} catch (PDOException $e) { | |
| 1865 | 1865 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; | 
| 1866 | 1866 | } | 
| 1867 | 1867 | } | 
| 1868 | -			if (!$Connection->checkColumnName('marine_archive','status_id')) { | |
| 1868 | +			if (!$Connection->checkColumnName('marine_archive', 'status_id')) { | |
| 1869 | 1869 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; | 
| 1870 | 1870 |  				try { | 
| 1871 | 1871 | $sth = $Connection->db->prepare($query); | 
| 1872 | 1872 | $sth->execute(); | 
| 1873 | -				} catch(PDOException $e) { | |
| 1873 | +				} catch (PDOException $e) { | |
| 1874 | 1874 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; | 
| 1875 | 1875 | } | 
| 1876 | 1876 | } | 
| 1877 | -			if (!$Connection->checkColumnName('marine_archive_output','status_id')) { | |
| 1877 | +			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { | |
| 1878 | 1878 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; | 
| 1879 | 1879 |  				try { | 
| 1880 | 1880 | $sth = $Connection->db->prepare($query); | 
| 1881 | 1881 | $sth->execute(); | 
| 1882 | -				} catch(PDOException $e) { | |
| 1882 | +				} catch (PDOException $e) { | |
| 1883 | 1883 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 1884 | 1884 | } | 
| 1885 | 1885 | } | 
| @@ -1888,7 +1888,7 @@ discard block | ||
| 1888 | 1888 |  		try { | 
| 1889 | 1889 | $sth = $Connection->db->prepare($query); | 
| 1890 | 1890 | $sth->execute(); | 
| 1891 | -		} catch(PDOException $e) { | |
| 1891 | +		} catch (PDOException $e) { | |
| 1892 | 1892 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1893 | 1893 | } | 
| 1894 | 1894 | return $error; | 
| @@ -1903,14 +1903,14 @@ discard block | ||
| 1903 | 1903 |  			try { | 
| 1904 | 1904 | $sth = $Connection->db->prepare($query); | 
| 1905 | 1905 | $sth->execute(); | 
| 1906 | -			} catch(PDOException $e) { | |
| 1906 | +			} catch (PDOException $e) { | |
| 1907 | 1907 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1908 | 1908 | } | 
| 1909 | 1909 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; | 
| 1910 | 1910 |  			try { | 
| 1911 | 1911 | $sth = $Connection->db->prepare($query); | 
| 1912 | 1912 | $sth->execute(); | 
| 1913 | -			} catch(PDOException $e) { | |
| 1913 | +			} catch (PDOException $e) { | |
| 1914 | 1914 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; | 
| 1915 | 1915 | } | 
| 1916 | 1916 |  		} else { | 
| @@ -1918,14 +1918,14 @@ discard block | ||
| 1918 | 1918 |  			try { | 
| 1919 | 1919 | $sth = $Connection->db->prepare($query); | 
| 1920 | 1920 | $sth->execute(); | 
| 1921 | -			} catch(PDOException $e) { | |
| 1921 | +			} catch (PDOException $e) { | |
| 1922 | 1922 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; | 
| 1923 | 1923 | } | 
| 1924 | 1924 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; | 
| 1925 | 1925 |  			try { | 
| 1926 | 1926 | $sth = $Connection->db->prepare($query); | 
| 1927 | 1927 | $sth->execute(); | 
| 1928 | -			} catch(PDOException $e) { | |
| 1928 | +			} catch (PDOException $e) { | |
| 1929 | 1929 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; | 
| 1930 | 1930 | } | 
| 1931 | 1931 | } | 
| @@ -1933,7 +1933,7 @@ discard block | ||
| 1933 | 1933 |  		try { | 
| 1934 | 1934 | $sth = $Connection->db->prepare($query); | 
| 1935 | 1935 | $sth->execute(); | 
| 1936 | -		} catch(PDOException $e) { | |
| 1936 | +		} catch (PDOException $e) { | |
| 1937 | 1937 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1938 | 1938 | } | 
| 1939 | 1939 | return $error; | 
| @@ -1943,32 +1943,32 @@ discard block | ||
| 1943 | 1943 | global $globalDBdriver; | 
| 1944 | 1944 | $Connection = new Connection(); | 
| 1945 | 1945 | $error = ''; | 
| 1946 | -		if (!$Connection->checkColumnName('source_location','last_seen')) { | |
| 1946 | +		if (!$Connection->checkColumnName('source_location', 'last_seen')) { | |
| 1947 | 1947 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; | 
| 1948 | 1948 |  			try { | 
| 1949 | 1949 | $sth = $Connection->db->prepare($query); | 
| 1950 | 1950 | $sth->execute(); | 
| 1951 | -			} catch(PDOException $e) { | |
| 1951 | +			} catch (PDOException $e) { | |
| 1952 | 1952 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; | 
| 1953 | 1953 | } | 
| 1954 | 1954 | } | 
| 1955 | 1955 |  		if ($globalDBdriver == 'mysql') { | 
| 1956 | -			if (!$Connection->checkColumnName('source_location','location_id')) { | |
| 1956 | +			if (!$Connection->checkColumnName('source_location', 'location_id')) { | |
| 1957 | 1957 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; | 
| 1958 | 1958 |  				try { | 
| 1959 | 1959 | $sth = $Connection->db->prepare($query); | 
| 1960 | 1960 | $sth->execute(); | 
| 1961 | -				} catch(PDOException $e) { | |
| 1961 | +				} catch (PDOException $e) { | |
| 1962 | 1962 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; | 
| 1963 | 1963 | } | 
| 1964 | 1964 | } | 
| 1965 | 1965 |  		} else { | 
| 1966 | -			if (!$Connection->checkColumnName('source_location','location_id')) { | |
| 1966 | +			if (!$Connection->checkColumnName('source_location', 'location_id')) { | |
| 1967 | 1967 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; | 
| 1968 | 1968 |  				try { | 
| 1969 | 1969 | $sth = $Connection->db->prepare($query); | 
| 1970 | 1970 | $sth->execute(); | 
| 1971 | -				} catch(PDOException $e) { | |
| 1971 | +				} catch (PDOException $e) { | |
| 1972 | 1972 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; | 
| 1973 | 1973 | } | 
| 1974 | 1974 | } | 
| @@ -1977,7 +1977,7 @@ discard block | ||
| 1977 | 1977 |  		try { | 
| 1978 | 1978 | $sth = $Connection->db->prepare($query); | 
| 1979 | 1979 | $sth->execute(); | 
| 1980 | -		} catch(PDOException $e) { | |
| 1980 | +		} catch (PDOException $e) { | |
| 1981 | 1981 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 1982 | 1982 | } | 
| 1983 | 1983 | return $error; | 
| @@ -1987,12 +1987,12 @@ discard block | ||
| 1987 | 1987 | global $globalDBdriver; | 
| 1988 | 1988 | $Connection = new Connection(); | 
| 1989 | 1989 | $error = ''; | 
| 1990 | -		if (!$Connection->checkColumnName('source_location','description')) { | |
| 1990 | +		if (!$Connection->checkColumnName('source_location', 'description')) { | |
| 1991 | 1991 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; | 
| 1992 | 1992 |  			try { | 
| 1993 | 1993 | $sth = $Connection->db->prepare($query); | 
| 1994 | 1994 | $sth->execute(); | 
| 1995 | -			} catch(PDOException $e) { | |
| 1995 | +			} catch (PDOException $e) { | |
| 1996 | 1996 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; | 
| 1997 | 1997 | } | 
| 1998 | 1998 | } | 
| @@ -2000,7 +2000,7 @@ discard block | ||
| 2000 | 2000 |  		try { | 
| 2001 | 2001 | $sth = $Connection->db->prepare($query); | 
| 2002 | 2002 | $sth->execute(); | 
| 2003 | -		} catch(PDOException $e) { | |
| 2003 | +		} catch (PDOException $e) { | |
| 2004 | 2004 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2005 | 2005 | } | 
| 2006 | 2006 | return $error; | 
| @@ -2010,39 +2010,39 @@ discard block | ||
| 2010 | 2010 | global $globalDBdriver; | 
| 2011 | 2011 | $Connection = new Connection(); | 
| 2012 | 2012 | $error = ''; | 
| 2013 | -		if (!$Connection->checkColumnName('spotter_live','real_altitude')) { | |
| 2013 | +		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { | |
| 2014 | 2014 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; | 
| 2015 | 2015 |  			try { | 
| 2016 | 2016 | $sth = $Connection->db->prepare($query); | 
| 2017 | 2017 | $sth->execute(); | 
| 2018 | -			} catch(PDOException $e) { | |
| 2018 | +			} catch (PDOException $e) { | |
| 2019 | 2019 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; | 
| 2020 | 2020 | } | 
| 2021 | 2021 | } | 
| 2022 | -		if (!$Connection->checkColumnName('spotter_output','real_altitude')) { | |
| 2022 | +		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { | |
| 2023 | 2023 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; | 
| 2024 | 2024 |  			try { | 
| 2025 | 2025 | $sth = $Connection->db->prepare($query); | 
| 2026 | 2026 | $sth->execute(); | 
| 2027 | -			} catch(PDOException $e) { | |
| 2027 | +			} catch (PDOException $e) { | |
| 2028 | 2028 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; | 
| 2029 | 2029 | } | 
| 2030 | 2030 | } | 
| 2031 | -		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { | |
| 2031 | +		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { | |
| 2032 | 2032 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; | 
| 2033 | 2033 |  			try { | 
| 2034 | 2034 | $sth = $Connection->db->prepare($query); | 
| 2035 | 2035 | $sth->execute(); | 
| 2036 | -			} catch(PDOException $e) { | |
| 2036 | +			} catch (PDOException $e) { | |
| 2037 | 2037 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; | 
| 2038 | 2038 | } | 
| 2039 | 2039 | } | 
| 2040 | -		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { | |
| 2040 | +		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { | |
| 2041 | 2041 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; | 
| 2042 | 2042 |  			try { | 
| 2043 | 2043 | $sth = $Connection->db->prepare($query); | 
| 2044 | 2044 | $sth->execute(); | 
| 2045 | -			} catch(PDOException $e) { | |
| 2045 | +			} catch (PDOException $e) { | |
| 2046 | 2046 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; | 
| 2047 | 2047 | } | 
| 2048 | 2048 | } | 
| @@ -2050,7 +2050,7 @@ discard block | ||
| 2050 | 2050 |  		try { | 
| 2051 | 2051 | $sth = $Connection->db->prepare($query); | 
| 2052 | 2052 | $sth->execute(); | 
| 2053 | -		} catch(PDOException $e) { | |
| 2053 | +		} catch (PDOException $e) { | |
| 2054 | 2054 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2055 | 2055 | } | 
| 2056 | 2056 | return $error; | 
| @@ -2072,14 +2072,14 @@ discard block | ||
| 2072 | 2072 |  		try { | 
| 2073 | 2073 | $sth = $Connection->db->prepare($query); | 
| 2074 | 2074 | $sth->execute(); | 
| 2075 | -		} catch(PDOException $e) { | |
| 2075 | +		} catch (PDOException $e) { | |
| 2076 | 2076 | return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n"; | 
| 2077 | 2077 | } | 
| 2078 | 2078 | $query = "UPDATE config SET value = '44' WHERE name = 'schema_version'"; | 
| 2079 | 2079 |  		try { | 
| 2080 | 2080 | $sth = $Connection->db->prepare($query); | 
| 2081 | 2081 | $sth->execute(); | 
| 2082 | -		} catch(PDOException $e) { | |
| 2082 | +		} catch (PDOException $e) { | |
| 2083 | 2083 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2084 | 2084 | } | 
| 2085 | 2085 | return $error; | 
| @@ -2120,7 +2120,7 @@ discard block | ||
| 2120 | 2120 |  		try { | 
| 2121 | 2121 | $sth = $Connection->db->prepare($query); | 
| 2122 | 2122 | $sth->execute(); | 
| 2123 | -		} catch(PDOException $e) { | |
| 2123 | +		} catch (PDOException $e) { | |
| 2124 | 2124 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2125 | 2125 | } | 
| 2126 | 2126 | return $error; | 
| @@ -2143,7 +2143,7 @@ discard block | ||
| 2143 | 2143 |  		try { | 
| 2144 | 2144 | $sth = $Connection->db->prepare($query); | 
| 2145 | 2145 | $sth->execute(); | 
| 2146 | -		} catch(PDOException $e) { | |
| 2146 | +		} catch (PDOException $e) { | |
| 2147 | 2147 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2148 | 2148 | } | 
| 2149 | 2149 | return $error; | 
| @@ -2193,7 +2193,7 @@ discard block | ||
| 2193 | 2193 |  		try { | 
| 2194 | 2194 | $sth = $Connection->db->prepare($query); | 
| 2195 | 2195 | $sth->execute(); | 
| 2196 | -		} catch(PDOException $e) { | |
| 2196 | +		} catch (PDOException $e) { | |
| 2197 | 2197 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2198 | 2198 | } | 
| 2199 | 2199 | return $error; | 
| @@ -2216,7 +2216,7 @@ discard block | ||
| 2216 | 2216 |  		try { | 
| 2217 | 2217 | $sth = $Connection->db->prepare($query); | 
| 2218 | 2218 | $sth->execute(); | 
| 2219 | -		} catch(PDOException $e) { | |
| 2219 | +		} catch (PDOException $e) { | |
| 2220 | 2220 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2221 | 2221 | } | 
| 2222 | 2222 | return $error; | 
| @@ -2239,7 +2239,7 @@ discard block | ||
| 2239 | 2239 |  		try { | 
| 2240 | 2240 | $sth = $Connection->db->prepare($query); | 
| 2241 | 2241 | $sth->execute(); | 
| 2242 | -		} catch(PDOException $e) { | |
| 2242 | +		} catch (PDOException $e) { | |
| 2243 | 2243 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2244 | 2244 | } | 
| 2245 | 2245 | return $error; | 
| @@ -2260,7 +2260,7 @@ discard block | ||
| 2260 | 2260 |  		try { | 
| 2261 | 2261 | $sth = $Connection->db->prepare($query); | 
| 2262 | 2262 | $sth->execute(); | 
| 2263 | -		} catch(PDOException $e) { | |
| 2263 | +		} catch (PDOException $e) { | |
| 2264 | 2264 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2265 | 2265 | } | 
| 2266 | 2266 | return $error; | 
| @@ -2285,7 +2285,7 @@ discard block | ||
| 2285 | 2285 |  		try { | 
| 2286 | 2286 | $sth = $Connection->db->prepare($query); | 
| 2287 | 2287 | $sth->execute(); | 
| 2288 | -		} catch(PDOException $e) { | |
| 2288 | +		} catch (PDOException $e) { | |
| 2289 | 2289 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2290 | 2290 | } | 
| 2291 | 2291 | return $error; | 
| @@ -2295,39 +2295,39 @@ discard block | ||
| 2295 | 2295 | global $globalDBdriver; | 
| 2296 | 2296 | $Connection = new Connection(); | 
| 2297 | 2297 | $error = ''; | 
| 2298 | -		if (!$Connection->checkColumnName('marine_live','captain_name')) { | |
| 2298 | +		if (!$Connection->checkColumnName('marine_live', 'captain_name')) { | |
| 2299 | 2299 | $query = "ALTER TABLE marine_live ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL"; | 
| 2300 | 2300 |  			try { | 
| 2301 | 2301 | $sth = $Connection->db->prepare($query); | 
| 2302 | 2302 | $sth->execute(); | 
| 2303 | -			} catch(PDOException $e) { | |
| 2303 | +			} catch (PDOException $e) { | |
| 2304 | 2304 | return "error (add columns captain and race in marine_live) : ".$e->getMessage()."\n"; | 
| 2305 | 2305 | } | 
| 2306 | 2306 | } | 
| 2307 | -		if (!$Connection->checkColumnName('marine_output','captain_name')) { | |
| 2307 | +		if (!$Connection->checkColumnName('marine_output', 'captain_name')) { | |
| 2308 | 2308 | $query = "ALTER TABLE marine_output ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL"; | 
| 2309 | 2309 |  			try { | 
| 2310 | 2310 | $sth = $Connection->db->prepare($query); | 
| 2311 | 2311 | $sth->execute(); | 
| 2312 | -			} catch(PDOException $e) { | |
| 2312 | +			} catch (PDOException $e) { | |
| 2313 | 2313 | return "error (add columns captain and race in marine_output) : ".$e->getMessage()."\n"; | 
| 2314 | 2314 | } | 
| 2315 | 2315 | } | 
| 2316 | -		if (!$Connection->checkColumnName('marine_archive','captain_name')) { | |
| 2316 | +		if (!$Connection->checkColumnName('marine_archive', 'captain_name')) { | |
| 2317 | 2317 | $query = "ALTER TABLE marine_archive ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL"; | 
| 2318 | 2318 |  			try { | 
| 2319 | 2319 | $sth = $Connection->db->prepare($query); | 
| 2320 | 2320 | $sth->execute(); | 
| 2321 | -			} catch(PDOException $e) { | |
| 2321 | +			} catch (PDOException $e) { | |
| 2322 | 2322 | return "error (add columns captain and race in marine_archive) : ".$e->getMessage()."\n"; | 
| 2323 | 2323 | } | 
| 2324 | 2324 | } | 
| 2325 | -		if (!$Connection->checkColumnName('marine_archive_output','captain_name')) { | |
| 2325 | +		if (!$Connection->checkColumnName('marine_archive_output', 'captain_name')) { | |
| 2326 | 2326 | $query = "ALTER TABLE marine_archive_output ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL"; | 
| 2327 | 2327 |  			try { | 
| 2328 | 2328 | $sth = $Connection->db->prepare($query); | 
| 2329 | 2329 | $sth->execute(); | 
| 2330 | -			} catch(PDOException $e) { | |
| 2330 | +			} catch (PDOException $e) { | |
| 2331 | 2331 | return "error (add columns captain and race in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 2332 | 2332 | } | 
| 2333 | 2333 | } | 
| @@ -2335,7 +2335,7 @@ discard block | ||
| 2335 | 2335 |  		try { | 
| 2336 | 2336 | $sth = $Connection->db->prepare($query); | 
| 2337 | 2337 | $sth->execute(); | 
| 2338 | -		} catch(PDOException $e) { | |
| 2338 | +		} catch (PDOException $e) { | |
| 2339 | 2339 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2340 | 2340 | } | 
| 2341 | 2341 | return $error; | 
| @@ -2353,14 +2353,14 @@ discard block | ||
| 2353 | 2353 |  		try { | 
| 2354 | 2354 | $sth = $Connection->db->prepare($query); | 
| 2355 | 2355 | $sth->execute(); | 
| 2356 | -		} catch(PDOException $e) { | |
| 2356 | +		} catch (PDOException $e) { | |
| 2357 | 2357 | return "error (modify column ground_speede in marine_*) : ".$e->getMessage()."\n"; | 
| 2358 | 2358 | } | 
| 2359 | 2359 | $query = "UPDATE config SET value = '53' WHERE name = 'schema_version'"; | 
| 2360 | 2360 |  		try { | 
| 2361 | 2361 | $sth = $Connection->db->prepare($query); | 
| 2362 | 2362 | $sth->execute(); | 
| 2363 | -		} catch(PDOException $e) { | |
| 2363 | +		} catch (PDOException $e) { | |
| 2364 | 2364 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2365 | 2365 | } | 
| 2366 | 2366 | return $error; | 
| @@ -2370,25 +2370,25 @@ discard block | ||
| 2370 | 2370 | global $globalDBdriver; | 
| 2371 | 2371 | $Connection = new Connection(); | 
| 2372 | 2372 | $error = ''; | 
| 2373 | -		if (!$Connection->checkColumnName('marine_live','distance')) { | |
| 2373 | +		if (!$Connection->checkColumnName('marine_live', 'distance')) { | |
| 2374 | 2374 | $query = "ALTER TABLE marine_live ADD COLUMN distance float DEFAULT NULL"; | 
| 2375 | 2375 |  			try { | 
| 2376 | 2376 | $sth = $Connection->db->prepare($query); | 
| 2377 | 2377 | $sth->execute(); | 
| 2378 | -			} catch(PDOException $e) { | |
| 2378 | +			} catch (PDOException $e) { | |
| 2379 | 2379 | return "error (add columns distance in marine_live) : ".$e->getMessage()."\n"; | 
| 2380 | 2380 | } | 
| 2381 | 2381 | } | 
| 2382 | -		if (!$Connection->checkColumnName('marine_live','race_time')) { | |
| 2382 | +		if (!$Connection->checkColumnName('marine_live', 'race_time')) { | |
| 2383 | 2383 | $query = "ALTER TABLE marine_live ADD COLUMN race_time float DEFAULT NULL"; | 
| 2384 | 2384 |  			try { | 
| 2385 | 2385 | $sth = $Connection->db->prepare($query); | 
| 2386 | 2386 | $sth->execute(); | 
| 2387 | -			} catch(PDOException $e) { | |
| 2387 | +			} catch (PDOException $e) { | |
| 2388 | 2388 | return "error (add columns race_time in marine_live) : ".$e->getMessage()."\n"; | 
| 2389 | 2389 | } | 
| 2390 | 2390 | } | 
| 2391 | -		if (!$Connection->checkColumnName('marine_live','race_rank')) { | |
| 2391 | +		if (!$Connection->checkColumnName('marine_live', 'race_rank')) { | |
| 2392 | 2392 |  			if ($globalDBdriver == 'mysql') { | 
| 2393 | 2393 | $query = "ALTER TABLE marine_live ADD COLUMN race_rank int(11) DEFAULT NULL"; | 
| 2394 | 2394 |  			} else { | 
| @@ -2397,29 +2397,29 @@ discard block | ||
| 2397 | 2397 |  			try { | 
| 2398 | 2398 | $sth = $Connection->db->prepare($query); | 
| 2399 | 2399 | $sth->execute(); | 
| 2400 | -			} catch(PDOException $e) { | |
| 2400 | +			} catch (PDOException $e) { | |
| 2401 | 2401 | return "error (add columns race_rank in marine_live) : ".$e->getMessage()."\n"; | 
| 2402 | 2402 | } | 
| 2403 | 2403 | } | 
| 2404 | -		if (!$Connection->checkColumnName('marine_output','distance')) { | |
| 2404 | +		if (!$Connection->checkColumnName('marine_output', 'distance')) { | |
| 2405 | 2405 | $query = "ALTER TABLE marine_output ADD COLUMN distance float DEFAULT NULL"; | 
| 2406 | 2406 |  			try { | 
| 2407 | 2407 | $sth = $Connection->db->prepare($query); | 
| 2408 | 2408 | $sth->execute(); | 
| 2409 | -			} catch(PDOException $e) { | |
| 2409 | +			} catch (PDOException $e) { | |
| 2410 | 2410 | return "error (add columns distance in marine_output) : ".$e->getMessage()."\n"; | 
| 2411 | 2411 | } | 
| 2412 | 2412 | } | 
| 2413 | -		if (!$Connection->checkColumnName('marine_output','race_time')) { | |
| 2413 | +		if (!$Connection->checkColumnName('marine_output', 'race_time')) { | |
| 2414 | 2414 | $query = "ALTER TABLE marine_output ADD COLUMN race_time float DEFAULT NULL"; | 
| 2415 | 2415 |  			try { | 
| 2416 | 2416 | $sth = $Connection->db->prepare($query); | 
| 2417 | 2417 | $sth->execute(); | 
| 2418 | -			} catch(PDOException $e) { | |
| 2418 | +			} catch (PDOException $e) { | |
| 2419 | 2419 | return "error (add columns race_time in marine_output) : ".$e->getMessage()."\n"; | 
| 2420 | 2420 | } | 
| 2421 | 2421 | } | 
| 2422 | -		if (!$Connection->checkColumnName('marine_output','race_rank')) { | |
| 2422 | +		if (!$Connection->checkColumnName('marine_output', 'race_rank')) { | |
| 2423 | 2423 |  			if ($globalDBdriver == 'mysql') { | 
| 2424 | 2424 | $query = "ALTER TABLE marine_output ADD COLUMN race_rank int(11) DEFAULT NULL"; | 
| 2425 | 2425 |  			} else { | 
| @@ -2428,29 +2428,29 @@ discard block | ||
| 2428 | 2428 |  			try { | 
| 2429 | 2429 | $sth = $Connection->db->prepare($query); | 
| 2430 | 2430 | $sth->execute(); | 
| 2431 | -			} catch(PDOException $e) { | |
| 2431 | +			} catch (PDOException $e) { | |
| 2432 | 2432 | return "error (add columns race_rank in marine_output) : ".$e->getMessage()."\n"; | 
| 2433 | 2433 | } | 
| 2434 | 2434 | } | 
| 2435 | -		if (!$Connection->checkColumnName('marine_archive','distance')) { | |
| 2435 | +		if (!$Connection->checkColumnName('marine_archive', 'distance')) { | |
| 2436 | 2436 | $query = "ALTER TABLE marine_archive ADD COLUMN distance float DEFAULT NULL"; | 
| 2437 | 2437 |  			try { | 
| 2438 | 2438 | $sth = $Connection->db->prepare($query); | 
| 2439 | 2439 | $sth->execute(); | 
| 2440 | -			} catch(PDOException $e) { | |
| 2440 | +			} catch (PDOException $e) { | |
| 2441 | 2441 | return "error (add columns distance in marine_archive) : ".$e->getMessage()."\n"; | 
| 2442 | 2442 | } | 
| 2443 | 2443 | } | 
| 2444 | -		if (!$Connection->checkColumnName('marine_archive','race_time')) { | |
| 2444 | +		if (!$Connection->checkColumnName('marine_archive', 'race_time')) { | |
| 2445 | 2445 | $query = "ALTER TABLE marine_archive ADD COLUMN race_time float DEFAULT NULL"; | 
| 2446 | 2446 |  			try { | 
| 2447 | 2447 | $sth = $Connection->db->prepare($query); | 
| 2448 | 2448 | $sth->execute(); | 
| 2449 | -			} catch(PDOException $e) { | |
| 2449 | +			} catch (PDOException $e) { | |
| 2450 | 2450 | return "error (add columns race_time in marine_archive) : ".$e->getMessage()."\n"; | 
| 2451 | 2451 | } | 
| 2452 | 2452 | } | 
| 2453 | -		if (!$Connection->checkColumnName('marine_archive','race_rank')) { | |
| 2453 | +		if (!$Connection->checkColumnName('marine_archive', 'race_rank')) { | |
| 2454 | 2454 |  			if ($globalDBdriver == 'mysql') { | 
| 2455 | 2455 | $query = "ALTER TABLE marine_archive ADD COLUMN race_rank int(11) DEFAULT NULL"; | 
| 2456 | 2456 |  			} else { | 
| @@ -2459,29 +2459,29 @@ discard block | ||
| 2459 | 2459 |  			try { | 
| 2460 | 2460 | $sth = $Connection->db->prepare($query); | 
| 2461 | 2461 | $sth->execute(); | 
| 2462 | -			} catch(PDOException $e) { | |
| 2462 | +			} catch (PDOException $e) { | |
| 2463 | 2463 | return "error (add columns race_rank in marine_archive) : ".$e->getMessage()."\n"; | 
| 2464 | 2464 | } | 
| 2465 | 2465 | } | 
| 2466 | -		if (!$Connection->checkColumnName('marine_archive_output','distance')) { | |
| 2466 | +		if (!$Connection->checkColumnName('marine_archive_output', 'distance')) { | |
| 2467 | 2467 | $query = "ALTER TABLE marine_archive_output ADD COLUMN distance float DEFAULT NULL"; | 
| 2468 | 2468 |  			try { | 
| 2469 | 2469 | $sth = $Connection->db->prepare($query); | 
| 2470 | 2470 | $sth->execute(); | 
| 2471 | -			} catch(PDOException $e) { | |
| 2471 | +			} catch (PDOException $e) { | |
| 2472 | 2472 | return "error (add columns distance in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 2473 | 2473 | } | 
| 2474 | 2474 | } | 
| 2475 | -		if (!$Connection->checkColumnName('marine_archive_output','race_time')) { | |
| 2475 | +		if (!$Connection->checkColumnName('marine_archive_output', 'race_time')) { | |
| 2476 | 2476 | $query = "ALTER TABLE marine_archive_output ADD COLUMN race_time float DEFAULT NULL"; | 
| 2477 | 2477 |  			try { | 
| 2478 | 2478 | $sth = $Connection->db->prepare($query); | 
| 2479 | 2479 | $sth->execute(); | 
| 2480 | -			} catch(PDOException $e) { | |
| 2480 | +			} catch (PDOException $e) { | |
| 2481 | 2481 | return "error (add columns race_time in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 2482 | 2482 | } | 
| 2483 | 2483 | } | 
| 2484 | -		if (!$Connection->checkColumnName('marine_archive_output','race_rank')) { | |
| 2484 | +		if (!$Connection->checkColumnName('marine_archive_output', 'race_rank')) { | |
| 2485 | 2485 |  			if ($globalDBdriver == 'mysql') { | 
| 2486 | 2486 | $query = "ALTER TABLE marine_archive_output ADD COLUMN race_rank int(11) DEFAULT NULL"; | 
| 2487 | 2487 |  			} else { | 
| @@ -2490,25 +2490,25 @@ discard block | ||
| 2490 | 2490 |  			try { | 
| 2491 | 2491 | $sth = $Connection->db->prepare($query); | 
| 2492 | 2492 | $sth->execute(); | 
| 2493 | -			} catch(PDOException $e) { | |
| 2493 | +			} catch (PDOException $e) { | |
| 2494 | 2494 | return "error (add columns race_rank in marine_live) : ".$e->getMessage()."\n"; | 
| 2495 | 2495 | } | 
| 2496 | 2496 | } | 
| 2497 | -		if ($Connection->checkColumnName('marine_output','last_altitude')) { | |
| 2497 | +		if ($Connection->checkColumnName('marine_output', 'last_altitude')) { | |
| 2498 | 2498 | $query = "ALTER TABLE marine_output DROP COLUMN last_altitude"; | 
| 2499 | 2499 |  			try { | 
| 2500 | 2500 | $sth = $Connection->db->prepare($query); | 
| 2501 | 2501 | $sth->execute(); | 
| 2502 | -			} catch(PDOException $e) { | |
| 2502 | +			} catch (PDOException $e) { | |
| 2503 | 2503 | return "error (drop columns last_altitude in marine_output) : ".$e->getMessage()."\n"; | 
| 2504 | 2504 | } | 
| 2505 | 2505 | } | 
| 2506 | -		if ($Connection->checkColumnName('marine_archive_output','last_altitude')) { | |
| 2506 | +		if ($Connection->checkColumnName('marine_archive_output', 'last_altitude')) { | |
| 2507 | 2507 | $query = "ALTER TABLE marine_archive_output DROP COLUMN last_altitude"; | 
| 2508 | 2508 |  			try { | 
| 2509 | 2509 | $sth = $Connection->db->prepare($query); | 
| 2510 | 2510 | $sth->execute(); | 
| 2511 | -			} catch(PDOException $e) { | |
| 2511 | +			} catch (PDOException $e) { | |
| 2512 | 2512 | return "error (drop columns last_altitude in marine_archive_output) : ".$e->getMessage()."\n"; | 
| 2513 | 2513 | } | 
| 2514 | 2514 | } | 
| @@ -2516,7 +2516,7 @@ discard block | ||
| 2516 | 2516 |  		try { | 
| 2517 | 2517 | $sth = $Connection->db->prepare($query); | 
| 2518 | 2518 | $sth->execute(); | 
| 2519 | -		} catch(PDOException $e) { | |
| 2519 | +		} catch (PDOException $e) { | |
| 2520 | 2520 | return "error (update schema_version) : ".$e->getMessage()."\n"; | 
| 2521 | 2521 | } | 
| 2522 | 2522 | return $error; | 
| @@ -2541,7 +2541,7 @@ discard block | ||
| 2541 | 2541 |  					try { | 
| 2542 | 2542 | $sth = $Connection->db->prepare($query); | 
| 2543 | 2543 | $sth->execute(); | 
| 2544 | -					} catch(PDOException $e) { | |
| 2544 | +					} catch (PDOException $e) { | |
| 2545 | 2545 | return "error (check_version): ".$e->getMessage()."\n"; | 
| 2546 | 2546 | } | 
| 2547 | 2547 | $result = $sth->fetch(PDO::FETCH_ASSOC); |