View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( e17801...597a61 )
by Yannick
25:55
created
Status
Category
Toggle Patches
atc-data.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -40,15 +40,15 @@
 
 block discarded – undo
40 40 
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41 41 
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
42 42 
 if ($spotter_item['atc_range'] > 0) {
43 
-    print '<div><span>'._("Range").'</span>';
44 
-    print $spotter_item['atc_range'];
45 
-    print '</div>';
43 
+	print '<div><span>'._("Range").'</span>';
44 
+	print $spotter_item['atc_range'];
45 
+	print '</div>';
46 46 
 }
47 47 
 print '</div>';
48 48 
 if ($spotter_item['info'] != '') {
49 
-    print '<div class="notamtext"><span>'._("Info").'</span>';
50 
-    print $spotter_item['info'];
51 
-    print '</div>';
49 
+	print '<div class="notamtext"><span>'._("Info").'</span>';
50 
+	print $spotter_item['info'];
51 
+	print '</div>';
52 52 
 }
53 53 
 print '</div>';
54 54 
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -5,8 +5,8 @@  discard block
 
 block discarded – undo
5 5 
 $ATC = new ATC();
6 6
7 7 
 if (isset($_GET['atcid'])) {
8 
-	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
9 
-	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
8 
+	$atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT);
9 
+	$atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING);
10 10 
 	$atc_data = $ATC->getById($atcid);
11 11 
 	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
12 12 
  ?>
 
@@ -38,7 +38,7 @@  discard block
 
 block discarded – undo
38 38 
 print '</div>';
39 39
40 40 
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41 
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
41 
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>';
42 42 
 if ($spotter_item['atc_range'] > 0) {
43 43 
     print '<div><span>'._("Range").'</span>';
44 44 
     print $spotter_item['atc_range'];
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,9 @@
 
 block discarded – undo
8 8 
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
9 9 
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
10 10 
 	$atc_data = $ATC->getById($atcid);
11 
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
11 
+	if (!isset($atc_data[0])) {
12 
+		$atc_data = $ATC->getByIdent($atcident);
13 
+	}
12 14 
  ?>
13 15 
 <div class="alldetails">
14 16 
 <button type="button" class="close">&times;</button>
Please login to merge, or discard this patch.
live-geojson.php 3 patches
Indentation   +63 added lines, -63 removed lines patch added patch discarded remove patch 
@@ -5,23 +5,23 @@  discard block
 
 block discarded – undo
5 5 
 $marine = false;
6 6 
 $usecoord = false;
7 7 
 if (isset($_GET['tracker'])) {
8 
-    $tracker = true;
8 
+	$tracker = true;
9 9 
 }
10 10 
 if (isset($_GET['marine'])) {
11 
-    $marine = true;
11 
+	$marine = true;
12 12 
 }
13 13 
 if ($tracker) {
14 
-    require_once('require/class.Tracker.php');
15 
-    require_once('require/class.TrackerLive.php');
16 
-    require_once('require/class.TrackerArchive.php');
14 
+	require_once('require/class.Tracker.php');
15 
+	require_once('require/class.TrackerLive.php');
16 
+	require_once('require/class.TrackerArchive.php');
17 17 
 } elseif ($marine) {
18 
-    require_once('require/class.Marine.php');
19 
-    require_once('require/class.MarineLive.php');
20 
-    require_once('require/class.MarineArchive.php');
18 
+	require_once('require/class.Marine.php');
19 
+	require_once('require/class.MarineLive.php');
20 
+	require_once('require/class.MarineArchive.php');
21 21 
 } else {
22 
-    require_once('require/class.Spotter.php');
23 
-    require_once('require/class.SpotterLive.php');
24 
-    require_once('require/class.SpotterArchive.php');
22 
+	require_once('require/class.Spotter.php');
23 
+	require_once('require/class.SpotterLive.php');
24 
+	require_once('require/class.SpotterArchive.php');
25 25 
 }
26 26
27 27 
 $begintime = microtime(true);
 
@@ -41,10 +41,10 @@  discard block
 
 block discarded – undo
41 41 
 $Common = new Common();
42 42
43 43 
 if (isset($_GET['download'])) {
44 
-    if ($_GET['download'] == "true")
45 
-    {
44 
+	if ($_GET['download'] == "true")
45 
+	{
46 46 
 	header('Content-disposition: attachment; filename="flightairmap.json"');
47 
-    }
47 
+	}
48 48 
 }
49 49 
 header('Content-Type: text/javascript');
50 50 
 
@@ -498,17 +498,17 @@  discard block
 
 block discarded – undo
498 498 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
499 499
500 500 
 				if (
501 
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
502 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
501 
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
502 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
503 503 
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
504 504 
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
505 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
506 
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
507 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
508 
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
509 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
510 
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
511 
-				    ) {
505 
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
506 
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
507 
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
508 
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
509 
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
510 
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
511 
+					) {
512 512 
 					if ($tracker) {
513 513 
 						if ($from_archive || $globalArchive) {
514 514 
 							$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
 
@@ -597,65 +597,65 @@  discard block
 
 block discarded – undo
597 597 
 				}
598 598
599 599 
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
600 
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
601 
-				     && (isset($spotter_item['departure_airport'])
602 
-				        && $spotter_item['departure_airport'] != 'NA'
603 
-				        && isset($spotter_item['arrival_airport'])
604 
-				        && $spotter_item['arrival_airport'] != 'NA'
605 
-				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
606 
-				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
607 
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
608 
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
609 
-				    if (isset($spotter_item['departure_airport_latitude'])) {
600 
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
601 
+					 && (isset($spotter_item['departure_airport'])
602 
+						&& $spotter_item['departure_airport'] != 'NA'
603 
+						&& isset($spotter_item['arrival_airport'])
604 
+						&& $spotter_item['arrival_airport'] != 'NA'
605 
+						&& ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
606 
+							|| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
607 
+					if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
608 
+					else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
609 
+					if (isset($spotter_item['departure_airport_latitude'])) {
610 610 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
611 
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
611 
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
612 612 
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
613 613 
 					if (isset($dairport[0]['latitude'])) {
614 
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
614 
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
615 615 
 					}
616 
-				    }
617 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
616 
+					}
617 
+					if (isset($spotter_item['arrival_airport_latitude'])) {
618 618 
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
619 
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
619 
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
620 620 
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
621 621 
 					if (isset($aairport[0]['latitude'])) {
622 
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
622 
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
623 623 
 					}
624 
-				    }
625 
-				    $output_air  = substr($output_air, 0, -1);
626 
-				    $output_air .= ']}},';
627 
-				    $output .= $output_air;
628 
-				    unset($output_air);
624 
+					}
625 
+					$output_air  = substr($output_air, 0, -1);
626 
+					$output_air .= ']}},';
627 
+					$output .= $output_air;
628 
+					unset($output_air);
629 629 
 				}
630 630
631 631 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
632 632 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
633 633 
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
634 
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
635 
-				     && (isset($spotter_item['arrival_airport'])
636 
-				        && $spotter_item['arrival_airport'] != 'NA'
637 
-				        && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
638 
-				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
639 
-				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
640 
-				    $havedata = false;
641 
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
642 
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
643 
-				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
634 
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
635 
+					 && (isset($spotter_item['arrival_airport'])
636 
+						&& $spotter_item['arrival_airport'] != 'NA'
637 
+						&& ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
638 
+							|| (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
639 
+							|| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
640 
+					$havedata = false;
641 
+					if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
642 
+					else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
643 
+					$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
644 644
645 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
645 
+					if (isset($spotter_item['arrival_airport_latitude'])) {
646 646 
 					$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
647 647 
 					$havedata = true;
648 
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
648 
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
649 649 
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
650 650 
 					if (isset($aairport[0]['latitude'])) {
651 
-					    $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
652 
-					    $havedata = true;
651 
+						$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
652 
+						$havedata = true;
653 653 
 					}
654 
-				    }
655 
-				    //$output_dest  = substr($output_dest, 0, -1);
656 
-				    $output_dest .= ']}},';
657 
-				    if ($havedata) $output .= $output_dest;
658 
-				    unset($output_dest);
654 
+					}
655 
+					//$output_dest  = substr($output_dest, 0, -1);
656 
+					$output_dest .= ']}},';
657 
+					if ($havedata) $output .= $output_dest;
658 
+					unset($output_dest);
659 659 
 				}
660 660 
 			}
661 661 
 			$output  = substr($output, 0, -1);
Please login to merge, or discard this patch.
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch 
@@ -55,23 +55,23 @@  discard block
 
 block discarded – undo
55 55 
 $min = true;
56 56 
 $allhistory = false;
57 57 
 $filter['source'] = array();
58 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
59 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
60 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
61 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
62 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
63 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
64 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
65 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
66 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
67 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
58 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
59 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
60 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
61 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
62 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
63 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
64 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
65 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
66 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
67 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
68 68
69 69 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
70 70 
 	$min = true;
71 71 
 } else $min = false;
72 72
73 73 
 if (isset($_GET['ident'])) {
74 
-	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
74 
+	$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
75 75 
 	if ($tracker) {
76 76 
 		$spotter_array = $TrackerLive->getLastLiveTrackerDataByIdent($ident);
77 77 
 	} elseif ($marine) {
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
 	}
86 86 
 	$allhistory = true;
87 87 
 } elseif (isset($_GET['flightaware_id'])) {
88 
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
88 
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
89 89 
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
90 90 
 	if (empty($spotter_array)) {
91 91 
 		$from_archive = true;
 
@@ -93,44 +93,44 @@  discard block
 
 block discarded – undo
93 93 
 	}
94 94 
 	$allhistory = true;
95 95 
 } elseif (isset($_GET['famtrack_id'])) {
96 
-	$famtrack_id = urldecode(filter_input(INPUT_GET,'famtrack_id',FILTER_SANITIZE_STRING));
96 
+	$famtrack_id = urldecode(filter_input(INPUT_GET, 'famtrack_id', FILTER_SANITIZE_STRING));
97 97 
 	$spotter_array = $TrackerLive->getLastLiveTrackerDataById($famtrack_id);
98 98 
 	$allhistory = true;
99 99 
 } elseif (isset($_GET['fammarine_id'])) {
100 
-	$fammarine_id = urldecode(filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING));
100 
+	$fammarine_id = urldecode(filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING));
101 101 
 	$spotter_array = $MarineLive->getLastLiveMarineDataById($fammarine_id);
102 102 
 	$allhistory = true;
103 103 
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
104 104 
 //} elseif (isset($_GET['coord'])) {
105 105 
 	$usecoord = true;
106 
-	$coord = explode(',',$_GET['coord']);
106 
+	$coord = explode(',', $_GET['coord']);
107 107 
 	if ($tracker) {
108 
-		$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord,$filter);
108 
+		$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord, $filter);
109 109 
 	} elseif ($marine) {
110 
-		$spotter_array = $MarineLive->getLiveMarineDatabyCoord($coord,$filter);
110 
+		$spotter_array = $MarineLive->getLiveMarineDatabyCoord($coord, $filter);
111 111 
 	} else {
112 
-		$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
112 
+		$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
113 113 
 	}
114 114 
 } elseif (isset($globalMapUseBbox) && $globalMapUseBbox && isset($_GET['coord']) && $min) {
115 115 
 	$usecoord = true;
116 
-	$coord = explode(',',$_GET['coord']);
116 
+	$coord = explode(',', $_GET['coord']);
117 117 
 	if ($tracker) {
118 
-		$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
118 
+		$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord, $filter);
119 119 
 	} elseif ($marine) {
120 
-		$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord,$filter);
120 
+		$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord, $filter);
121 121 
 	} else {
122 
-		$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord,$filter);
122 
+		$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord, $filter);
123 123 
 	}
124 124 
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed']) && !isset($_GET['tracker']) && !isset($_GET['marine'])) {
125 125 
 	$from_archive = true;
126 126 
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
127 127 
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
128 
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
129 
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
130 
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
131 
-	$begindate = date('Y-m-d H:i:s',$begindate);
132 
-	$enddate = date('Y-m-d H:i:s',$enddate);
133 
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
128 
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
129 
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
130 
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
131 
+	$begindate = date('Y-m-d H:i:s', $begindate);
132 
+	$enddate = date('Y-m-d H:i:s', $enddate);
133 
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
134 134 
 } elseif ($min) {
135 135 
 	if ($tracker) {
136 136 
 		$spotter_array = $TrackerLive->getMinLiveTrackerData($filter);
 
@@ -142,18 +142,18 @@  discard block
 
 block discarded – undo
142 142 
 #	$min = true;
143 143 
 } else {
144 144 
 	if ($tracker) {
145 
-		$spotter_array = $TrackerLive->getLiveTrackerData('','',$filter);
145 
+		$spotter_array = $TrackerLive->getLiveTrackerData('', '', $filter);
146 146 
 	} elseif ($marine) {
147 
-		$spotter_array = $marineLive->getLiveMarineData('','',$filter);
147 
+		$spotter_array = $marineLive->getLiveMarineData('', '', $filter);
148 148 
 	} else {
149 
-		$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
149 
+		$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
150 150 
 	}
151 151 
 }
152 152
153 153 
 if (!empty($spotter_array) || $usecoord) {
154 154 
 	if ($usecoord) {
155 155 
 		if (isset($_GET['archive'])) {
156 
-			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
156 
+			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
157 157 
 		} else {
158 158 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
159 159 
 		}
 
@@ -161,7 +161,7 @@  discard block
 
 block discarded – undo
161 161 
 	if ($flightcnt == '') $flightcnt = 0;
162 162 
 } else $flightcnt = 0;
163 163
164 
-$sqltime = round(microtime(true)-$begintime,2);
164 
+$sqltime = round(microtime(true) - $begintime, 2);
165 165
166 166 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
167 167 
 else $usenextlatlon = true;
 
@@ -178,7 +178,7 @@  discard block
 
 block discarded – undo
178 178 
 		if (!empty($spotter_array) && is_array($spotter_array))
179 179 
 		{
180 180 
 			$output .= '"features": [';
181 
-			foreach($spotter_array as $spotter_item)
181 
+			foreach ($spotter_array as $spotter_item)
182 182 
 			{
183 183 
 				$j++;
184 184 
 				date_default_timezone_set('UTC');
 
@@ -234,8 +234,8 @@  discard block
 
 block discarded – undo
234 234 
 */
235 235 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
236 236 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
237 
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
238 
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
237 
+							if ($compress) $output .= '"c": "'.str_replace('\\', '', $spotter_item['ident']).'",';
238 
+							else $output .= '"callsign": "'.str_replace('\\', '', $spotter_item['ident']).'",';
239 239 
 							//"
240 240 
 						} else {
241 241 
 							if ($compress) $output .= '"c": "NA",';
 
@@ -244,7 +244,7 @@  discard block
 
 block discarded – undo
244 244 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
245 245 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
246 246 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
247 
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
247 
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
248 248 
 						} elseif (isset($spotter_item['aircraft_type'])) {
249 249 
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
250 250 
 						} elseif (!$min) {
 
@@ -385,16 +385,16 @@  discard block
 
 block discarded – undo
385 385 
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
386 386
387 387 
 						if (isset($archivespeed)) {
388 
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
388 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
389 389 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
390 390 
 						} elseif ($usenextlatlon) {
391 
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
391 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
392 392 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
393 393 
 						}
394 394
395 395 
 						if (!$min) $output .= '"image": "'.$image.'",';
396 396 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
397 
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
397 
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
398 398 
 						}
399 399 
 						if (isset($spotter_item['image_source_website'])) {
400 400 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 
@@ -416,7 +416,7 @@  discard block
 
 block discarded – undo
416 416 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
417 417 
 						}
418 418 
 						if (isset($spotter_item['acars'])) {
419 
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
419 
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
420 420 
 						}
421 421 
 						// type when not aircraft ?
422 422 
 						if (isset($spotter_item['type'])) {
 
@@ -494,7 +494,7 @@  discard block
 
 block discarded – undo
494 494
495 495 
 			}
496 496 
 */
497 
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
497 
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
498 498 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
499 499
500 500 
 				if (
 
@@ -502,11 +502,11 @@  discard block
 
 block discarded – undo
502 502 
 				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
503 503 
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
504 504 
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
505 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
505 
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
506 506 
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
507 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
507 
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['fammarine_id']))
508 508 
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
509 
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
509 
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['famtrackid']))
510 510 
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
511 511 
 				    ) {
512 512 
 					if ($tracker) {
 
@@ -543,9 +543,9 @@  discard block
 
 block discarded – undo
543 543 
 								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
544 544 
 							}
545 545 
 							$output_history .= '[';
546 
-							$output_history .=  $spotter_history['longitude'].', ';
547 
-							$output_history .=  $spotter_history['latitude'].', ';
548 
-							$output_history .=  $spotter_history['altitude']*30.48;
546 
+							$output_history .= $spotter_history['longitude'].', ';
547 
+							$output_history .= $spotter_history['latitude'].', ';
548 
+							$output_history .= $spotter_history['altitude']*30.48;
549 549 
 							$output_history .= '],';
550 550 
 							/*
551 551 
 							if ($from_archive === false) {
 
@@ -563,8 +563,8 @@  discard block
 
 block discarded – undo
563 563 
 								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
564 564 
 							} else $d = true;
565 565 
 							$output_history .= '[';
566 
-							$output_history .=  $spotter_history['longitude'].', ';
567 
-							$output_history .=  $spotter_history['latitude'];
566 
+							$output_history .= $spotter_history['longitude'].', ';
567 
+							$output_history .= $spotter_history['latitude'];
568 568 
 							$output_history .= '],';
569 569 
 							/*
570 570 
 							if ($from_archive === false) {
 
@@ -580,9 +580,9 @@  discard block
 
 block discarded – undo
580 580
581 581 
 						if ($from_archive === false) {
582 582 
 							$output_historyd = '[';
583 
-							$output_historyd .=  $spotter_item['longitude'].', ';
584 
-							$output_historyd .=  $spotter_item['latitude'];
585 
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
583 
+							$output_historyd .= $spotter_item['longitude'].', ';
584 
+							$output_historyd .= $spotter_item['latitude'];
585 
+							if (isset($spotter_history['altitude'])) $output_historyd .= ','.$spotter_item['altitude']*30.48;
586 586 
 							$output_historyd .= '],';
587 587 
 							//$output_history = $output_historyd.$output_history;
588 588 
 							$output_history = $output_history.$output_historyd;
 
@@ -596,7 +596,7 @@  discard block
 
 block discarded – undo
596 596 
 					}
597 597 
 				}
598 598
599 
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
599 
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
600 600 
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
601 601 
 				     && (isset($spotter_item['departure_airport'])
602 602 
 				        && $spotter_item['departure_airport'] != 'NA' 
@@ -630,7 +630,7 @@  discard block
 
 block discarded – undo
630 630
631 631 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
632 632 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
633 
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
633 
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
634 634 
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
635 635 
 				     && (isset($spotter_item['arrival_airport'])
636 636 
 				        && $spotter_item['arrival_airport'] != 'NA' 
@@ -661,7 +661,7 @@  discard block
 
 block discarded – undo
661 661 
 			$output  = substr($output, 0, -1);
662 662 
 			$output .= ']';
663 663 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
664 
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
664 
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
665 665 
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
666 666 
 			$output .= '"fc": "'.$j.'"';
667 667 
 		} else {
Please login to merge, or discard this patch.
Braces   +291 added lines, -114 removed lines patch added patch discarded remove patch 
@@ -48,27 +48,52 @@  discard block
 
 block discarded – undo
48 48 
 }
49 49 
 header('Content-Type: text/javascript');
50 50
51 
-if (!isset($globalJsonCompress)) $compress = true;
52 
-else $compress = $globalJsonCompress;
51 
+if (!isset($globalJsonCompress)) {
52 
+	$compress = true;
53 
+} else {
54 
+	$compress = $globalJsonCompress;
55 
+}
53 56
54 57 
 $from_archive = false;
55 58 
 $min = true;
56 59 
 $allhistory = false;
57 60 
 $filter['source'] = array();
58 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
59 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
60 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
61 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
62 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
63 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
64 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
65 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
66 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
67 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
61 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
62 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
63 
+}
64 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
65 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
66 
+}
67 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
68 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
69 
+}
70 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
71 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
72 
+}
73 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
74 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
75 
+}
76 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
77 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
78 
+}
79 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
80 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
81 
+}
82 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
83 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
84 
+}
85 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
86 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
87 
+}
88 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
89 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
90 
+}
68 91
69 92 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
70 93 
 	$min = true;
71 
-} else $min = false;
94 
+} else {
95 
+	$min = false;
96 
+}
72 97
73 98 
 if (isset($_GET['ident'])) {
74 99 
 	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
 
@@ -157,21 +182,33 @@  discard block
 
 block discarded – undo
157 182 
 		} else {
158 183 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
159 184 
 		}
160 
-	} else $flightcnt = count($spotter_array);
161 
-	if ($flightcnt == '') $flightcnt = 0;
162 
-} else $flightcnt = 0;
185 
+	} else {
186 
+		$flightcnt = count($spotter_array);
187 
+	}
188 
+	if ($flightcnt == '') {
189 
+		$flightcnt = 0;
190 
+	}
191 
+	} else {
192 
+	$flightcnt = 0;
193 
+}
163 194
164 195 
 $sqltime = round(microtime(true)-$begintime,2);
165 196
166 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
167 
-else $usenextlatlon = true;
197 
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
198 
+	$usenextlatlon = false;
199 
+} else {
200 
+	$usenextlatlon = true;
201 
+}
168 202 
 $j = 0;
169 203 
 $prev_flightaware_id = '';
170 204 
 $aircrafts_shadow = array();
171 205 
 $output = '{';
172 206 
 	$output .= '"type": "FeatureCollection",';
173 
-		if ($min) $output .= '"minimal": "true",';
174 
-		else $output .= '"minimal": "false",';
207 
+		if ($min) {
208 
+			$output .= '"minimal": "true",';
209 
+		} else {
210 
+			$output .= '"minimal": "false",';
211 
+		}
175 212 
 		//$output .= '"fc": "'.$flightcnt.'",';
176 213 
 		$output .= '"sqt": "'.$sqltime.'",';
177 214 
 
@@ -215,18 +252,29 @@  discard block
 
 block discarded – undo
215 252 
 						}
216 253 
 						$output .= '"properties": {';
217 254 
 						if (isset($spotter_item['flightaware_id'])) {
218 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
219 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
255 
+							if ($compress) {
256 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
257 
+							} else {
258 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
259 
+							}
220 260 
 						} elseif (isset($spotter_item['famtrackid'])) {
221 
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
222 
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
261 
+							if ($compress) {
262 
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
263 
+							} else {
264 
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
265 
+							}
223 266 
 						} elseif (isset($spotter_item['fammarine_id'])) {
224 
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
225 
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
267 
+							if ($compress) {
268 
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
269 
+							} else {
270 
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
271 
+							}
226 272 
 						}
227 273 
 							$output .= '"fc": "'.$flightcnt.'",';
228 274 
 							$output .= '"sqt": "'.$sqltime.'",';
229 
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
275 
+							if (isset($begindate)) {
276 
+								$output .= '"archive_date": "'.$begindate.'",';
277 
+							}
230 278
231 279 
 /*
232 280 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -234,14 +282,22 @@  discard block
 
 block discarded – undo
234 282 
 */
235 283 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
236 284 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
237 
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
238 
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
285 
+							if ($compress) {
286 
+								$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
287 
+							} else {
288 
+								$output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
289 
+							}
239 290 
 							//"
240 291 
 						} else {
241 
-							if ($compress) $output .= '"c": "NA",';
242 
-							else $output .= '"callsign": "NA",';
292 
+							if ($compress) {
293 
+								$output .= '"c": "NA",';
294 
+							} else {
295 
+								$output .= '"callsign": "NA",';
296 
+							}
297 
+						}
298 
+						if (isset($spotter_item['registration'])) {
299 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
243 300 
 						}
244 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
245 301 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
246 302 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
247 303 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -254,16 +310,23 @@  discard block
 
 block discarded – undo
254 310 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
255 311 
 						}
256 312 
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker) {
257 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
258 
-							else {
313 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
314 
+								$spotter_item['aircraft_shadow'] = '';
315 
+							} else {
259 316 
 								$aircraft_icao = $spotter_item['aircraft_icao'];
260 
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
261 
-								else {
317 
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
318 
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
319 
+								} else {
262 320 
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
263 
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
264 
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
265 
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
266 
-									else $spotter_item['aircraft_shadow'] = '';
321 
+									if (count($aircraft_info) > 0) {
322 
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
323 
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
324 
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
325 
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
326 
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
327 
+									} else {
328 
+										$spotter_item['aircraft_shadow'] = '';
329 
+									}
267 330 
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
268 331 
 								}
269 332 
 							}
 
@@ -271,73 +334,139 @@  discard block
 
 block discarded – undo
271 334 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
272 335 
 							if ($tracker) {
273 336 
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
274 
-									if ($compress) $output .= '"as": "ambulance.png",';
275 
-									else $output .= '"aircraft_shadow": "ambulance.png",';
337 
+									if ($compress) {
338 
+										$output .= '"as": "ambulance.png",';
339 
+									} else {
340 
+										$output .= '"aircraft_shadow": "ambulance.png",';
341 
+									}
276 342 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
277 
-									if ($compress) $output .= '"as": "police.png",';
278 
-									else $output .= '"aircraft_shadow": "police.png",';
343 
+									if ($compress) {
344 
+										$output .= '"as": "police.png",';
345 
+									} else {
346 
+										$output .= '"aircraft_shadow": "police.png",';
347 
+									}
279 348 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
280 
-									if ($compress) $output .= '"as": "ship.png",';
281 
-									else $output .= '"aircraft_shadow": "ship.png",';
349 
+									if ($compress) {
350 
+										$output .= '"as": "ship.png",';
351 
+									} else {
352 
+										$output .= '"aircraft_shadow": "ship.png",';
353 
+									}
282 354 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
283 
-									if ($compress) $output .= '"as": "ship.png",';
284 
-									else $output .= '"aircraft_shadow": "ship.png",';
355 
+									if ($compress) {
356 
+										$output .= '"as": "ship.png",';
357 
+									} else {
358 
+										$output .= '"aircraft_shadow": "ship.png",';
359 
+									}
285 360 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
286 
-									if ($compress) $output .= '"as": "ship.png",';
287 
-									else $output .= '"aircraft_shadow": "ship.png",';
361 
+									if ($compress) {
362 
+										$output .= '"as": "ship.png",';
363 
+									} else {
364 
+										$output .= '"aircraft_shadow": "ship.png",';
365 
+									}
288 366 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
289 
-									if ($compress) $output .= '"as": "truck.png",';
290 
-									else $output .= '"aircraft_shadow": "truck.png",';
367 
+									if ($compress) {
368 
+										$output .= '"as": "truck.png",';
369 
+									} else {
370 
+										$output .= '"aircraft_shadow": "truck.png",';
371 
+									}
291 372 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
292 
-									if ($compress) $output .= '"as": "truck.png",';
293 
-									else $output .= '"aircraft_shadow": "truck.png",';
373 
+									if ($compress) {
374 
+										$output .= '"as": "truck.png",';
375 
+									} else {
376 
+										$output .= '"aircraft_shadow": "truck.png",';
377 
+									}
294 378 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
295 
-									if ($compress) $output .= '"as": "aircraft.png",';
296 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
379 
+									if ($compress) {
380 
+										$output .= '"as": "aircraft.png",';
381 
+									} else {
382 
+										$output .= '"aircraft_shadow": "aircraft.png",';
383 
+									}
297 384 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
298 
-									if ($compress) $output .= '"as": "aircraft.png",';
299 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
385 
+									if ($compress) {
386 
+										$output .= '"as": "aircraft.png",';
387 
+									} else {
388 
+										$output .= '"aircraft_shadow": "aircraft.png",';
389 
+									}
300 390 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
301 
-									if ($compress) $output .= '"as": "helico.png",';
302 
-									else $output .= '"aircraft_shadow": "helico.png",';
391 
+									if ($compress) {
392 
+										$output .= '"as": "helico.png",';
393 
+									} else {
394 
+										$output .= '"aircraft_shadow": "helico.png",';
395 
+									}
303 396 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
304 
-									if ($compress) $output .= '"as": "rail.png",';
305 
-									else $output .= '"aircraft_shadow": "rail.png",';
397 
+									if ($compress) {
398 
+										$output .= '"as": "rail.png",';
399 
+									} else {
400 
+										$output .= '"aircraft_shadow": "rail.png",';
401 
+									}
306 402 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
307 
-									if ($compress) $output .= '"as": "firetruck.png",';
308 
-									else $output .= '"aircraft_shadow": "firetruck.png",';
403 
+									if ($compress) {
404 
+										$output .= '"as": "firetruck.png",';
405 
+									} else {
406 
+										$output .= '"aircraft_shadow": "firetruck.png",';
407 
+									}
309 408 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
310 
-									if ($compress) $output .= '"as": "bus.png",';
311 
-									else $output .= '"aircraft_shadow": "bus.png",';
409 
+									if ($compress) {
410 
+										$output .= '"as": "bus.png",';
411 
+									} else {
412 
+										$output .= '"aircraft_shadow": "bus.png",';
413 
+									}
312 414 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
313 
-									if ($compress) $output .= '"as": "phone.png",';
314 
-									else $output .= '"aircraft_shadow": "phone.png",';
415 
+									if ($compress) {
416 
+										$output .= '"as": "phone.png",';
417 
+									} else {
418 
+										$output .= '"aircraft_shadow": "phone.png",';
419 
+									}
315 420 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
316 
-									if ($compress) $output .= '"as": "jogger.png",';
317 
-									else $output .= '"aircraft_shadow": "jogger.png",';
421 
+									if ($compress) {
422 
+										$output .= '"as": "jogger.png",';
423 
+									} else {
424 
+										$output .= '"aircraft_shadow": "jogger.png",';
425 
+									}
318 426 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
319 
-									if ($compress) $output .= '"as": "bike.png",';
320 
-									else $output .= '"aircraft_shadow": "bike.png",';
427 
+									if ($compress) {
428 
+										$output .= '"as": "bike.png",';
429 
+									} else {
430 
+										$output .= '"aircraft_shadow": "bike.png",';
431 
+									}
321 432 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
322 
-									if ($compress) $output .= '"as": "motorcycle.png",';
323 
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
433 
+									if ($compress) {
434 
+										$output .= '"as": "motorcycle.png",';
435 
+									} else {
436 
+										$output .= '"aircraft_shadow": "motorcycle.png",';
437 
+									}
324 438 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
325 
-									if ($compress) $output .= '"as": "balloon.png",';
326 
-									else $output .= '"aircraft_shadow": "balloon.png",';
439 
+									if ($compress) {
440 
+										$output .= '"as": "balloon.png",';
441 
+									} else {
442 
+										$output .= '"aircraft_shadow": "balloon.png",';
443 
+									}
327 444 
 								} else {
328 
-									if ($compress) $output .= '"as": "car.png",';
329 
-									else $output .= '"aircraft_shadow": "car.png",';
445 
+									if ($compress) {
446 
+										$output .= '"as": "car.png",';
447 
+									} else {
448 
+										$output .= '"aircraft_shadow": "car.png",';
449 
+									}
330 450 
 								}
331 451 
 							} elseif ($marine) {
332 
-								if ($compress) $output .= '"as": "ship.png",';
333 
-								else $output .= '"aircraft_shadow": "ship.png",';
452 
+								if ($compress) {
453 
+									$output .= '"as": "ship.png",';
454 
+								} else {
455 
+									$output .= '"aircraft_shadow": "ship.png",';
456 
+								}
334 457 
 							} else {
335 
-								if ($compress) $output .= '"as": "default.png",';
336 
-								else $output .= '"aircraft_shadow": "default.png",';
458 
+								if ($compress) {
459 
+									$output .= '"as": "default.png",';
460 
+								} else {
461 
+									$output .= '"aircraft_shadow": "default.png",';
462 
+								}
337 463 
 							}
338 464 
 						} else {
339 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
340 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
465 
+							if ($compress) {
466 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
467 
+							} else {
468 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
469 
+							}
341 470 
 						}
342 471 
 						if (isset($spotter_item['airline_name'])) {
343 472 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -345,8 +474,11 @@  discard block
 
 block discarded – undo
345 474 
 							$output .= '"airline_name": "NA",';
346 475 
 						}
347 476 
 						if (isset($spotter_item['departure_airport'])) {
348 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
349 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
477 
+							if ($compress) {
478 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
479 
+							} else {
480 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
481 
+							}
350 482 
 						}
351 483 
 						if (isset($spotter_item['departure_airport_city'])) {
352 484 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -358,8 +490,11 @@  discard block
 
 block discarded – undo
358 490 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
359 491 
 						}
360 492 
 						if (isset($spotter_item['arrival_airport'])) {
361 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
362 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
493 
+							if ($compress) {
494 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
495 
+							} else {
496 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
497 
+							}
363 498 
 						}
364 499 
 						if (isset($spotter_item['arrival_airport_city'])) {
365 500 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -378,11 +513,17 @@  discard block
 
 block discarded – undo
378 513 
 						}
379 514
380 515 
 						if (isset($spotter_item['altitude'])) {
381 
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
382 
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
516 
+							if ($compress) {
517 
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
518 
+							} else {
519 
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
520 
+							}
521 
+						}
522 
+						if ($compress) {
523 
+							$output .= '"h": "'.$spotter_item['heading'].'",';
524 
+						} else {
525 
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
383 526 
 						}
384 
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
385 
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
386 527
387 528 
 						if (isset($archivespeed)) {
388 529 
 							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
 
@@ -392,7 +533,9 @@  discard block
 
 block discarded – undo
392 533 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
393 534 
 						}
394 535
395 
-						if (!$min) $output .= '"image": "'.$image.'",';
536 
+						if (!$min) {
537 
+							$output .= '"image": "'.$image.'",';
538 
+						}
396 539 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
397 540 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
398 541 
 						}
 
@@ -400,8 +543,11 @@  discard block
 
 block discarded – undo
400 543 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
401 544 
 						}
402 545 
 						if (isset($spotter_item['squawk'])) {
403 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
404 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
546 
+							if ($compress) {
547 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
548 
+							} else {
549 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
550 
+							}
405 551 
 						}
406 552 
 						if (isset($spotter_item['squawk_usage'])) {
407 553 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -420,14 +566,23 @@  discard block
 
 block discarded – undo
420 566 
 						}
421 567 
 						// type when not aircraft ?
422 568 
 						if (isset($spotter_item['type'])) {
423 
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
424 
-							else $output .= '"type": "'.$spotter_item['type'].'"';
569 
+							if ($compress) {
570 
+								$output .= '"t": "'.$spotter_item['type'].'"';
571 
+							} else {
572 
+								$output .= '"type": "'.$spotter_item['type'].'"';
573 
+							}
425 574 
 						} elseif ($marine) {
426 
-							if ($compress) $output .= '"t": "ship"';
427 
-							else $output .= '"type": "ship"';
575 
+							if ($compress) {
576 
+								$output .= '"t": "ship"';
577 
+							} else {
578 
+								$output .= '"type": "ship"';
579 
+							}
428 580 
 						} else {
429 
-							if ($compress) $output .= '"t": "aircraft"';
430 
-							else $output .= '"type": "aircraft"';
581 
+							if ($compress) {
582 
+								$output .= '"t": "aircraft"';
583 
+							} else {
584 
+								$output .= '"type": "aircraft"';
585 
+							}
431 586 
 						}
432 587 
 						$output .= '},';
433 588 
 						$output .= '"geometry": {';
 
@@ -495,7 +650,9 @@  discard block
 
 block discarded – undo
495 650 
 			}
496 651 
 */
497 652 
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
498 
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
653 
+				if ($history == '' && isset($_COOKIE['history'])) {
654 
+					$history = $_COOKIE['history'];
655 
+				}
499 656
500 657 
 				if (
501 658 
 				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -539,8 +696,11 @@  discard block
 
 block discarded – undo
539 696 
 									$output_history .= ']}},';
540 697 
 									$output .= $output_history;
541 698 
 								}
542 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
543 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
699 
+								if ($compress) {
700 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
701 
+								} else {
702 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
703 
+								}
544 704 
 							}
545 705 
 							$output_history .= '[';
546 706 
 							$output_history .=  $spotter_history['longitude'].', ';
 
@@ -559,9 +719,14 @@  discard block
 
 block discarded – undo
559 719 
 							$prev_alt = $alt;
560 720 
 						} else {
561 721 
 							if ($d == false) {
562 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
563 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
564 
-							} else $d = true;
722 
+								if ($compress) {
723 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
724 
+								} else {
725 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
726 
+								}
727 
+							} else {
728 
+								$d = true;
729 
+							}
565 730 
 							$output_history .= '[';
566 731 
 							$output_history .=  $spotter_history['longitude'].', ';
567 732 
 							$output_history .=  $spotter_history['latitude'];
 
@@ -582,7 +747,9 @@  discard block
 
 block discarded – undo
582 747 
 							$output_historyd = '[';
583 748 
 							$output_historyd .=  $spotter_item['longitude'].', ';
584 749 
 							$output_historyd .=  $spotter_item['latitude'];
585 
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
750 
+							if (isset($spotter_history['altitude'])) {
751 
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
752 
+							}
586 753 
 							$output_historyd .= '],';
587 754 
 							//$output_history = $output_historyd.$output_history;
588 755 
 							$output_history = $output_history.$output_historyd;
 
@@ -604,8 +771,11 @@  discard block
 
 block discarded – undo
604 771 
 				        && $spotter_item['arrival_airport'] != 'NA'
605 772 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
606 773 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
607 
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
608 
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
774 
+				    if ($compress) {
775 
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
776 
+				    } else {
777 
+				    	$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
778 
+				    }
609 779 
 				    if (isset($spotter_item['departure_airport_latitude'])) {
610 780 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
611 781 
 				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 
@@ -638,8 +808,11 @@  discard block
 
 block discarded – undo
638 808 
 				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
639 809 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
640 810 
 				    $havedata = false;
641 
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
642 
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
811 
+				    if ($compress) {
812 
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
813 
+				    } else {
814 
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
815 
+				    }
643 816 
 				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
644 817
645 818 
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
 
@@ -654,7 +827,9 @@  discard block
 
 block discarded – undo
654 827 
 				    }
655 828 
 				    //$output_dest  = substr($output_dest, 0, -1);
656 829 
 				    $output_dest .= ']}},';
657 
-				    if ($havedata) $output .= $output_dest;
830 
+				    if ($havedata) {
831 
+				    	$output .= $output_dest;
832 
+				    }
658 833 
 				    unset($output_dest);
659 834 
 				}
660 835 
 			}
 
@@ -662,7 +837,9 @@  discard block
 
 block discarded – undo
662 837 
 			$output .= ']';
663 838 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
664 839 
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
665 
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
840 
+			if (isset($begindate)) {
841 
+				$output .= '"archive_date": "'.$begindate.'",';
842 
+			}
666 843 
 			$output .= '"fc": "'.$j.'"';
667 844 
 		} else {
668 845 
 			$output .= '"features": ';
Please login to merge, or discard this patch.
require/class.Source.php 2 patches
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -88,7 +88,9 @@  discard block
 
 block discarded – undo
88 88 
 	}
89 89
90 90 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
91 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
91 
+		if ($last_seen == '') {
92 
+			$last_seen = date('Y-m-d H:i:s');
93 
+		}
92 94 
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
93 95 
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
94 96 
 		try {
 
@@ -100,7 +102,9 @@  discard block
 
 block discarded – undo
100 102 
 	}
101 103
102 104 
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
103 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
105 
+		if ($last_seen == '') {
106 
+			$last_seen = date('Y-m-d H:i:s');
107 
+		}
104 108 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
105 109 
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
106 110 
 		try {
 
@@ -123,7 +127,9 @@  discard block
 
 block discarded – undo
123 127 
 	}
124 128
125 129 
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
126 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
130 
+		if ($last_seen == '') {
131 
+			$last_seen = date('Y-m-d H:i:s');
132 
+		}
127 133 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
128 134 
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
129 135 
 		try {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -15,7 +15,7 @@  discard block
 
 block discarded – undo
15 15 
 		try {
16 16 
 			$sth = $this->db->prepare($query);
17 17 
 			$sth->execute($query_values);
18 
-		} catch(PDOException $e) {
18 
+		} catch (PDOException $e) {
19 19 
 			return "error : ".$e->getMessage();
20 20 
 		}
21 21 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -28,20 +28,20 @@  discard block
 
 block discarded – undo
28 28 
 		try {
29 29 
 			$sth = $this->db->prepare($query);
30 30 
 			$sth->execute($query_values);
31 
-		} catch(PDOException $e) {
31 
+		} catch (PDOException $e) {
32 32 
 			return "error : ".$e->getMessage();
33 33 
 		}
34 34 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
35 35 
 		return $all;
36 36 
 	}
37 37
38 
-	public function getLocationInfobyNameType($name,$type) {
38 
+	public function getLocationInfobyNameType($name, $type) {
39 39 
 		$query = "SELECT * FROM source_location WHERE name = :name AND type = :type";
40 
-		$query_values = array(':name' => $name,':type' => $type);
40 
+		$query_values = array(':name' => $name, ':type' => $type);
41 41 
 		try {
42 42 
 			$sth = $this->db->prepare($query);
43 43 
 			$sth->execute($query_values);
44 
-		} catch(PDOException $e) {
44 
+		} catch (PDOException $e) {
45 45 
 			return "error : ".$e->getMessage();
46 46 
 		}
47 47 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
 		try {
55 55 
 			$sth = $this->db->prepare($query);
56 56 
 			$sth->execute($query_values);
57 
-		} catch(PDOException $e) {
57 
+		} catch (PDOException $e) {
58 58 
 			return "error : ".$e->getMessage();
59 59 
 		}
60 60 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -67,7 +67,7 @@  discard block
 
 block discarded – undo
67 67 
 		try {
68 68 
 			$sth = $this->db->prepare($query);
69 69 
 			$sth->execute($query_values);
70 
-		} catch(PDOException $e) {
70 
+		} catch (PDOException $e) {
71 71 
 			return "error : ".$e->getMessage();
72 72 
 		}
73 73 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -80,7 +80,7 @@  discard block
 
 block discarded – undo
80 80 
 		try {
81 81 
 			$sth = $this->db->prepare($query);
82 82 
 			$sth->execute($query_values);
83 
-		} catch(PDOException $e) {
83 
+		} catch (PDOException $e) {
84 84 
 			return "error : ".$e->getMessage();
85 85 
 		}
86 86 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -93,56 +93,56 @@  discard block
 
 block discarded – undo
93 93 
 		try {
94 94 
 			$sth = $this->db->prepare($query);
95 95 
 			$sth->execute($query_values);
96 
-		} catch(PDOException $e) {
96 
+		} catch (PDOException $e) {
97 97 
 			return "error : ".$e->getMessage();
98 98 
 		}
99 99 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
100 100 
 		return $all;
101 101 
 	}
102 102
103 
-	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
103 
+	public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
104 104 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
105 105 
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
106 
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
106 
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
107 107 
 		try {
108 108 
 			$sth = $this->db->prepare($query);
109 109 
 			$sth->execute($query_values);
110 
-		} catch(PDOException $e) {
110 
+		} catch (PDOException $e) {
111 111 
 			echo "error : ".$e->getMessage();
112 112 
 		}
113 113 
 	}
114 114
115 
-	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
115 
+	public function updateLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
116 116 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
117 117 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
118 
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
118 
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
119 119 
 		try {
120 120 
 			$sth = $this->db->prepare($query);
121 121 
 			$sth->execute($query_values);
122 
-		} catch(PDOException $e) {
122 
+		} catch (PDOException $e) {
123 123 
 			return "error : ".$e->getMessage();
124 124 
 		}
125 125 
 	}
126 126
127 
-	public function updateLocationDescByName($name,$source,$source_id = 0,$description = '') {
127 
+	public function updateLocationDescByName($name, $source, $source_id = 0, $description = '') {
128 128 
 		$query = "UPDATE source_location SET description = :description WHERE source_id = :source_id AND name = :name AND source = :source";
129 
-		$query_values = array(':name' => $name,':source' => $source,':source_id' => $source_id,':description' => $description);
129 
+		$query_values = array(':name' => $name, ':source' => $source, ':source_id' => $source_id, ':description' => $description);
130 130 
 		try {
131 131 
 			$sth = $this->db->prepare($query);
132 132 
 			$sth->execute($query_values);
133 
-		} catch(PDOException $e) {
133 
+		} catch (PDOException $e) {
134 134 
 			return "error : ".$e->getMessage();
135 135 
 		}
136 136 
 	}
137 137
138 
-	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
138 
+	public function updateLocationByLocationID($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id, $last_seen = '', $description = '') {
139 139 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
140 140 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
141 
-		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
141 
+		$query_values = array(':source_id' => $source_id, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
142 142 
 		try {
143 143 
 			$sth = $this->db->prepare($query);
144 144 
 			$sth->execute($query_values);
145 
-		} catch(PDOException $e) {
145 
+		} catch (PDOException $e) {
146 146 
 			echo "error : ".$e->getMessage();
147 147 
 		}
148 148 
 	}
 
@@ -153,7 +153,7 @@  discard block
 
 block discarded – undo
153 153 
 		try {
154 154 
 			$sth = $this->db->prepare($query);
155 155 
 			$sth->execute($query_values);
156 
-		} catch(PDOException $e) {
156 
+		} catch (PDOException $e) {
157 157 
 			return "error : ".$e->getMessage();
158 158 
 		}
159 159 
 	}
 
@@ -164,7 +164,7 @@  discard block
 
 block discarded – undo
164 164 
 		try {
165 165 
 			$sth = $this->db->prepare($query);
166 166 
 			$sth->execute($query_values);
167 
-		} catch(PDOException $e) {
167 
+		} catch (PDOException $e) {
168 168 
 			return "error : ".$e->getMessage();
169 169 
 		}
170 170 
 	}
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
 		try {
176 176 
 			$sth = $this->db->prepare($query);
177 177 
 			$sth->execute($query_values);
178 
-		} catch(PDOException $e) {
178 
+		} catch (PDOException $e) {
179 179 
 			return "error : ".$e->getMessage();
180 180 
 		}
181 181 
 	}
 
@@ -185,7 +185,7 @@  discard block
 
 block discarded – undo
185 185 
 		try {
186 186 
 			$sth = $this->db->prepare($query);
187 187 
 			$sth->execute();
188 
-		} catch(PDOException $e) {
188 
+		} catch (PDOException $e) {
189 189 
 			return "error : ".$e->getMessage();
190 190 
 		}
191 191 
 	}
 
@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		try {
215 215 
 			$sth = $this->db->prepare($query);
216 216 
 			$sth->execute(array(':type' => $type));
217 
-		} catch(PDOException $e) {
217 
+		} catch (PDOException $e) {
218 218 
 			return "error";
219 219 
 		}
220 220 
 		return "success";
Please login to merge, or discard this patch.
js/map.2d.js.php 3 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@  discard block
 
 block discarded – undo
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 4
5 
-setcookie("MapFormat",'2d');
5 
+setcookie("MapFormat", '2d');
6 6
7 7 
 if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
8 8 
 // Compressed GeoJson is used if true
 
@@ -20,10 +20,10 @@  discard block
 
 block discarded – undo
20 20 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21 21 
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22 22 
 	else $enddate = time();
23 
-	setcookie("archive_begin",$begindate);
24 
-	setcookie("archive_end",$enddate);
25 
-	setcookie("archive_update",$lastupd);
26 
-	setcookie("archive_speed",$archivespeed);
23 
+	setcookie("archive_begin", $begindate);
24 
+	setcookie("archive_end", $enddate);
25 
+	setcookie("archive_update", $lastupd);
26 
+	setcookie("archive_speed", $archivespeed);
27 27 
 ?>
28 28 
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
29 29 
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 
@@ -74,16 +74,16 @@  discard block
 
 block discarded – undo
74 74 
 <?php
75 75 
 	}
76 76 
 	if (isset($_GET['ident'])) {
77 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
77 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
78 78 
 	}
79 79 
 	if (isset($_GET['flightaware_id'])) {
80 
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
80 
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
81 81 
 	}
82 82 
 	if (isset($_GET['latitude'])) {
83 
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
83 
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
84 84 
 	}
85 85 
 	if (isset($_GET['longitude'])) {
86 
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
86 
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
87 87 
 	}
88 88 
 ?>
89 89 
 
@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 	     || navigator.userAgent.match(/BlackBerry/i)
120 120 
 	     || navigator.userAgent.match(/Windows Phone/i))
121 121 
 	{
122 
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
122 
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
123 123 
 	} else {
124 124 
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
125 125 
 	}
 
@@ -213,19 +213,19 @@  discard block
 
 block discarded – undo
213 213 
 	map.addLayer(yandexLayer);
214 214 
 <?php
215 215 
 	} elseif ($MapType == 'Bing-Aerial') {
216 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
216 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
217 217 
 ?>
218 218 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
219 219 
 	map.addLayer(bingLayer);
220 220 
 <?php
221 221 
 	} elseif ($MapType == 'Bing-Hybrid') {
222 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
222 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
223 223 
 ?>
224 224 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
225 225 
 	map.addLayer(bingLayer);
226 226 
 <?php
227 227 
 	} elseif ($MapType == 'Bing-Road') {
228 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
228 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
229 229 
 ?>
230 230 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
231 231 
 	map.addLayer(bingLayer);
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -385,10 +385,10 @@  discard block
 
 block discarded – undo
385 385 
 setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
386 386
387 387 
 <?php
388 
-    // Add support for custom json via $globalMapJson
389 
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
388 
+	// Add support for custom json via $globalMapJson
389 
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
390 390 
 	foreach ($globalMapJson as $json) {
391 
-	    if (isset($json['url'])) {
391 
+		if (isset($json['url'])) {
392 392 
 ?>
393 393 
 update_genLayer('<?php print $json['url']; ?>');
394 394 
 <?php
 
@@ -397,9 +397,9 @@  discard block
 
 block discarded – undo
397 397 
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
398 398 
 <?php
399 399 
 		}
400 
-	    }
400 
+		}
401 
+	}
401 402 
 	}
402 
-    }
403 403
404 404 
 ?>
405 405 
 //adds the bootstrap tooltip to the map icons
Please login to merge, or discard this patch.
Braces   +101 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -4,10 +4,15 @@  discard block
 
 block discarded – undo
4 4
5 5 
 setcookie("MapFormat",'2d');
6 6
7 
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
7 
+if (!isset($globalOpenWeatherMapKey)) {
8 
+	$globalOpenWeatherMapKey = '';
9 
+}
8 10 
 // Compressed GeoJson is used if true
9 
-if (!isset($globalJsonCompress)) $compress = true;
10 
-else $compress = $globalJsonCompress;
11 
+if (!isset($globalJsonCompress)) {
12 
+	$compress = true;
13 
+} else {
14 
+	$compress = $globalJsonCompress;
15 
+}
11 16 
 if (isset($_GET['archive'])) {
12 17 
 	$archive = true;
13 18 
 	//$archiveupdatetime = 50;
 
@@ -18,8 +23,11 @@  discard block
 
 block discarded – undo
18 23 
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
19 24 
 	//$lastupd = 20;
20 25 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21 
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22 
-	else $enddate = time();
26 
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
27 
+		$enddate = $_GET['enddate'];
28 
+	} else {
29 
+		$enddate = time();
30 
+	}
23 31 
 	setcookie("archive_begin",$begindate);
24 32 
 	setcookie("archive_end",$enddate);
25 33 
 	setcookie("archive_update",$lastupd);
 
@@ -106,7 +114,17 @@  discard block
 
 block discarded – undo
106 114 
 	}
107 115
108 116 
 	//create the map
109 
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
117 
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
118 
+	print $latitude;
119 
+} else {
120 
+	print $globalCenterLatitude;
121 
+}
122 
+?>,<?php if (isset($longitude)) {
123 
+	print $longitude;
124 
+} else {
125 
+	print $globalCenterLongitude;
126 
+}
127 
+?>], zoom);
110 128 
 <?php
111 129 
 	} else {
112 130 
 ?>
 
@@ -119,9 +137,19 @@  discard block
 
 block discarded – undo
119 137 
 	     || navigator.userAgent.match(/BlackBerry/i)
120 138 
 	     || navigator.userAgent.match(/Windows Phone/i))
121 139 
 	{
122 
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
140 
+		var zoom = <?php if (isset($globalLiveZoom)) {
141 
+	print $globalLiveZoom-1;
142 
+} else {
143 
+	print '8';
144 
+}
145 
+?>;
123 146 
 	} else {
124 
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
147 
+		var zoom = <?php if (isset($globalLiveZoom)) {
148 
+	print $globalLiveZoom;
149 
+} else {
150 
+	print '9';
151 
+}
152 
+?>;
125 153 
 	}
126 154
127 155 
 	//create the map
 
@@ -146,16 +174,27 @@  discard block
 
 block discarded – undo
146 174 
 	bounds = L.latLngBounds(southWest,northEast);
147 175 
 	//a few title layers
148 176 
 <?php
149 
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
150 
-	else $MapType = $globalMapProvider;
177 
+	if (isset($_COOKIE['MapType'])) {
178 
+		$MapType = $_COOKIE['MapType'];
179 
+	} else {
180 
+		$MapType = $globalMapProvider;
181 
+	}
151 182
152 183 
 	if ($MapType == 'Mapbox') {
153 
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
154 
-		else $MapBoxId = $_COOKIE['MapTypeId'];
155 
-?>
184 
+		if ($_COOKIE['MapTypeId'] == 'default') {
185 
+			$MapBoxId = $globalMapboxId;
186 
+		} else {
187 
+			$MapBoxId = $_COOKIE['MapTypeId'];
188 
+		}
189 
+		?>
156 190 
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
157 191 
 	    maxZoom: 18,
158 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
192 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
193 
+	print 'false';
194 
+} else {
195 
+	print 'true';
196 
+}
197 
+?>,
159 198 
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
160 199 
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
161 200 
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
 
@@ -167,7 +206,12 @@  discard block
 
 block discarded – undo
167 206 
 ?>
168 207 
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
169 208 
 	    maxZoom: 18,
170 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
209 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
210 
+	print 'false';
211 
+} else {
212 
+	print 'true';
213 
+}
214 
+?>,
171 215 
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
172 216 
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
173 217 
 	}).addTo(map);
 
@@ -213,20 +257,26 @@  discard block
 
 block discarded – undo
213 257 
 	map.addLayer(yandexLayer);
214 258 
 <?php
215 259 
 	} elseif ($MapType == 'Bing-Aerial') {
216 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
217 
-?>
260 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
261 
+			setcookie('MapType','OpenStreetMap');
262 
+		}
263 
+		?>
218 264 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
219 265 
 	map.addLayer(bingLayer);
220 266 
 <?php
221 267 
 	} elseif ($MapType == 'Bing-Hybrid') {
222 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
223 
-?>
268 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
269 
+			setcookie('MapType','OpenStreetMap');
270 
+		}
271 
+		?>
224 272 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
225 273 
 	map.addLayer(bingLayer);
226 274 
 <?php
227 275 
 	} elseif ($MapType == 'Bing-Road') {
228 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
229 
-?>
276 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
277 
+			setcookie('MapType','OpenStreetMap');
278 
+		}
279 
+		?>
230 280 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
231 281 
 	map.addLayer(bingLayer);
232 282 
 <?php
 
@@ -249,9 +299,24 @@  discard block
 
 block discarded – undo
249 299 
 		$customid = $MapType;
250 300 
 ?>
251 301 
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
252 
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
253 
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
254 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
302 
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
303 
+	print $globalMapCustomLayer[$customid]['maxZoom'];
304 
+} else {
305 
+	print '18';
306 
+}
307 
+?>,
308 
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
309 
+	print $globalMapCustomLayer[$customid]['minZoom'];
310 
+} else {
311 
+	print '0';
312 
+}
313 
+?>,
314 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
315 
+	print 'false';
316 
+} else {
317 
+	print 'true';
318 
+}
319 
+?>,
255 320 
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
256 321 
 	}).addTo(map);
257 322 
 
@@ -285,7 +350,12 @@  discard block
 
 block discarded – undo
285 350 
 		}
286 351 
 	} elseif ($globalBounding == 'circle') {
287 352 
 ?>
288 
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
353 
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
354 
+	print $globalBoundingCircleSize;
355 
+} else {
356 
+	print '70000';
357 
+}
358 
+?>,{
289 359 
 	    color: '#92C7D1',
290 360 
 	    fillColor: '#92C7D1',
291 361 
 	    fillOpacity: 0.3,
 
@@ -382,7 +452,12 @@  discard block
 
 block discarded – undo
382 452 
 		//}
383 453 
 	});
384 454 
 update_locationsLayer();
385 
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
455 
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
456 
+	print $globalMapRefresh*1000*2;
457 
+} else {
458 
+	print '60000';
459 
+}
460 
+?>);
386 461
387 462 
 <?php
388 463 
     // Add support for custom json via $globalMapJson
Please login to merge, or discard this patch.
require/class.Elevation.php 3 patches
Doc Comments   +11 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -52,6 +52,10 @@  discard block
 
 block discarded – undo
52 52 
 		$this->openedFiles = [];
53 53 
 	}
54 54
55 
+	/**
56 
+	 * @param double $row
57 
+	 * @param double $column
58 
+	 */
55 59 
 	private function getElevationAtPosition($fileName, $row, $column) {
56 60 
 		if (!array_key_exists($fileName, $this->openedFiles)) {
57 61 
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
 
@@ -85,7 +89,7 @@  discard block
 
 block discarded – undo
85 89 
 	 * @param float $lon
86 90 
 	 * @param null  $fName
87 91 
 	 *
88 
-	 * @return mixed
92 
+	 * @return double
89 93 
 	 * @throws \Exception
90 94 
 	 */
91 95 
 	public function getElevation($lat, $lon, &$fName = null) {
 
@@ -142,6 +146,9 @@  discard block
 
 block discarded – undo
142 146 
 		return $zN;
143 147 
 	}
144 148
149 
+	/**
150 
+	 * @param integer $numPrefix
151 
+	 */
145 152 
 	private function getDeg($deg, $numPrefix) {
146 153 
 		$deg = abs($deg);
147 154 
 		$d   = floor($deg);     // round degrees
 
@@ -156,6 +163,9 @@  discard block
 
 block discarded – undo
156 163 
 		return $d;
157 164 
 	}
158 165
166 
+	/**
167 
+	 * @param double $deg
168 
+	 */
159 169 
 	private function getSec($deg) {
160 170 
 		$deg = abs($deg);
161 171 
 		$sec = round($deg * 3600, 4);
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -41,7 +41,7 @@  discard block
 
 block discarded – undo
41 41 
 			default:
42 42 
 				throw new \Exception("bad resolution can be only one of 1,3");
43 43 
 		}
44 
-		register_shutdown_function(function () {
44 
+		register_shutdown_function(function() {
45 45 
 			$this->closeAllFiles();
46 46 
 		});
47 47 
 	}
 
@@ -55,10 +55,10 @@  discard block
 
 block discarded – undo
55 55
56 56 
 	private function getElevationAtPosition($fileName, $row, $column) {
57 57 
 		if (!array_key_exists($fileName, $this->openedFiles)) {
58 
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
58 
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
59 59 
 				throw new \Exception("File '{$fileName}' not exists.");
60 60 
 			}
61 
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
61 
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
62 62 
 			if ($file === false) {
63 63 
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
64 64 
 			}
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 			throw new \Exception("Not implemented yet");
73 73 
 		}
74 74 
 		$aRow     = $this->measPerDeg - $row;
75 
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
75 
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
76 76 
 		$position *= 2;
77 77 
 		fseek($file, $position);
78 78 
 		$short  = fread($file, 2);
 
@@ -100,8 +100,8 @@  discard block
 
 block discarded – undo
100 100 
 		$latSec = $this->getSec($lat);
101 101 
 		$lonSec = $this->getSec($lon);
102 102
103 
-		$Xn = round($latSec / $this->resolution, 3);
104 
-		$Yn = round($lonSec / $this->resolution, 3);
103 
+		$Xn = round($latSec/$this->resolution, 3);
104 
+		$Yn = round($lonSec/$this->resolution, 3);
105 105
106 106 
 		$a1 = round($Xn);
107 107 
 		$a2 = round($Yn);
 
@@ -133,55 +133,55 @@  discard block
 
 block discarded – undo
133 133 
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
134 134 
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
135 135
136 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
137 
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
138 
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
136 
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
137 
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
138 
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
139 139
140 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
141 
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
140 
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
141 
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
142 142
143 143 
 		return $zN;
144 144 
 	}
145 145
146 146 
 	private function getDeg($deg, $numPrefix) {
147 147 
 		$deg = abs($deg);
148 
-		$d   = floor($deg);     // round degrees
148 
+		$d   = floor($deg); // round degrees
149 149 
 		if ($numPrefix >= 3) {
150 150 
 			if ($d < 100) {
151 
-				$d = '0' . $d;
151 
+				$d = '0'.$d;
152 152 
 			}
153 153 
 		} // pad with leading zeros
154 154 
 		if ($d < 10) {
155 
-			$d = '0' . $d;
155 
+			$d = '0'.$d;
156 156 
 		}
157 157 
 		return $d;
158 158 
 	}
159 159
160 160 
 	private function getSec($deg) {
161 161 
 		$deg = abs($deg);
162 
-		$sec = round($deg * 3600, 4);
163 
-		$m   = fmod(floor($sec / 60), 60);
162 
+		$sec = round($deg*3600, 4);
163 
+		$m   = fmod(floor($sec/60), 60);
164 164 
 		$s   = round(fmod($sec, 60), 4);
165 
-		return ($m * 60) + $s;
165 
+		return ($m*60) + $s;
166 166 
 	}
167 167
168 
-	public function download($lat,$lon, $debug = false) {
168 
+	public function download($lat, $lon, $debug = false) {
169 169 
 		$N      = $this->getDeg($lat, 2);
170 170 
 		$E      = $this->getDeg($lon, 3);
171 
-		$fileName  = "N{$N}E{$E}.hgt";
172 
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
171 
+		$fileName = "N{$N}E{$E}.hgt";
172 
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
173 173 
 			$Common = new Common();
174 174 
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
175 
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176 
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
175 
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
176 
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
177 177 
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
178 178 
 				return false;
179 179 
 			}
180 180 
 			if ($debug) echo 'Done'."\n";
181 181 
 			if ($debug) echo 'Decompress '.$fileName.' ....';
182 
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
182 
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
183 183 
 			if ($debug) echo 'Done'."\n";
184 
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
184 
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
185 185 
 		}
186 186 
 		return true;
187 187 
 	}
 
@@ -194,11 +194,11 @@  discard block
 
 block discarded – undo
194 194 
 		try {
195 195 
 			$sth = $db->prepare($query);
196 196 
 			$sth->execute($query_values);
197 
-		} catch(PDOException $e) {
197 
+		} catch (PDOException $e) {
198 198 
 			return "error : ".$e->getMessage();
199 199 
 		}
200 200 
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
201 
-			$this->download($data['latitude'],$data['longitude'],true);
201 
+			$this->download($data['latitude'], $data['longitude'], true);
202 202 
 		}
203 203 
 		$db = $Connection->db;
204 204 
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 100';
 
@@ -206,11 +206,11 @@  discard block
 
 block discarded – undo
206 206 
 		try {
207 207 
 			$sth = $db->prepare($query);
208 208 
 			$sth->execute($query_values);
209 
-		} catch(PDOException $e) {
209 
+		} catch (PDOException $e) {
210 210 
 			return "error : ".$e->getMessage();
211 211 
 		}
212 212 
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
213 
-			$this->download($data['latitude'],$data['longitude'],true);
213 
+			$this->download($data['latitude'], $data['longitude'], true);
214 214 
 		}
215 215 
 	}
216 216 
 }
Please login to merge, or discard this patch.
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -28,7 +28,9 @@  discard block
 
 block discarded – undo
28 28 
 	private $openedFiles = [];
29 29
30 30 
 	public function __construct($htgFilesDestination = '', $resolution = 3) {
31 
-		if ($htgFilesDestination == '') $htgFilesDestination = dirname(__FILE__).'/../data/';
31 
+		if ($htgFilesDestination == '') {
32 
+			$htgFilesDestination = dirname(__FILE__).'/../data/';
33 
+		}
32 34 
 		$this->htgFilesDestination = $htgFilesDestination;
33 35 
 		$this->resolution          = $resolution;
34 36 
 		switch ($resolution) {
 
@@ -171,16 +173,26 @@  discard block
 
 block discarded – undo
171 173 
 		$fileName  = "N{$N}E{$E}.hgt";
172 174 
 		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
173 175 
 			$Common = new Common();
174 
-			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
176 
+			if ($debug) {
177 
+				echo 'Downloading '.$fileName.'.gz ...';
178 
+			}
175 179 
 			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176 180 
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
177 
-				if ($debug) echo "File '{$fileName}.gz' not exists.";
181 
+				if ($debug) {
182 
+					echo "File '{$fileName}.gz' not exists.";
183 
+				}
178 184 
 				return false;
179 185 
 			}
180 
-			if ($debug) echo 'Done'."\n";
181 
-			if ($debug) echo 'Decompress '.$fileName.' ....';
186 
+			if ($debug) {
187 
+				echo 'Done'."\n";
188 
+			}
189 
+			if ($debug) {
190 
+				echo 'Decompress '.$fileName.' ....';
191 
+			}
182 192 
 			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
183 
-			if ($debug) echo 'Done'."\n";
193 
+			if ($debug) {
194 
+				echo 'Done'."\n";
195 
+			}
184 196 
 			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
185 197 
 		}
186 198 
 		return true;
Please login to merge, or discard this patch.
aircraft-data.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -11,14 +11,14 @@  discard block
 
 block discarded – undo
11 11
12 12 
 $from_archive = false;
13 13 
 if (isset($_GET['ident'])) {
14 
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
14 
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
15 15 
 	if (isset($_GET['currenttime'])) {
16 
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
16 
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
17 17 
 		$currenttime = round($currenttime/1000);
18 
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
18 
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
19 19 
 		if (empty($spotter_array)) {
20 20 
 			$from_archive = true;
21 
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
21 
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
22 22 
 		}
23 23 
 	} else {
24 24 
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
 
@@ -29,15 +29,15 @@  discard block
 
 block discarded – undo
29 29 
 	}
30 30 
 }
31 31 
 if (isset($_GET['flightaware_id'])) {
32 
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
32 
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
33 33 
 	if (isset($_GET['currenttime'])) {
34 
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
34 
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
35 35 
 		$currenttime = round($currenttime/1000);
36 
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
36 
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
37 37 
 		if (empty($spotter_array)) {
38 38 
 			$from_archive = true;
39 39 
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
40 
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
40 
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
41 41 
 		}
42 42 
 	} else {
43 43 
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
57 57 
 {
58 58 
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
59 
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
59 
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
60 60 
 	} else $image = $spotter_item['image_thumbnail'];
61 61
62 62 
 }
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
 	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
78 78 
 	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
79 79 
 		if ($spotter_item['departure_airport_time'] > 2460) {
80 
-			print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
80 
+			print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
81 81 
 		} else {
82 82 
 			print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
83 83 
 		}
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
 	print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
87 87 
 	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
88 88 
 		if ($spotter_item['arrival_airport_time'] > 2460) {
89 
-			print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
89 
+			print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
90 90 
 		} else {
91 91 
 			print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
92 92 
 		}
 
@@ -111,8 +111,8 @@  discard block
 
 block discarded – undo
111 111 
 print '<div id ="altitude"><span>'._("Altitude").'</span>';
112 112 
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
113 113 
 	try {
114 
-		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
115 
-	} catch(Exception $e) {
114 
+		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
115 
+	} catch (Exception $e) {
116 116 
 	}
117 117 
 }
118 118 
 
@@ -181,7 +181,7 @@  discard block
 
 block discarded – undo
181 181
182 182 
 if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
183 183 
 if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
184 
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
184 
+if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
185 185 
 if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
186 186 
 print '</div>';
187 187 
 ?>
Please login to merge, or discard this patch.
Braces   +51 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -57,7 +57,9 @@  discard block
 
 block discarded – undo
57 57 
 {
58 58 
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
59 59 
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
60 
-	} else $image = $spotter_item['image_thumbnail'];
60 
+	} else {
61 
+		$image = $spotter_item['image_thumbnail'];
62 
+	}
61 63
62 64 
 }
63 65 
 /* else {
 
@@ -70,8 +72,12 @@  discard block
 
 block discarded – undo
70 72 
 }
71 73 
 print '<div class="right">';
72 74 
 print '<div class="callsign-details">';
73 
-if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
74 
-if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
75 
+if ($spotter_item['ident'] != 'Not Available') {
76 
+	print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
77 
+}
78 
+if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
79 
+	print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
80 
+}
75 81 
 print '</div>';
76 82 
 if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
77 83 
 	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 
@@ -103,10 +109,16 @@  discard block
 
 block discarded – undo
103 109 
 print '</div>';
104 110 
 print '<div id="aircraft">';
105 111 
 print '<span>'._("Aircraft").'</span>';
106 
-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
107 
-if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
108 
-elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
109 
-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
112 
+if (isset($spotter_item['aircraft_wiki'])) {
113 
+	print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
114 
+}
115 
+if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
116 
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
117 
+} elseif (isset($spotter_item['aircraft_type'])) {
118 
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
119 
+} else {
120 
+	print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
121 
+}
110 122 
 print '</div>';
111 123 
 print '<div id ="altitude"><span>'._("Altitude").'</span>';
112 124 
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 
@@ -117,12 +129,18 @@  discard block
 
 block discarded – undo
117 129 
 }
118 130
119 131 
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
120 
-	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
121 
-	else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
122 
-} else {
123 
-	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
124 
-	else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
125 
-}
132 
+	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
133 
+		print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
134 
+	} else {
135 
+		print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
136 
+	}
137 
+	} else {
138 
+	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
139 
+		print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
140 
+	} else {
141 
+		print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
142 
+	}
143 
+	}
126 144
127 145 
 if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*30.48) {
128 146 
 	print '<br>';
 
@@ -136,7 +154,9 @@  discard block
 
 block discarded – undo
136 154 
 }
137 155
138 156 
 print '</div>';
139 
-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
157 
+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
158 
+	print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
159 
+}
140 160 
 print '<div id="speed"><span>'._("Speed").'</span>';
141 161 
 if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
142 162 
 	print round($spotter_item['ground_speed']*1.15078).' mph';
 
@@ -150,8 +170,11 @@  discard block
 
 block discarded – undo
150 170 
 print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
151 171 
 if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
152 172 
 	print '<div id="pilot"><span>'._("Pilot").'</span>';
153 
-	if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
154 
-	else print $spotter_item['pilot_name'];
173 
+	if (isset($spotter_item['pilot_id'])) {
174 
+		print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
175 
+	} else {
176 
+		print $spotter_item['pilot_name'];
177 
+	}
155 178 
 	print '</div>';
156 179 
 }
157 180 
 
@@ -179,10 +202,18 @@  discard block
 
 block discarded – undo
179 202 
 print '</div>';
180 203 
 print '</div>';
181 204
182 
-if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
183 
-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
184 
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
185 
-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
205 
+if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
206 
+	print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
207 
+}
208 
+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
209 
+	print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
210 
+}
211 
+if (isset($spotter_item['acars']['message'])) {
212 
+	print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
213 
+}
214 
+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
215 
+	print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
216 
+}
186 217 
 print '</div>';
187 218 
 ?>
188 219 
 </div>
189 220 
\ No newline at end of file
Please login to merge, or discard this patch.
search-ajax.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -5,7 +5,7 @@  discard block
 
 block discarded – undo
5 5 
 $Spotter = new Spotter();
6 6 
 $orderby = $Spotter->getOrderBy();
7 7
8 
-$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING);
8 
+$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING);
9 9 
 if ($ask == 'aircraftsdetected') {
10 10 
 	require_once('require/class.SpotterLive.php');
11 11 
 	$SpotterLive = new SpotterLive();
 
@@ -24,15 +24,15 @@  discard block
 
 block discarded – undo
24 24 
 } elseif ($ask == 'manufacturer') {
25 25 
 	$manufacturers = $Spotter->getAllManufacturers();
26 26 
 	$all_manufacturers = array();
27 
-	foreach($manufacturers as $manufacturer)
27 
+	foreach ($manufacturers as $manufacturer)
28 28 
 	{
29 
-		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer'])));
29 
+		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer'])));
30 30 
 	}
31 31 
 	echo json_encode($all_manufacturers);
32 32 
 } elseif ($ask == 'aircrafttypes') {
33 33 
 	$aircraft_types = $Spotter->getAllAircraftTypes();
34 34 
 	$all_aircraft_types = array();
35 
-	foreach($aircraft_types as $aircraft_type)
35 
+	foreach ($aircraft_types as $aircraft_type)
36 36 
 	{
37 37 
 		$all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')');
38 38 
 	}
 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
 } elseif ($ask == 'airlinenames') {
41 41 
 	$airline_names = $Spotter->getAllAirlineNames();
42 42 
 	$all_airline_names = array();
43 
-	foreach($airline_names as $airline_name)
43 
+	foreach ($airline_names as $airline_name)
44 44 
 	{
45 45 
 		$all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')');
46 46 
 	}
 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
 } elseif ($ask == 'airlinecountries') {
49 49 
 	$airline_countries = $Spotter->getAllAirlineCountries();
50 50 
 	$all_airline_countries = array();
51 
-	foreach($airline_countries as $airline_country)
51 
+	foreach ($airline_countries as $airline_country)
52 52 
 	{
53 53 
 		$all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']);
54 54 
 	}
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
 	$airport_names = $Spotter->getAllAirportNames();
58 58 
 	ksort($airport_names);
59 59 
 	$all_airport_names = array();
60 
-	foreach($airport_names as $airport_name)
60 
+	foreach ($airport_names as $airport_name)
61 61 
 	{
62 62 
 		$all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')');
63 63 
 	}
 
@@ -65,7 +65,7 @@  discard block
 
 block discarded – undo
65 65 
 } elseif ($ask == 'airportcountries') {
66 66 
 	$airport_countries = $Spotter->getAllAirportCountries();
67 67 
 	$all_airport_countries = array();
68 
-	foreach($airport_countries as $airport_country)
68 
+	foreach ($airport_countries as $airport_country)
69 69 
 	{
70 70 
 		$all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']);
71 71 
 	}
Please login to merge, or discard this patch.
require/class.GeoidHeight.php 3 patches
Doc Comments   +4 added lines patch added patch discarded remove patch 
@@ -91,6 +91,10 @@
 
 block discarded – undo
91 91 
 		$this->rlatres = (($this->height - 1) / 180.0);
92 92 
 	}
93 93
94 
+	/**
95 
+	 * @param integer $ix
96 
+	 * @param integer $iy
97 
+	 */
94 98 
 	private function _rawval($ix,$iy) {
95 99 
 		if (($iy < 0)) {
96 100 
 			$iy = -$iy;
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch 
@@ -11,7 +11,7 @@  discard block
 
 block discarded – undo
11 11 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
12 12 
 * by Ycarus <[email protected]> in 2017
13 13 
 */
14 
-class GeoidHeight  {
14 
+class GeoidHeight {
15 15 
 	private $c0 = 240;
16 16 
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
17 17 
 	private $c0n = 372;
 
@@ -34,7 +34,7 @@  discard block
 
 block discarded – undo
34 34 
 	private $v10 = null;
35 35 
 	private $v11 = null;
36 36
37 
-	public function __construct($name='') {
37 
+	public function __construct($name = '') {
38 38 
 		global $globalGeoidSource;
39 39 
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
40 40 
 		if ($name == '') {
 
@@ -42,35 +42,35 @@  discard block
 
 block discarded – undo
42 42 
 			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
43 43 
 		}
44 44
45 
-		$f = @fopen($name,"r");
45 
+		$f = @fopen($name, "r");
46 46 
 		if ($f === FALSE) {
47 47 
 			throw new Exception("Can't open ".$name);
48 48 
 		}
49 
-		$line = fgets($f,4096);
49 
+		$line = fgets($f, 4096);
50 50 
 		if (trim($line) != 'P5') {
51 51 
 			throw new Exception('No PGM header');
52 52 
 		}
53 53 
 		$headerlen = strlen($line);
54 54 
 		while (true) {
55 
-			$line = fgets($f,4096);
55 
+			$line = fgets($f, 4096);
56 56 
 			if ((strlen($line) == 0)) {
57 57 
 				throw new Exception('EOF before end of file header');
58 58 
 			}
59 59 
 			$headerlen += strlen($line);
60 
-			if (strpos($line,'# Offset ') !== FALSE) {
60 
+			if (strpos($line, '# Offset ') !== FALSE) {
61 61 
 				$this->offset = substr($line, 9);
62 
-			} else if (strpos($line,'# Scale ') !== FALSE) {
62 
+			} else if (strpos($line, '# Scale ') !== FALSE) {
63 63 
 				$this->scale = substr($line, 8);
64 
-			} else if ((strpos($line,'#') === FALSE)) {
65 
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
64 
+			} else if ((strpos($line, '#') === FALSE)) {
65 
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
66 66 
 				break;
67 67 
 			}
68 68 
 		}
69 
-		$line = fgets($f,4096);
69 
+		$line = fgets($f, 4096);
70 70 
 		$headerlen += strlen($line);
71 
-		$levels = (int)$line;
72 
-		$this->width = (int)$this->width;
73 
-		$this->height = (int)$this->height;
71 
+		$levels = (int) $line;
72 
+		$this->width = (int) $this->width;
73 
+		$this->height = (int) $this->height;
74 74 
 		if (($levels != 65535)) {
75 75 
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
76 76 
 		}
 
@@ -85,42 +85,42 @@  discard block
 
 block discarded – undo
85 85 
 		}
86 86
87 87 
 		$fullsize = filesize($name);
88 
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
88 
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
89 89 
 			throw new Exception('File has the wrong length');
90 90 
 		}
91 91
92 92 
 		$this->headerlen = $headerlen;
93 
-		$this->raw= $f;
94 
-		$this->rlonres = ($this->width / 360.0);
95 
-		$this->rlatres = (($this->height - 1) / 180.0);
93 
+		$this->raw = $f;
94 
+		$this->rlonres = ($this->width/360.0);
95 
+		$this->rlatres = (($this->height - 1)/180.0);
96 96 
 	}
97 97
98 
-	private function _rawval($ix,$iy) {
98 
+	private function _rawval($ix, $iy) {
99 99 
 		if (($iy < 0)) {
100 100 
 			$iy = -$iy;
101 
-			$ix += ($this->width / 2);
101 
+			$ix += ($this->width/2);
102 102 
 		} else if (($iy >= $this->height)) {
103 
-			$iy = ((2 * ($this->height - 1)) - $iy);
104 
-			$ix += ($this->width / 2);
103 
+			$iy = ((2*($this->height - 1)) - $iy);
104 
+			$ix += ($this->width/2);
105 105 
 		}
106 106 
 		if (($ix < 0)) {
107 107 
 			$ix += $this->width;
108 108 
 		} else if (($ix >= $this->width)) {
109 109 
 			$ix -= $this->width;
110 110 
 		}
111 
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
112 
-		fseek($this->raw,$k);
113 
-		return unpack('n',fread($this->raw,2))[1];
111 
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
112 
+		fseek($this->raw, $k);
113 
+		return unpack('n', fread($this->raw, 2))[1];
114 114 
 	}
115 115
116 
-	public function get($lat,$lon,$cubic=true) {
116 
+	public function get($lat, $lon, $cubic = true) {
117 117 
 		if (($lon < 0)) {
118 118 
 			$lon += 360;
119 119 
 		}
120 
-		$fy = ((90 - $lat) * $this->rlatres);
121 
-		$fx = ($lon * $this->rlonres);
122 
-		$iy = (int)$fy;
123 
-		$ix = (int)$fx;
120 
+		$fy = ((90 - $lat)*$this->rlatres);
121 
+		$fx = ($lon*$this->rlonres);
122 
+		$iy = (int) $fy;
123 
+		$ix = (int) $fx;
124 124 
 		$fx -= $ix;
125 125 
 		$fy -= $iy;
126 126 
 		$t = array();
 
@@ -147,7 +147,7 @@  discard block
 
 block discarded – undo
147 147 
 					$c3x = $this->c3;
148 148 
 					$c0x = $this->c0;
149 149 
 				}
150 
-				for ($i = 0; $i < 10;++$i) {
150 
+				for ($i = 0; $i < 10; ++$i) {
151 151 
 					$t[$i] = 0;
152 152 
 					for ($j = 0; $j < 12; ++$j) {
153 153 
 						$t[$i] += $v[$j]*$c3x[$j][$i];
 
@@ -158,13 +158,13 @@  discard block
 
 block discarded – undo
158 158 
 			$this->t = $t;
159 159 
 		} else $t = $this->t;
160 160 
 		if (!($cubic)) {
161 
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
162 
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
163 
-			$h = (((1 - $fy) * $a) + ($fy * $b));
161 
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
162 
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
163 
+			$h = (((1 - $fy)*$a) + ($fy*$b));
164 164 
 		} else {
165 
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
165 
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
166 166 
 		}
167 
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
167 
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
168 168 
 	}
169 169 
 }
170 170 
 /*
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -38,8 +38,11 @@  discard block
 
 block discarded – undo
38 38 
 		global $globalGeoidSource;
39 39 
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
40 40 
 		if ($name == '') {
41 
-			if (isset($globalGeoidSource) && $globalGeoidSource != '') $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
42 
-			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
41 
+			if (isset($globalGeoidSource) && $globalGeoidSource != '') {
42 
+				$name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
43 
+			} else {
44 
+				$name = dirname(__FILE__).'/../data/egm96-15.pgm';
45 
+			}
43 46 
 		}
44 47
45 48 
 		$f = @fopen($name,"r");
 
@@ -156,7 +159,9 @@  discard block
 
 block discarded – undo
156 159 
 				}
157 160 
 			}
158 161 
 			$this->t = $t;
159 
-		} else $t = $this->t;
162 
+		} else {
163 
+			$t = $this->t;
164 
+		}
160 165 
 		if (!($cubic)) {
161 166 
 			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
162 167 
 			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
Please login to merge, or discard this patch.
install/class.update_schema.php 3 patches
Indentation   +642 added lines, -642 removed lines patch added patch discarded remove patch 
@@ -8,18 +8,18 @@  discard block
 
 block discarded – undo
8 8 
 class update_schema {
9 9
10 10 
 	public static function update_schedule() {
11 
-	    $Connection = new Connection();
12 
-	    $Schedule = new Schedule();
13 
-	    $query = "SELECT * FROM schedule";
14 
-            try {
15 
-            	$sth = $Connection->db->prepare($query);
11 
+		$Connection = new Connection();
12 
+		$Schedule = new Schedule();
13 
+		$query = "SELECT * FROM schedule";
14 
+			try {
15 
+				$sth = $Connection->db->prepare($query);
16 16 
 		$sth->execute();
17 
-    	    } catch(PDOException $e) {
17 
+			} catch(PDOException $e) {
18 18 
 		return "error : ".$e->getMessage()."\n";
19 
-    	    }
20 
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22 
-    	    }
19 
+			}
20 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22 
+			}
23 23
24 24 
 	}
25 25 
 /*
 
@@ -43,198 +43,198 @@  discard block
 
 block discarded – undo
43 43 
     	}
44 44 
 */
45 45 
 	private static function update_from_1() {
46 
-    		$Connection = new Connection();
47 
-    		// Add new column to routes table
48 
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
46 
+			$Connection = new Connection();
47 
+			// Add new column to routes table
48 
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
49 49 
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
50 
-        	try {
51 
-            	    $sth = $Connection->db->prepare($query);
52 
-		    $sth->execute();
53 
-    		} catch(PDOException $e) {
54 
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 
-    		}
56 
-    		// Copy schedules data to routes table
57 
-    		self::update_schedule();
58 
-    		// Delete schedule table
50 
+			try {
51 
+					$sth = $Connection->db->prepare($query);
52 
+			$sth->execute();
53 
+			} catch(PDOException $e) {
54 
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 
+			}
56 
+			// Copy schedules data to routes table
57 
+			self::update_schedule();
58 
+			// Delete schedule table
59 59 
 		$query = "DROP TABLE `schedule`";
60 
-        	try {
61 
-            	    $sth = $Connection->db->prepare($query);
62 
-		    $sth->execute();
63 
-    		} catch(PDOException $e) {
64 
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65 
-    		}
66 
-    		// Add source column
67 
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68 
-    		try {
69 
-            	    $sth = $Connection->db->prepare($query);
70 
-		    $sth->execute();
71 
-    		} catch(PDOException $e) {
72 
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 
-    		}
60 
+			try {
61 
+					$sth = $Connection->db->prepare($query);
62 
+			$sth->execute();
63 
+			} catch(PDOException $e) {
64 
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
65 
+			}
66 
+			// Add source column
67 
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68 
+			try {
69 
+					$sth = $Connection->db->prepare($query);
70 
+			$sth->execute();
71 
+			} catch(PDOException $e) {
72 
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 
+			}
74 74 
 		// Delete unused column
75 75 
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
76 
-    		try {
77 
-            	    $sth = $Connection->db->prepare($query);
78 
-		    $sth->execute();
79 
-    		} catch(PDOException $e) {
80 
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 
-    		}
76 
+			try {
77 
+					$sth = $Connection->db->prepare($query);
78 
+			$sth->execute();
79 
+			} catch(PDOException $e) {
80 
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 
+			}
82 82 
 		// Add ModeS column
83 83 
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
84 
-    		try {
85 
-            	    $sth = $Connection->db->prepare($query);
86 
-		    $sth->execute();
87 
-    		} catch(PDOException $e) {
88 
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 
-    		}
84 
+			try {
85 
+					$sth = $Connection->db->prepare($query);
86 
+			$sth->execute();
87 
+			} catch(PDOException $e) {
88 
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 
+			}
90 90 
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91 
-    		try {
92 
-            	    $sth = $Connection->db->prepare($query);
93 
-		    $sth->execute();
94 
-    		} catch(PDOException $e) {
95 
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 
-    		}
97 
-    		// Add auto_increment for aircraft_modes
98 
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99 
-    		try {
100 
-            	    $sth = $Connection->db->prepare($query);
101 
-		    $sth->execute();
102 
-    		} catch(PDOException $e) {
103 
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 
-    		}
105 
-    		$error = '';
91 
+			try {
92 
+					$sth = $Connection->db->prepare($query);
93 
+			$sth->execute();
94 
+			} catch(PDOException $e) {
95 
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 
+			}
97 
+			// Add auto_increment for aircraft_modes
98 
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99 
+			try {
100 
+					$sth = $Connection->db->prepare($query);
101 
+			$sth->execute();
102 
+			} catch(PDOException $e) {
103 
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 
+			}
105 
+			$error = '';
106 106 
 		$error .= create_db::import_file('../db/acars_live.sql');
107 107 
 		$error .= create_db::import_file('../db/config.sql');
108 108 
 		// Update schema_version to 2
109 109 
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
110 
-        	try {
111 
-            	    $sth = $Connection->db->prepare($query);
112 
-		    $sth->execute();
113 
-    		} catch(PDOException $e) {
114 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
115 
-    		}
110 
+			try {
111 
+					$sth = $Connection->db->prepare($query);
112 
+			$sth->execute();
113 
+			} catch(PDOException $e) {
114 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
115 
+			}
116 116 
 		return $error;
117 
-        }
117 
+		}
118 118
119 119 
 	private static function update_from_2() {
120 
-    		$Connection = new Connection();
121 
-    		// Add new column decode to acars_live table
120 
+			$Connection = new Connection();
121 
+			// Add new column decode to acars_live table
122 122 
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
123 
-        	try {
124 
-            	    $sth = $Connection->db->prepare($query);
125 
-		    $sth->execute();
126 
-    		} catch(PDOException $e) {
127 
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 
-    		}
129 
-    		$error = '';
130 
-    		// Create table acars_archive
123 
+			try {
124 
+					$sth = $Connection->db->prepare($query);
125 
+			$sth->execute();
126 
+			} catch(PDOException $e) {
127 
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 
+			}
129 
+			$error = '';
130 
+			// Create table acars_archive
131 131 
 		$error .= create_db::import_file('../db/acars_archive.sql');
132 132 
 		// Update schema_version to 3
133 133 
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
134 
-        	try {
135 
-            	    $sth = $Connection->db->prepare($query);
136 
-		    $sth->execute();
137 
-    		} catch(PDOException $e) {
138 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
139 
-    		}
134 
+			try {
135 
+					$sth = $Connection->db->prepare($query);
136 
+			$sth->execute();
137 
+			} catch(PDOException $e) {
138 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
139 
+			}
140 140 
 		return $error;
141 141 
 	}
142 142
143 143 
 	private static function update_from_3() {
144 
-    		$Connection = new Connection();
145 
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
144 
+			$Connection = new Connection();
145 
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
146 146 
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
147 
-        	try {
148 
-            	    $sth = $Connection->db->prepare($query);
149 
-		    $sth->execute();
150 
-    		} catch(PDOException $e) {
151 
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 
-    		}
153 
-    		// Add image_source_website column to spotter_image
147 
+			try {
148 
+					$sth = $Connection->db->prepare($query);
149 
+			$sth->execute();
150 
+			} catch(PDOException $e) {
151 
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 
+			}
153 
+			// Add image_source_website column to spotter_image
154 154 
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
155 
-        	try {
156 
-            	    $sth = $Connection->db->prepare($query);
157 
-		    $sth->execute();
158 
-    		} catch(PDOException $e) {
159 
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 
-    		}
161 
-    		$error = '';
155 
+			try {
156 
+					$sth = $Connection->db->prepare($query);
157 
+			$sth->execute();
158 
+			} catch(PDOException $e) {
159 
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 
+			}
161 
+			$error = '';
162 162 
 		// Update schema_version to 4
163 163 
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
164 
-        	try {
165 
-            	    $sth = $Connection->db->prepare($query);
166 
-		    $sth->execute();
167 
-    		} catch(PDOException $e) {
168 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
169 
-    		}
164 
+			try {
165 
+					$sth = $Connection->db->prepare($query);
166 
+			$sth->execute();
167 
+			} catch(PDOException $e) {
168 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
169 
+			}
170 170 
 		return $error;
171 171 
 	}
172 172
173 173 
 	private static function update_from_4() {
174 
-    		$Connection = new Connection();
174 
+			$Connection = new Connection();
175 175
176 
-    		$error = '';
177 
-    		// Create table acars_label
176 
+			$error = '';
177 
+			// Create table acars_label
178 178 
 		$error .= create_db::import_file('../db/acars_label.sql');
179 179 
 		if ($error == '') {
180 
-		    // Update schema_version to 5
181 
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182 
-        	    try {
183 
-            		$sth = $Connection->db->prepare($query);
180 
+			// Update schema_version to 5
181 
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182 
+				try {
183 
+					$sth = $Connection->db->prepare($query);
184 184 
 			$sth->execute();
185 
-    		    } catch(PDOException $e) {
185 
+				} catch(PDOException $e) {
186 186 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187 
-    		    }
188 
-    		}
187 
+				}
188 
+			}
189 189 
 		return $error;
190 190 
 	}
191 191
192 192 
 	private static function update_from_5() {
193 
-    		$Connection = new Connection();
194 
-    		// Add columns to translation
193 
+			$Connection = new Connection();
194 
+			// Add columns to translation
195 195 
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
196 
-        	try {
197 
-            	    $sth = $Connection->db->prepare($query);
198 
-		    $sth->execute();
199 
-    		} catch(PDOException $e) {
200 
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 
-    		}
202 
-    		// Add aircraft_shadow column to aircraft
203 
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204 
-        	try {
205 
-            	    $sth = $Connection->db->prepare($query);
206 
-		    $sth->execute();
207 
-    		} catch(PDOException $e) {
208 
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 
-    		}
210 
-    		// Add aircraft_shadow column to spotter_live
211 
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212 
-        	try {
213 
-            	    $sth = $Connection->db->prepare($query);
214 
-		    $sth->execute();
215 
-    		} catch(PDOException $e) {
216 
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 
-    		}
218 
-    		$error = '';
219 
-    		// Update table aircraft
196 
+			try {
197 
+					$sth = $Connection->db->prepare($query);
198 
+			$sth->execute();
199 
+			} catch(PDOException $e) {
200 
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 
+			}
202 
+			// Add aircraft_shadow column to aircraft
203 
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204 
+			try {
205 
+					$sth = $Connection->db->prepare($query);
206 
+			$sth->execute();
207 
+			} catch(PDOException $e) {
208 
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 
+			}
210 
+			// Add aircraft_shadow column to spotter_live
211 
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212 
+			try {
213 
+					$sth = $Connection->db->prepare($query);
214 
+			$sth->execute();
215 
+			} catch(PDOException $e) {
216 
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 
+			}
218 
+			$error = '';
219 
+			// Update table aircraft
220 220 
 		$error .= create_db::import_file('../db/aircraft.sql');
221 221 
 		$error .= create_db::import_file('../db/spotter_archive.sql');
222 222
223 223 
 		// Update schema_version to 6
224 224 
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
225 
-        	try {
226 
-            	    $sth = $Connection->db->prepare($query);
227 
-		    $sth->execute();
228 
-    		} catch(PDOException $e) {
229 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
230 
-    		}
225 
+			try {
226 
+					$sth = $Connection->db->prepare($query);
227 
+			$sth->execute();
228 
+			} catch(PDOException $e) {
229 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
230 
+			}
231 231 
 		return $error;
232 232 
 	}
233 233
234 234 
 	private static function update_from_6() {
235 
-    		$Connection = new Connection();
236 
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237 
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
235 
+			$Connection = new Connection();
236 
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237 
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238 
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239 
 			ALTER TABLE spotter_output ADD INDEX(ident);
240 240 
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
 
@@ -247,147 +247,147 @@  discard block
 
 block discarded – undo
247 247 
 			ALTER TABLE aircraft ADD INDEX(icao);
248 248 
 			ALTER TABLE airport ADD INDEX(icao);
249 249 
 			ALTER TABLE translation ADD INDEX(Operator);";
250 
-        	    try {
251 
-            		$sth = $Connection->db->prepare($query);
250 
+				try {
251 
+					$sth = $Connection->db->prepare($query);
252 252 
 			$sth->execute();
253 
-    		    } catch(PDOException $e) {
253 
+				} catch(PDOException $e) {
254 254 
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255 
-    		    }
256 
-    		}
257 
-    		$error = '';
258 
-    		// Update table countries
259 
-    		if ($Connection->tableExists('airspace')) {
260 
-    		    $error .= update_db::update_countries();
261 
-		    if ($error != '') return $error;
255 
+				}
256 
+			}
257 
+			$error = '';
258 
+			// Update table countries
259 
+			if ($Connection->tableExists('airspace')) {
260 
+				$error .= update_db::update_countries();
261 
+			if ($error != '') return $error;
262 262 
 		}
263 263 
 		// Update schema_version to 7
264 264 
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
265 
-        	try {
266 
-            	    $sth = $Connection->db->prepare($query);
267 
-		    $sth->execute();
268 
-    		} catch(PDOException $e) {
269 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
270 
-    		}
265 
+			try {
266 
+					$sth = $Connection->db->prepare($query);
267 
+			$sth->execute();
268 
+			} catch(PDOException $e) {
269 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
270 
+			}
271 271 
 		return $error;
272 
-    	}
272 
+		}
273 273
274 274 
 	private static function update_from_7() {
275 275 
 		global $globalDBname, $globalDBdriver;
276 
-    		$Connection = new Connection();
277 
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
276 
+			$Connection = new Connection();
277 
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278 
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279 
-        	try {
280 
-            	    $sth = $Connection->db->prepare($query);
281 
-		    $sth->execute();
282 
-    		} catch(PDOException $e) {
283 
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 
-    		}
285 
-    		if ($globalDBdriver == 'mysql') {
286 
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287 
-		    try {
288 
-            		$sth = $Connection->db->prepare($query);
289 
-			$sth->execute();
290 
-    		    } catch(PDOException $e) {
279 
+			try {
280 
+					$sth = $Connection->db->prepare($query);
281 
+			$sth->execute();
282 
+			} catch(PDOException $e) {
283 
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 
+			}
285 
+			if ($globalDBdriver == 'mysql') {
286 
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287 
+			try {
288 
+					$sth = $Connection->db->prepare($query);
289 
+			$sth->execute();
290 
+				} catch(PDOException $e) {
291 291 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292 
-    		    }
293 
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
294 
-    		    if ($row['engine'] == 'ARCHIVE') {
292 
+				}
293 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
294 
+				if ($row['engine'] == 'ARCHIVE') {
295 295 
 			$query = "CREATE TABLE copy LIKE spotter_archive;
296 296 
 				ALTER TABLE copy ENGINE=ARCHIVE;
297 297 
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
298 298 
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
299 299 
 				DROP TABLE spotter_archive;
300 300 
 				RENAME TABLE copy TO spotter_archive;";
301 
-            	    } else {
302 
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 
-            	    }
304 
-                } else {
305 
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 
-                }
307 
-        	try {
308 
-            	    $sth = $Connection->db->prepare($query);
309 
-		    $sth->execute();
310 
-    		} catch(PDOException $e) {
311 
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 
-    		}
301 
+					} else {
302 
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 
+					}
304 
+				} else {
305 
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 
+				}
307 
+			try {
308 
+					$sth = $Connection->db->prepare($query);
309 
+			$sth->execute();
310 
+			} catch(PDOException $e) {
311 
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 
+			}
313 313
314 
-    		$error = '';
315 
-    		// Update table aircraft
314 
+			$error = '';
315 
+			// Update table aircraft
316 316 
 		$error .= create_db::import_file('../db/source_location.sql');
317 317 
 		if ($error != '') return $error;
318 318 
 		// Update schema_version to 6
319 319 
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 
-        	try {
321 
-            	    $sth = $Connection->db->prepare($query);
322 
-		    $sth->execute();
323 
-    		} catch(PDOException $e) {
324 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
325 
-    		}
320 
+			try {
321 
+					$sth = $Connection->db->prepare($query);
322 
+			$sth->execute();
323 
+			} catch(PDOException $e) {
324 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
325 
+			}
326 326 
 		return $error;
327 327 
 	}
328 328
329 329 
 	private static function update_from_8() {
330 
-    		$Connection = new Connection();
331 
-    		$error = '';
332 
-    		// Update table aircraft
330 
+			$Connection = new Connection();
331 
+			$error = '';
332 
+			// Update table aircraft
333 333 
 		$error .= create_db::import_file('../db/notam.sql');
334 334 
 		if ($error != '') return $error;
335 335 
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 336 
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 337 
                         DELETE FROM config WHERE name = 'last_update_notam_db';
338 338 
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
339 
-        	try {
340 
-            	    $sth = $Connection->db->prepare($query);
341 
-		    $sth->execute();
342 
-    		} catch(PDOException $e) {
343 
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344 
-    		}
339 
+			try {
340 
+					$sth = $Connection->db->prepare($query);
341 
+			$sth->execute();
342 
+			} catch(PDOException $e) {
343 
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
344 
+			}
345 345 
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346 
-        	try {
347 
-            	    $sth = $Connection->db->prepare($query);
348 
-		    $sth->execute();
349 
-    		} catch(PDOException $e) {
350 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
351 
-    		}
346 
+			try {
347 
+					$sth = $Connection->db->prepare($query);
348 
+			$sth->execute();
349 
+			} catch(PDOException $e) {
350 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
351 
+			}
352 352 
 		return $error;
353 353 
 	}
354 354
355 355 
 	private static function update_from_9() {
356 
-    		$Connection = new Connection();
357 
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
356 
+			$Connection = new Connection();
357 
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358 
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359 
-        	try {
360 
-            	    $sth = $Connection->db->prepare($query);
361 
-		    $sth->execute();
362 
-    		} catch(PDOException $e) {
363 
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 
-    		}
359 
+			try {
360 
+					$sth = $Connection->db->prepare($query);
361 
+			$sth->execute();
362 
+			} catch(PDOException $e) {
363 
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 
+			}
365 365 
 		$error = '';
366 
-    		// Update table atc
366 
+			// Update table atc
367 367 
 		$error .= create_db::import_file('../db/atc.sql');
368 368 
 		if ($error != '') return $error;
369 369
370 370 
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 
-        	try {
372 
-            	    $sth = $Connection->db->prepare($query);
373 
-		    $sth->execute();
374 
-    		} catch(PDOException $e) {
375 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
376 
-    		}
371 
+			try {
372 
+					$sth = $Connection->db->prepare($query);
373 
+			$sth->execute();
374 
+			} catch(PDOException $e) {
375 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
376 
+			}
377 377 
 		return $error;
378 378 
 	}
379 379
380 380 
 	private static function update_from_10() {
381 
-    		$Connection = new Connection();
382 
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 
-        	try {
384 
-            	    $sth = $Connection->db->prepare($query);
385 
-		    $sth->execute();
386 
-    		} catch(PDOException $e) {
387 
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 
-    		}
381 
+			$Connection = new Connection();
382 
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 
+			try {
384 
+					$sth = $Connection->db->prepare($query);
385 
+			$sth->execute();
386 
+			} catch(PDOException $e) {
387 
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 
+			}
389 389 
 		$error = '';
390 
-    		// Add tables
390 
+			// Add tables
391 391 
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 392 
 		if ($error != '') return $error;
393 393 
 		$error .= create_db::import_file('../db/metar.sql');
 
@@ -398,76 +398,76 @@  discard block
 
 block discarded – undo
398 398 
 		if ($error != '') return $error;
399 399
400 400 
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 
-        	try {
402 
-            	    $sth = $Connection->db->prepare($query);
403 
-		    $sth->execute();
404 
-    		} catch(PDOException $e) {
405 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
406 
-    		}
401 
+			try {
402 
+					$sth = $Connection->db->prepare($query);
403 
+			$sth->execute();
404 
+			} catch(PDOException $e) {
405 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
406 
+			}
407 407 
 		return $error;
408 408 
 	}
409 409
410 410 
 	private static function update_from_11() {
411 411 
 		global $globalDBdriver, $globalDBname;
412 
-    		$Connection = new Connection();
413 
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 
-        	try {
415 
-            	    $sth = $Connection->db->prepare($query);
416 
-		    $sth->execute();
417 
-    		} catch(PDOException $e) {
418 
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 
-    		}
420 
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 
-        	try {
422 
-            	    $sth = $Connection->db->prepare($query);
423 
-		    $sth->execute();
424 
-    		} catch(PDOException $e) {
425 
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 
-    		}
427 
-    		if ($globalDBdriver == 'mysql') {
428 
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429 
-		    try {
430 
-            		$sth = $Connection->db->prepare($query);
431 
-			$sth->execute();
432 
-    		    } catch(PDOException $e) {
412 
+			$Connection = new Connection();
413 
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 
+			try {
415 
+					$sth = $Connection->db->prepare($query);
416 
+			$sth->execute();
417 
+			} catch(PDOException $e) {
418 
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 
+			}
420 
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 
+			try {
422 
+					$sth = $Connection->db->prepare($query);
423 
+			$sth->execute();
424 
+			} catch(PDOException $e) {
425 
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 
+			}
427 
+			if ($globalDBdriver == 'mysql') {
428 
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429 
+			try {
430 
+					$sth = $Connection->db->prepare($query);
431 
+			$sth->execute();
432 
+				} catch(PDOException $e) {
433 433 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434 
-    		    }
435 
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
436 
-    		    if ($row['engine'] == 'ARCHIVE') {
434 
+				}
435 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
436 
+				if ($row['engine'] == 'ARCHIVE') {
437 437 
 			$query = "CREATE TABLE copy LIKE spotter_archive;
438 438 
 				ALTER TABLE copy ENGINE=ARCHIVE;
439 439 
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
440 440 
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
441 441 
 				DROP TABLE spotter_archive;
442 442 
 				RENAME TABLE copy TO spotter_archive;";
443 
-            	    } else {
444 
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 
-            	    }
446 
-                } else {
447 
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 
-                }
449 
-        	try {
450 
-            	    $sth = $Connection->db->prepare($query);
451 
-		    $sth->execute();
452 
-    		} catch(PDOException $e) {
453 
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 
-    		}
443 
+					} else {
444 
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 
+					}
446 
+				} else {
447 
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 
+				}
449 
+			try {
450 
+					$sth = $Connection->db->prepare($query);
451 
+			$sth->execute();
452 
+			} catch(PDOException $e) {
453 
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 
+			}
455 455
456 456 
 		$error = '';
457 457
458 458 
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
459 
-        	try {
460 
-            	    $sth = $Connection->db->prepare($query);
461 
-		    $sth->execute();
462 
-    		} catch(PDOException $e) {
463 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
464 
-    		}
459 
+			try {
460 
+					$sth = $Connection->db->prepare($query);
461 
+			$sth->execute();
462 
+			} catch(PDOException $e) {
463 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
464 
+			}
465 465 
 		return $error;
466 466 
 	}
467 467 
 	private static function update_from_12() {
468 
-    		$Connection = new Connection();
468 
+			$Connection = new Connection();
469 469 
 		$error = '';
470 
-    		// Add tables
470 
+			// Add tables
471 471 
 		$error .= create_db::import_file('../db/stats.sql');
472 472 
 		if ($error != '') return $error;
473 473 
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
 
@@ -484,166 +484,166 @@  discard block
 
 block discarded – undo
484 484 
 		if ($error != '') return $error;
485 485
486 486 
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 
-        	try {
488 
-            	    $sth = $Connection->db->prepare($query);
489 
-		    $sth->execute();
490 
-    		} catch(PDOException $e) {
491 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
492 
-    		}
487 
+			try {
488 
+					$sth = $Connection->db->prepare($query);
489 
+			$sth->execute();
490 
+			} catch(PDOException $e) {
491 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
492 
+			}
493 493 
 		return $error;
494 494 
 	}
495 495
496 496 
 	private static function update_from_13() {
497 
-    		$Connection = new Connection();
498 
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
497 
+			$Connection = new Connection();
498 
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500 
 			try {
501 501 
 				$sth = $Connection->db->prepare($query);
502 502 
 				$sth->execute();
503 
-	    		} catch(PDOException $e) {
503 
+				} catch(PDOException $e) {
504 504 
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505 
-    			}
505 
+				}
506 506 
 		}
507 
-    		$error = '';
507 
+			$error = '';
508 508 
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
509 
-        	try {
510 
-            	    $sth = $Connection->db->prepare($query);
511 
-		    $sth->execute();
512 
-    		} catch(PDOException $e) {
513 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
514 
-    		}
509 
+			try {
510 
+					$sth = $Connection->db->prepare($query);
511 
+			$sth->execute();
512 
+			} catch(PDOException $e) {
513 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
514 
+			}
515 515 
 		return $error;
516 516 
 	}
517 517
518 518 
 	private static function update_from_14() {
519 
-    		$Connection = new Connection();
519 
+			$Connection = new Connection();
520 520 
 		$error = '';
521 
-    		// Add tables
522 
-    		if (!$Connection->tableExists('stats_flight')) {
521 
+			// Add tables
522 
+			if (!$Connection->tableExists('stats_flight')) {
523 523 
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 524 
 			if ($error != '') return $error;
525 525 
 		}
526 526 
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 
-        	try {
528 
-            	    $sth = $Connection->db->prepare($query);
529 
-		    $sth->execute();
530 
-    		} catch(PDOException $e) {
531 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
532 
-    		}
527 
+			try {
528 
+					$sth = $Connection->db->prepare($query);
529 
+			$sth->execute();
530 
+			} catch(PDOException $e) {
531 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
532 
+			}
533 533 
 		return $error;
534 534 
 	}
535 535
536 536
537 537 
 	private static function update_from_15() {
538 
-    		$Connection = new Connection();
538 
+			$Connection = new Connection();
539 539 
 		$error = '';
540 
-    		// Add tables
541 
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 
-        	try {
543 
-            	    $sth = $Connection->db->prepare($query);
544 
-		    $sth->execute();
545 
-    		} catch(PDOException $e) {
546 
-		    return "error (update stats) : ".$e->getMessage()."\n";
547 
-    		}
540 
+			// Add tables
541 
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 
+			try {
543 
+					$sth = $Connection->db->prepare($query);
544 
+			$sth->execute();
545 
+			} catch(PDOException $e) {
546 
+			return "error (update stats) : ".$e->getMessage()."\n";
547 
+			}
548 548 
 		if ($error != '') return $error;
549 549 
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 
-        	try {
551 
-            	    $sth = $Connection->db->prepare($query);
552 
-		    $sth->execute();
553 
-    		} catch(PDOException $e) {
554 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
555 
-    		}
550 
+			try {
551 
+					$sth = $Connection->db->prepare($query);
552 
+			$sth->execute();
553 
+			} catch(PDOException $e) {
554 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
555 
+			}
556 556 
 		return $error;
557 557 
 	}
558 558
559 559 
 	private static function update_from_16() {
560 
-    		$Connection = new Connection();
560 
+			$Connection = new Connection();
561 561 
 		$error = '';
562 
-    		// Add tables
563 
-    		if (!$Connection->tableExists('stats_registration')) {
562 
+			// Add tables
563 
+			if (!$Connection->tableExists('stats_registration')) {
564 564 
 			$error .= create_db::import_file('../db/stats_registration.sql');
565 565 
 		}
566 
-    		if (!$Connection->tableExists('stats_callsign')) {
566 
+			if (!$Connection->tableExists('stats_callsign')) {
567 567 
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 568 
 		}
569 569 
 		if ($error != '') return $error;
570 570 
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 
-        	try {
572 
-            	    $sth = $Connection->db->prepare($query);
573 
-		    $sth->execute();
574 
-    		} catch(PDOException $e) {
575 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
576 
-    		}
571 
+			try {
572 
+					$sth = $Connection->db->prepare($query);
573 
+			$sth->execute();
574 
+			} catch(PDOException $e) {
575 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
576 
+			}
577 577 
 		return $error;
578 578 
 	}
579 579
580 580 
 	private static function update_from_17() {
581 
-    		$Connection = new Connection();
581 
+			$Connection = new Connection();
582 582 
 		$error = '';
583 
-    		// Add tables
584 
-    		if (!$Connection->tableExists('stats_country')) {
583 
+			// Add tables
584 
+			if (!$Connection->tableExists('stats_country')) {
585 585 
 			$error .= create_db::import_file('../db/stats_country.sql');
586 586 
 		}
587 587 
 		if ($error != '') return $error;
588 588 
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 
-        	try {
590 
-            	    $sth = $Connection->db->prepare($query);
591 
-		    $sth->execute();
592 
-    		} catch(PDOException $e) {
593 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
594 
-    		}
589 
+			try {
590 
+					$sth = $Connection->db->prepare($query);
591 
+			$sth->execute();
592 
+			} catch(PDOException $e) {
593 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
594 
+			}
595 595 
 		return $error;
596 596 
 	}
597 597 
 	private static function update_from_18() {
598 
-    		$Connection = new Connection();
598 
+			$Connection = new Connection();
599 599 
 		$error = '';
600 
-    		// Modify stats_airport table
601 
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602 
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 
-    	        	try {
604 
-	            	    $sth = $Connection->db->prepare($query);
605 
-			    $sth->execute();
606 
-    			} catch(PDOException $e) {
607 
-			    return "error (update stats) : ".$e->getMessage()."\n";
608 
-    			}
609 
-    		}
600 
+			// Modify stats_airport table
601 
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602 
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 
+					try {
604 
+						$sth = $Connection->db->prepare($query);
605 
+				$sth->execute();
606 
+				} catch(PDOException $e) {
607 
+				return "error (update stats) : ".$e->getMessage()."\n";
608 
+				}
609 
+			}
610 610 
 		if ($error != '') return $error;
611 611 
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 
-        	try {
613 
-            	    $sth = $Connection->db->prepare($query);
614 
-		    $sth->execute();
615 
-    		} catch(PDOException $e) {
616 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
617 
-    		}
612 
+			try {
613 
+					$sth = $Connection->db->prepare($query);
614 
+			$sth->execute();
615 
+			} catch(PDOException $e) {
616 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
617 
+			}
618 618 
 		return $error;
619 619 
 	}
620 620
621 621 
 	private static function update_from_19() {
622 
-    		$Connection = new Connection();
622 
+			$Connection = new Connection();
623 623 
 		$error = '';
624 
-    		// Update airport table
624 
+			// Update airport table
625 625 
 		$error .= create_db::import_file('../db/airport.sql');
626 626 
 		if ($error != '') return 'Import airport.sql : '.$error;
627 627 
 		// Remove primary key on Spotter_Archive
628 628 
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 
-        	try {
630 
-            	    $sth = $Connection->db->prepare($query);
631 
-		    $sth->execute();
632 
-    		} catch(PDOException $e) {
633 
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 
-    		}
629 
+			try {
630 
+					$sth = $Connection->db->prepare($query);
631 
+			$sth->execute();
632 
+			} catch(PDOException $e) {
633 
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 
+			}
635 635 
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636 
-        	try {
637 
-            	    $sth = $Connection->db->prepare($query);
638 
-		    $sth->execute();
639 
-    		} catch(PDOException $e) {
640 
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 
-    		}
636 
+			try {
637 
+					$sth = $Connection->db->prepare($query);
638 
+			$sth->execute();
639 
+			} catch(PDOException $e) {
640 
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 
+			}
642 642 
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
643 643 
 			// Add column over_country
644 
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
644 
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645 
 			try {
646 
-            			$sth = $Connection->db->prepare($query);
646 
+						$sth = $Connection->db->prepare($query);
647 647 
 				$sth->execute();
648 648 
 			} catch(PDOException $e) {
649 649 
 				return "error (add over_country) : ".$e->getMessage()."\n";
 
@@ -651,9 +651,9 @@  discard block
 
 block discarded – undo
651 651 
 		}
652 652 
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
653 653 
 			// Add column over_country
654 
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
654 
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655 
 			try {
656 
-            			$sth = $Connection->db->prepare($query);
656 
+						$sth = $Connection->db->prepare($query);
657 657 
 				$sth->execute();
658 658 
 			} catch(PDOException $e) {
659 659 
 				return "error (add over_country) : ".$e->getMessage()."\n";
 
@@ -661,74 +661,74 @@  discard block
 
 block discarded – undo
661 661 
 		}
662 662 
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
663 663 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664 
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
664 
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665 
 			try {
666 666 
 				$sth = $Connection->db->prepare($query);
667 667 
 				$sth->execute();
668 668 
 			} catch(PDOException $e) {
669 669 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670 
-    			}
671 
-    		}
670 
+				}
671 
+			}
672 672 
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
673 673 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674 
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
674 
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675 
 			try {
676 676 
 				$sth = $Connection->db->prepare($query);
677 677 
 				$sth->execute();
678 678 
 			} catch(PDOException $e) {
679 679 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680 
-    			}
681 
-    		}
680 
+				}
681 
+			}
682 682 
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
683 683 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684 
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
684 
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685 
 			try {
686 686 
 				$sth = $Connection->db->prepare($query);
687 687 
 				$sth->execute();
688 688 
 			} catch(PDOException $e) {
689 689 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690 
-    			}
691 
-    		}
690 
+				}
691 
+			}
692 692 
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
693 693 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694 
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
694 
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695 
 			try {
696 696 
 				$sth = $Connection->db->prepare($query);
697 697 
 				$sth->execute();
698 698 
 			} catch(PDOException $e) {
699 699 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 
-    			}
701 
-    		}
700 
+				}
701 
+			}
702 702 
 		if ($error != '') return $error;
703 703 
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 
-        	try {
705 
-            	    $sth = $Connection->db->prepare($query);
706 
-		    $sth->execute();
707 
-    		} catch(PDOException $e) {
708 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
709 
-    		}
704 
+			try {
705 
+					$sth = $Connection->db->prepare($query);
706 
+			$sth->execute();
707 
+			} catch(PDOException $e) {
708 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
709 
+			}
710 710 
 		return $error;
711 711 
 	}
712 712
713 713 
 	private static function update_from_20() {
714 714 
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
715 
-    		$Connection = new Connection();
715 
+			$Connection = new Connection();
716 716 
 		$error = '';
717 
-    		// Update airline table
718 
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
717 
+			// Update airline table
718 
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 719 
 			$error .= create_db::import_file('../db/airlines.sql');
720 720 
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721 
 		}
722 722 
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 723 
 			// Add column over_country
724 
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 
-        		try {
724 
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 
+				try {
726 726 
 				$sth = $Connection->db->prepare($query);
727 727 
 				$sth->execute();
728 728 
 			} catch(PDOException $e) {
729 729 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 
-    			}
731 
-    		}
730 
+				}
731 
+			}
732 732 
 		if ($error != '') return $error;
733 733 
 		/*
734 734 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 
@@ -738,12 +738,12 @@  discard block
 
 block discarded – undo
738 738 
 		}
739 739 
 		*/
740 740 
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
741 
-        	try {
742 
-            	    $sth = $Connection->db->prepare($query);
743 
-		    $sth->execute();
744 
-    		} catch(PDOException $e) {
745 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
746 
-    		}
741 
+			try {
742 
+					$sth = $Connection->db->prepare($query);
743 
+			$sth->execute();
744 
+			} catch(PDOException $e) {
745 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
746 
+			}
747 747 
 		return $error;
748 748 
 	}
749 749 
 
@@ -762,35 +762,35 @@  discard block
 
 block discarded – undo
762 762 
 			if ($error != '') return $error;
763 763 
 		}
764 764 
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 
-        	try {
766 
-            	    $sth = $Connection->db->prepare($query);
767 
-		    $sth->execute();
768 
-    		} catch(PDOException $e) {
769 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
770 
-    		}
765 
+			try {
766 
+					$sth = $Connection->db->prepare($query);
767 
+			$sth->execute();
768 
+			} catch(PDOException $e) {
769 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
770 
+			}
771 771 
 		return $error;
772 772 
 	}
773 773
774 774 
 	private static function update_from_22() {
775 775 
 		global $globalDBdriver;
776 
-    		$Connection = new Connection();
776 
+			$Connection = new Connection();
777 777 
 		$error = '';
778 778 
 		// Add table stats polar
779 
-    		if (!$Connection->tableExists('stats_source')) {
779 
+			if (!$Connection->tableExists('stats_source')) {
780 780 
 			if ($globalDBdriver == 'mysql') {
781 
-    				$error .= create_db::import_file('../db/stats_source.sql');
781 
+					$error .= create_db::import_file('../db/stats_source.sql');
782 782 
 			} else {
783 783 
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 784 
 			}
785 785 
 			if ($error != '') return $error;
786 786 
 		}
787 787 
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 
-        	try {
789 
-            	    $sth = $Connection->db->prepare($query);
790 
-		    $sth->execute();
791 
-    		} catch(PDOException $e) {
792 
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
793 
-    		}
788 
+			try {
789 
+					$sth = $Connection->db->prepare($query);
790 
+			$sth->execute();
791 
+			} catch(PDOException $e) {
792 
+			return "error (update schema_version) : ".$e->getMessage()."\n";
793 
+			}
794 794 
 		return $error;
795 795 
 	}
796 796 
 
@@ -821,14 +821,14 @@  discard block
 
 block discarded – undo
821 821 
 		}
822 822 
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
823 823 
 			// Add aircraft_manufacturer to stats_aircraft
824 
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
824 
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
825 825 
 			try {
826 826 
 				$sth = $Connection->db->prepare($query);
827 827 
 				$sth->execute();
828 828 
 			} catch(PDOException $e) {
829 829 
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
830 
-    			}
831 
-    		}
830 
+				}
831 
+			}
832 832
833 833 
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
834 834 
 		try {
 
@@ -1176,7 +1176,7 @@  discard block
 
 block discarded – undo
1176 1176 
 			} catch(PDOException $e) {
1177 1177 
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1178 1178 
 			}
1179 
-                }
1179 
+				}
1180 1180 
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
1181 1181 
 			// Add mfr to aircraft
1182 1182 
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 
@@ -1250,7 +1250,7 @@  discard block
 
 block discarded – undo
1250 1250 
 			} catch(PDOException $e) {
1251 1251 
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
1252 1252 
 			}
1253 
-                }
1253 
+				}
1254 1254 
 		if (!$Connection->indexExists('accidents','registration_idx')) {
1255 1255 
 			// Add index key
1256 1256 
 			$query = "create index registration_idx on accidents (registration)";
 
@@ -1260,7 +1260,7 @@  discard block
 
 block discarded – undo
1260 1260 
 			} catch(PDOException $e) {
1261 1261 
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
1262 1262 
 			}
1263 
-                }
1263 
+				}
1264 1264 
 		if (!$Connection->indexExists('accidents','rdts')) {
1265 1265 
 			// Add index key
1266 1266 
 			$query = "create index rdts on accidents (registration,date,type,source)";
 
@@ -1270,7 +1270,7 @@  discard block
 
 block discarded – undo
1270 1270 
 			} catch(PDOException $e) {
1271 1271 
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
1272 1272 
 			}
1273 
-                }
1273 
+				}
1274 1274
1275 1275 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
1276 1276 
 		try {
 
@@ -1562,7 +1562,7 @@  discard block
 
 block discarded – undo
1562 1562 
 			} catch(PDOException $e) {
1563 1563 
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
1564 1564 
 			}
1565 
-                }
1565 
+				}
1566 1566 
 		$query = "UPDATE config SET value = '36' WHERE name = 'schema_version'";
1567 1567 
 		try {
1568 1568 
 			$sth = $Connection->db->prepare($query);
 
@@ -1723,7 +1723,7 @@  discard block
 
 block discarded – undo
1723 1723 
 			} catch(PDOException $e) {
1724 1724 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1725 1725 
 			}
1726 
-                }
1726 
+				}
1727 1727 
 		$query = "UPDATE config SET value = '38' WHERE name = 'schema_version'";
1728 1728 
 		try {
1729 1729 
 			$sth = $Connection->db->prepare($query);
 
@@ -2129,205 +2129,205 @@  discard block
 
 block discarded – undo
2129 2129
2130 2130
2131 2131
2132 
-    	public static function check_version($update = false) {
2133 
-    	    global $globalDBname;
2134 
-    	    $version = 0;
2135 
-    	    $Connection = new Connection();
2136 
-    	    if ($Connection->tableExists('aircraft')) {
2137 
-    		if (!$Connection->tableExists('config')) {
2138 
-    		    $version = '1';
2139 
-    		    if ($update) return self::update_from_1();
2140 
-    		    else return $version;
2132 
+		public static function check_version($update = false) {
2133 
+			global $globalDBname;
2134 
+			$version = 0;
2135 
+			$Connection = new Connection();
2136 
+			if ($Connection->tableExists('aircraft')) {
2137 
+			if (!$Connection->tableExists('config')) {
2138 
+				$version = '1';
2139 
+				if ($update) return self::update_from_1();
2140 
+				else return $version;
2141 2141 
 		} else {
2142 
-    		    $Connection = new Connection();
2143 
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2144 
-		    try {
2145 
-            		$sth = $Connection->db->prepare($query);
2146 
-		        $sth->execute();
2147 
-		    } catch(PDOException $e) {
2142 
+				$Connection = new Connection();
2143 
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2144 
+			try {
2145 
+					$sth = $Connection->db->prepare($query);
2146 
+				$sth->execute();
2147 
+			} catch(PDOException $e) {
2148 2148 
 			return "error : ".$e->getMessage()."\n";
2149 
-    		    }
2150 
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
2151 
-    		    if ($update) {
2152 
-    			if ($result['value'] == '2') {
2153 
-    			    $error = self::update_from_2();
2154 
-    			    if ($error != '') return $error;
2155 
-    			    else return self::check_version(true);
2156 
-    			} elseif ($result['value'] == '3') {
2157 
-    			    $error = self::update_from_3();
2158 
-    			    if ($error != '') return $error;
2159 
-    			    else return self::check_version(true);
2160 
-    			} elseif ($result['value'] == '4') {
2161 
-    			    $error = self::update_from_4();
2162 
-    			    if ($error != '') return $error;
2163 
-    			    else return self::check_version(true);
2164 
-    			} elseif ($result['value'] == '5') {
2165 
-    			    $error = self::update_from_5();
2166 
-    			    if ($error != '') return $error;
2167 
-    			    else return self::check_version(true);
2168 
-    			} elseif ($result['value'] == '6') {
2169 
-    			    $error = self::update_from_6();
2170 
-    			    if ($error != '') return $error;
2171 
-    			    else return self::check_version(true);
2172 
-    			} elseif ($result['value'] == '7') {
2173 
-    			    $error = self::update_from_7();
2174 
-    			    if ($error != '') return $error;
2175 
-    			    else return self::check_version(true);
2176 
-    			} elseif ($result['value'] == '8') {
2177 
-    			    $error = self::update_from_8();
2178 
-    			    if ($error != '') return $error;
2179 
-    			    else return self::check_version(true);
2180 
-    			} elseif ($result['value'] == '9') {
2181 
-    			    $error = self::update_from_9();
2182 
-    			    if ($error != '') return $error;
2183 
-    			    else return self::check_version(true);
2184 
-    			} elseif ($result['value'] == '10') {
2185 
-    			    $error = self::update_from_10();
2186 
-    			    if ($error != '') return $error;
2187 
-    			    else return self::check_version(true);
2188 
-    			} elseif ($result['value'] == '11') {
2189 
-    			    $error = self::update_from_11();
2190 
-    			    if ($error != '') return $error;
2191 
-    			    else return self::check_version(true);
2192 
-    			} elseif ($result['value'] == '12') {
2193 
-    			    $error = self::update_from_12();
2194 
-    			    if ($error != '') return $error;
2195 
-    			    else return self::check_version(true);
2196 
-    			} elseif ($result['value'] == '13') {
2197 
-    			    $error = self::update_from_13();
2198 
-    			    if ($error != '') return $error;
2199 
-    			    else return self::check_version(true);
2200 
-    			} elseif ($result['value'] == '14') {
2201 
-    			    $error = self::update_from_14();
2202 
-    			    if ($error != '') return $error;
2203 
-    			    else return self::check_version(true);
2204 
-    			} elseif ($result['value'] == '15') {
2205 
-    			    $error = self::update_from_15();
2206 
-    			    if ($error != '') return $error;
2207 
-    			    else return self::check_version(true);
2208 
-    			} elseif ($result['value'] == '16') {
2209 
-    			    $error = self::update_from_16();
2210 
-    			    if ($error != '') return $error;
2211 
-    			    else return self::check_version(true);
2212 
-    			} elseif ($result['value'] == '17') {
2213 
-    			    $error = self::update_from_17();
2214 
-    			    if ($error != '') return $error;
2215 
-    			    else return self::check_version(true);
2216 
-    			} elseif ($result['value'] == '18') {
2217 
-    			    $error = self::update_from_18();
2218 
-    			    if ($error != '') return $error;
2219 
-    			    else return self::check_version(true);
2220 
-    			} elseif ($result['value'] == '19') {
2221 
-    			    $error = self::update_from_19();
2222 
-    			    if ($error != '') return $error;
2223 
-    			    else return self::check_version(true);
2224 
-    			} elseif ($result['value'] == '20') {
2225 
-    			    $error = self::update_from_20();
2226 
-    			    if ($error != '') return $error;
2227 
-    			    else return self::check_version(true);
2228 
-    			} elseif ($result['value'] == '21') {
2229 
-    			    $error = self::update_from_21();
2230 
-    			    if ($error != '') return $error;
2231 
-    			    else return self::check_version(true);
2232 
-    			} elseif ($result['value'] == '22') {
2233 
-    			    $error = self::update_from_22();
2234 
-    			    if ($error != '') return $error;
2235 
-    			    else return self::check_version(true);
2236 
-    			} elseif ($result['value'] == '23') {
2237 
-    			    $error = self::update_from_23();
2238 
-    			    if ($error != '') return $error;
2239 
-    			    else return self::check_version(true);
2240 
-    			} elseif ($result['value'] == '24') {
2241 
-    			    $error = self::update_from_24();
2242 
-    			    if ($error != '') return $error;
2243 
-    			    else return self::check_version(true);
2244 
-    			} elseif ($result['value'] == '25') {
2245 
-    			    $error = self::update_from_25();
2246 
-    			    if ($error != '') return $error;
2247 
-    			    else return self::check_version(true);
2248 
-    			} elseif ($result['value'] == '26') {
2249 
-    			    $error = self::update_from_26();
2250 
-    			    if ($error != '') return $error;
2251 
-    			    else return self::check_version(true);
2252 
-    			} elseif ($result['value'] == '27') {
2253 
-    			    $error = self::update_from_27();
2254 
-    			    if ($error != '') return $error;
2255 
-    			    else return self::check_version(true);
2256 
-    			} elseif ($result['value'] == '28') {
2257 
-    			    $error = self::update_from_28();
2258 
-    			    if ($error != '') return $error;
2259 
-    			    else return self::check_version(true);
2260 
-    			} elseif ($result['value'] == '29') {
2261 
-    			    $error = self::update_from_29();
2262 
-    			    if ($error != '') return $error;
2263 
-    			    else return self::check_version(true);
2264 
-    			} elseif ($result['value'] == '30') {
2265 
-    			    $error = self::update_from_30();
2266 
-    			    if ($error != '') return $error;
2267 
-    			    else return self::check_version(true);
2268 
-    			} elseif ($result['value'] == '31') {
2269 
-    			    $error = self::update_from_31();
2270 
-    			    if ($error != '') return $error;
2271 
-    			    else return self::check_version(true);
2272 
-    			} elseif ($result['value'] == '32') {
2273 
-    			    $error = self::update_from_32();
2274 
-    			    if ($error != '') return $error;
2275 
-    			    else return self::check_version(true);
2276 
-    			} elseif ($result['value'] == '33') {
2277 
-    			    $error = self::update_from_33();
2278 
-    			    if ($error != '') return $error;
2279 
-    			    else return self::check_version(true);
2280 
-    			} elseif ($result['value'] == '34') {
2281 
-    			    $error = self::update_from_34();
2282 
-    			    if ($error != '') return $error;
2283 
-    			    else return self::check_version(true);
2284 
-    			} elseif ($result['value'] == '35') {
2285 
-    			    $error = self::update_from_35();
2286 
-    			    if ($error != '') return $error;
2287 
-    			    else return self::check_version(true);
2288 
-    			} elseif ($result['value'] == '36') {
2289 
-    			    $error = self::update_from_36();
2290 
-    			    if ($error != '') return $error;
2291 
-    			    else return self::check_version(true);
2292 
-    			} elseif ($result['value'] == '37') {
2293 
-    			    $error = self::update_from_37();
2294 
-    			    if ($error != '') return $error;
2295 
-    			    else return self::check_version(true);
2296 
-    			} elseif ($result['value'] == '38') {
2297 
-    			    $error = self::update_from_38();
2298 
-    			    if ($error != '') return $error;
2299 
-    			    else return self::check_version(true);
2300 
-    			} elseif ($result['value'] == '39') {
2301 
-    			    $error = self::update_from_39();
2302 
-    			    if ($error != '') return $error;
2303 
-    			    else return self::check_version(true);
2304 
-    			} elseif ($result['value'] == '40') {
2305 
-    			    $error = self::update_from_40();
2306 
-    			    if ($error != '') return $error;
2307 
-    			    else return self::check_version(true);
2308 
-    			} elseif ($result['value'] == '41') {
2309 
-    			    $error = self::update_from_41();
2310 
-    			    if ($error != '') return $error;
2311 
-    			    else return self::check_version(true);
2312 
-    			} elseif ($result['value'] == '42') {
2313 
-    			    $error = self::update_from_42();
2314 
-    			    if ($error != '') return $error;
2315 
-    			    else return self::check_version(true);
2316 
-    			} elseif ($result['value'] == '43') {
2317 
-    			    $error = self::update_from_43();
2318 
-    			    if ($error != '') return $error;
2319 
-    			    else return self::check_version(true);
2320 
-    			} elseif ($result['value'] == '44') {
2321 
-    			    $error = self::update_from_44();
2322 
-    			    if ($error != '') return $error;
2323 
-    			    else return self::check_version(true);
2324 
-    			} else return '';
2325 
-    		    }
2326 
-    		    else return $result['value'];
2149 
+				}
2150 
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
2151 
+				if ($update) {
2152 
+				if ($result['value'] == '2') {
2153 
+					$error = self::update_from_2();
2154 
+					if ($error != '') return $error;
2155 
+					else return self::check_version(true);
2156 
+				} elseif ($result['value'] == '3') {
2157 
+					$error = self::update_from_3();
2158 
+					if ($error != '') return $error;
2159 
+					else return self::check_version(true);
2160 
+				} elseif ($result['value'] == '4') {
2161 
+					$error = self::update_from_4();
2162 
+					if ($error != '') return $error;
2163 
+					else return self::check_version(true);
2164 
+				} elseif ($result['value'] == '5') {
2165 
+					$error = self::update_from_5();
2166 
+					if ($error != '') return $error;
2167 
+					else return self::check_version(true);
2168 
+				} elseif ($result['value'] == '6') {
2169 
+					$error = self::update_from_6();
2170 
+					if ($error != '') return $error;
2171 
+					else return self::check_version(true);
2172 
+				} elseif ($result['value'] == '7') {
2173 
+					$error = self::update_from_7();
2174 
+					if ($error != '') return $error;
2175 
+					else return self::check_version(true);
2176 
+				} elseif ($result['value'] == '8') {
2177 
+					$error = self::update_from_8();
2178 
+					if ($error != '') return $error;
2179 
+					else return self::check_version(true);
2180 
+				} elseif ($result['value'] == '9') {
2181 
+					$error = self::update_from_9();
2182 
+					if ($error != '') return $error;
2183 
+					else return self::check_version(true);
2184 
+				} elseif ($result['value'] == '10') {
2185 
+					$error = self::update_from_10();
2186 
+					if ($error != '') return $error;
2187 
+					else return self::check_version(true);
2188 
+				} elseif ($result['value'] == '11') {
2189 
+					$error = self::update_from_11();
2190 
+					if ($error != '') return $error;
2191 
+					else return self::check_version(true);
2192 
+				} elseif ($result['value'] == '12') {
2193 
+					$error = self::update_from_12();
2194 
+					if ($error != '') return $error;
2195 
+					else return self::check_version(true);
2196 
+				} elseif ($result['value'] == '13') {
2197 
+					$error = self::update_from_13();
2198 
+					if ($error != '') return $error;
2199 
+					else return self::check_version(true);
2200 
+				} elseif ($result['value'] == '14') {
2201 
+					$error = self::update_from_14();
2202 
+					if ($error != '') return $error;
2203 
+					else return self::check_version(true);
2204 
+				} elseif ($result['value'] == '15') {
2205 
+					$error = self::update_from_15();
2206 
+					if ($error != '') return $error;
2207 
+					else return self::check_version(true);
2208 
+				} elseif ($result['value'] == '16') {
2209 
+					$error = self::update_from_16();
2210 
+					if ($error != '') return $error;
2211 
+					else return self::check_version(true);
2212 
+				} elseif ($result['value'] == '17') {
2213 
+					$error = self::update_from_17();
2214 
+					if ($error != '') return $error;
2215 
+					else return self::check_version(true);
2216 
+				} elseif ($result['value'] == '18') {
2217 
+					$error = self::update_from_18();
2218 
+					if ($error != '') return $error;
2219 
+					else return self::check_version(true);
2220 
+				} elseif ($result['value'] == '19') {
2221 
+					$error = self::update_from_19();
2222 
+					if ($error != '') return $error;
2223 
+					else return self::check_version(true);
2224 
+				} elseif ($result['value'] == '20') {
2225 
+					$error = self::update_from_20();
2226 
+					if ($error != '') return $error;
2227 
+					else return self::check_version(true);
2228 
+				} elseif ($result['value'] == '21') {
2229 
+					$error = self::update_from_21();
2230 
+					if ($error != '') return $error;
2231 
+					else return self::check_version(true);
2232 
+				} elseif ($result['value'] == '22') {
2233 
+					$error = self::update_from_22();
2234 
+					if ($error != '') return $error;
2235 
+					else return self::check_version(true);
2236 
+				} elseif ($result['value'] == '23') {
2237 
+					$error = self::update_from_23();
2238 
+					if ($error != '') return $error;
2239 
+					else return self::check_version(true);
2240 
+				} elseif ($result['value'] == '24') {
2241 
+					$error = self::update_from_24();
2242 
+					if ($error != '') return $error;
2243 
+					else return self::check_version(true);
2244 
+				} elseif ($result['value'] == '25') {
2245 
+					$error = self::update_from_25();
2246 
+					if ($error != '') return $error;
2247 
+					else return self::check_version(true);
2248 
+				} elseif ($result['value'] == '26') {
2249 
+					$error = self::update_from_26();
2250 
+					if ($error != '') return $error;
2251 
+					else return self::check_version(true);
2252 
+				} elseif ($result['value'] == '27') {
2253 
+					$error = self::update_from_27();
2254 
+					if ($error != '') return $error;
2255 
+					else return self::check_version(true);
2256 
+				} elseif ($result['value'] == '28') {
2257 
+					$error = self::update_from_28();
2258 
+					if ($error != '') return $error;
2259 
+					else return self::check_version(true);
2260 
+				} elseif ($result['value'] == '29') {
2261 
+					$error = self::update_from_29();
2262 
+					if ($error != '') return $error;
2263 
+					else return self::check_version(true);
2264 
+				} elseif ($result['value'] == '30') {
2265 
+					$error = self::update_from_30();
2266 
+					if ($error != '') return $error;
2267 
+					else return self::check_version(true);
2268 
+				} elseif ($result['value'] == '31') {
2269 
+					$error = self::update_from_31();
2270 
+					if ($error != '') return $error;
2271 
+					else return self::check_version(true);
2272 
+				} elseif ($result['value'] == '32') {
2273 
+					$error = self::update_from_32();
2274 
+					if ($error != '') return $error;
2275 
+					else return self::check_version(true);
2276 
+				} elseif ($result['value'] == '33') {
2277 
+					$error = self::update_from_33();
2278 
+					if ($error != '') return $error;
2279 
+					else return self::check_version(true);
2280 
+				} elseif ($result['value'] == '34') {
2281 
+					$error = self::update_from_34();
2282 
+					if ($error != '') return $error;
2283 
+					else return self::check_version(true);
2284 
+				} elseif ($result['value'] == '35') {
2285 
+					$error = self::update_from_35();
2286 
+					if ($error != '') return $error;
2287 
+					else return self::check_version(true);
2288 
+				} elseif ($result['value'] == '36') {
2289 
+					$error = self::update_from_36();
2290 
+					if ($error != '') return $error;
2291 
+					else return self::check_version(true);
2292 
+				} elseif ($result['value'] == '37') {
2293 
+					$error = self::update_from_37();
2294 
+					if ($error != '') return $error;
2295 
+					else return self::check_version(true);
2296 
+				} elseif ($result['value'] == '38') {
2297 
+					$error = self::update_from_38();
2298 
+					if ($error != '') return $error;
2299 
+					else return self::check_version(true);
2300 
+				} elseif ($result['value'] == '39') {
2301 
+					$error = self::update_from_39();
2302 
+					if ($error != '') return $error;
2303 
+					else return self::check_version(true);
2304 
+				} elseif ($result['value'] == '40') {
2305 
+					$error = self::update_from_40();
2306 
+					if ($error != '') return $error;
2307 
+					else return self::check_version(true);
2308 
+				} elseif ($result['value'] == '41') {
2309 
+					$error = self::update_from_41();
2310 
+					if ($error != '') return $error;
2311 
+					else return self::check_version(true);
2312 
+				} elseif ($result['value'] == '42') {
2313 
+					$error = self::update_from_42();
2314 
+					if ($error != '') return $error;
2315 
+					else return self::check_version(true);
2316 
+				} elseif ($result['value'] == '43') {
2317 
+					$error = self::update_from_43();
2318 
+					if ($error != '') return $error;
2319 
+					else return self::check_version(true);
2320 
+				} elseif ($result['value'] == '44') {
2321 
+					$error = self::update_from_44();
2322 
+					if ($error != '') return $error;
2323 
+					else return self::check_version(true);
2324 
+				} else return '';
2325 
+				}
2326 
+				else return $result['value'];
2327 2327 
 		}
2328 2328
2329 
-	    } else return $version;
2330 
-    	}
2329 
+		} else return $version;
2330 
+		}
2331 2331
2332 2332 
 }
2333 2333 
 //echo update_schema::check_version();
Please login to merge, or discard this patch.
Spacing   +233 added lines, -233 removed lines patch added patch discarded remove patch 
@@ -14,11 +14,11 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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;
 
@@ -815,17 +815,17 @@  discard block
 
 block discarded – undo
815 815 
 			try {
816 816 
 				$sth = $Connection->db->prepare($query);
817 817 
 				$sth->execute();
818 
-			} catch(PDOException $e) {
818 
+			} catch (PDOException $e) {
819 819 
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
820 820 
 			}
821 821 
 		}
822 
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
822 
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
823 823 
 			// Add aircraft_manufacturer to stats_aircraft
824 824 
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
825 825 
 			try {
826 826 
 				$sth = $Connection->db->prepare($query);
827 827 
 				$sth->execute();
828 
-			} catch(PDOException $e) {
828 
+			} catch (PDOException $e) {
829 829 
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
830 830 
     			}
831 831 
     		}
 
@@ -834,7 +834,7 @@  discard block
 
 block discarded – undo
834 834 
 		try {
835 835 
 			$sth = $Connection->db->prepare($query);
836 836 
 			$sth->execute();
837 
-		} catch(PDOException $e) {
837 
+		} catch (PDOException $e) {
838 838 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
839 839 
 		}
840 840 
 		return $error;
 
@@ -850,23 +850,23 @@  discard block
 
 block discarded – undo
850 850 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
851 851 
 		}
852 852 
 		if ($error != '') return 'Import airlines.sql : '.$error;
853 
-		if (!$Connection->checkColumnName('airlines','forsource')) {
853 
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
854 854 
 			// Add forsource to airlines
855 855 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
856 856 
 			try {
857 857 
 				$sth = $Connection->db->prepare($query);
858 858 
 				$sth->execute();
859 
-			} catch(PDOException $e) {
859 
+			} catch (PDOException $e) {
860 860 
 				return "error (add forsource column) : ".$e->getMessage()."\n";
861 861 
 			}
862 862 
 		}
863 
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
863 
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
864 864 
 			// Add forsource to airlines
865 865 
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
866 866 
 			try {
867 867 
 				$sth = $Connection->db->prepare($query);
868 868 
 				$sth->execute();
869 
-			} catch(PDOException $e) {
869 
+			} catch (PDOException $e) {
870 870 
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
871 871 
 			}
872 872 
 			// Add unique key
 
@@ -878,17 +878,17 @@  discard block
 
 block discarded – undo
878 878 
 			try {
879 879 
 				$sth = $Connection->db->prepare($query);
880 880 
 				$sth->execute();
881 
-			} catch(PDOException $e) {
881 
+			} catch (PDOException $e) {
882 882 
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
883 883 
 			}
884 884 
 		}
885 
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
885 
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
886 886 
 			// Add forsource to airlines
887 887 
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
888 888 
 			try {
889 889 
 				$sth = $Connection->db->prepare($query);
890 890 
 				$sth->execute();
891 
-			} catch(PDOException $e) {
891 
+			} catch (PDOException $e) {
892 892 
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
893 893 
 			}
894 894 
 			// Add unique key
 
@@ -900,17 +900,17 @@  discard block
 
 block discarded – undo
900 900 
 			try {
901 901 
 				$sth = $Connection->db->prepare($query);
902 902 
 				$sth->execute();
903 
-			} catch(PDOException $e) {
903 
+			} catch (PDOException $e) {
904 904 
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
905 905 
 			}
906 906 
 		}
907 
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
907 
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
908 908 
 			// Add forsource to airlines
909 909 
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
910 910 
 			try {
911 911 
 				$sth = $Connection->db->prepare($query);
912 912 
 				$sth->execute();
913 
-			} catch(PDOException $e) {
913 
+			} catch (PDOException $e) {
914 914 
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
915 915 
 			}
916 916 
 			// Add unique key
 
@@ -922,36 +922,36 @@  discard block
 
 block discarded – undo
922 922 
 			try {
923 923 
 				$sth = $Connection->db->prepare($query);
924 924 
 				$sth->execute();
925 
-			} catch(PDOException $e) {
925 
+			} catch (PDOException $e) {
926 926 
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
927 927 
 			}
928 928 
 		}
929 
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
929 
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
930 930 
 			// Add forsource to airlines
931 931 
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
932 932 
 			try {
933 933 
 				$sth = $Connection->db->prepare($query);
934 934 
 				$sth->execute();
935 
-			} catch(PDOException $e) {
935 
+			} catch (PDOException $e) {
936 936 
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
937 937 
 			}
938 938 
 		}
939 
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
939 
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
940 940 
 			// Add forsource to airlines
941 941 
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
942 942 
 			try {
943 943 
 				$sth = $Connection->db->prepare($query);
944 944 
 				$sth->execute();
945 
-			} catch(PDOException $e) {
945 
+			} catch (PDOException $e) {
946 946 
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
947 947 
 			}
948 
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
948 
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
949 949 
 				// Add unique key
950 950 
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
951 951 
 				try {
952 952 
 					$sth = $Connection->db->prepare($query);
953 953 
 					$sth->execute();
954 
-				} catch(PDOException $e) {
954 
+				} catch (PDOException $e) {
955 955 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
956 956 
 				}
957 957 
 			} else {
 
@@ -964,18 +964,18 @@  discard block
 
 block discarded – undo
964 964 
 				try {
965 965 
 					$sth = $Connection->db->prepare($query);
966 966 
 					$sth->execute();
967 
-				} catch(PDOException $e) {
967 
+				} catch (PDOException $e) {
968 968 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
969 969 
 				}
970 970 
 			}
971 971 
 		}
972 
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
972 
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
973 973 
 			// Add forsource to airlines
974 974 
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
975 975 
 			try {
976 976 
 				$sth = $Connection->db->prepare($query);
977 977 
 				$sth->execute();
978 
-			} catch(PDOException $e) {
978 
+			} catch (PDOException $e) {
979 979 
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
980 980 
 			}
981 981 
 			// Add unique key
 
@@ -987,17 +987,17 @@  discard block
 
 block discarded – undo
987 987 
 			try {
988 988 
 				$sth = $Connection->db->prepare($query);
989 989 
 				$sth->execute();
990 
-			} catch(PDOException $e) {
990 
+			} catch (PDOException $e) {
991 991 
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
992 992 
 			}
993 993 
 		}
994 
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
994 
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
995 995 
 			// Add forsource to airlines
996 996 
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
997 997 
 			try {
998 998 
 				$sth = $Connection->db->prepare($query);
999 999 
 				$sth->execute();
1000 
-			} catch(PDOException $e) {
1000 
+			} catch (PDOException $e) {
1001 1001 
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
1002 1002 
 			}
1003 1003 
 			// Add unique key
 
@@ -1009,17 +1009,17 @@  discard block
 
 block discarded – undo
1009 1009 
 			try {
1010 1010 
 				$sth = $Connection->db->prepare($query);
1011 1011 
 				$sth->execute();
1012 
-			} catch(PDOException $e) {
1012 
+			} catch (PDOException $e) {
1013 1013 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1014 1014 
 			}
1015 1015 
 		}
1016 
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
1016 
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
1017 1017 
 			// Add forsource to airlines
1018 1018 
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1019 1019 
 			try {
1020 1020 
 				$sth = $Connection->db->prepare($query);
1021 1021 
 				$sth->execute();
1022 
-			} catch(PDOException $e) {
1022 
+			} catch (PDOException $e) {
1023 1023 
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
1024 1024 
 			}
1025 1025 
 			// Add unique key
 
@@ -1031,7 +1031,7 @@  discard block
 
 block discarded – undo
1031 1031 
 			try {
1032 1032 
 				$sth = $Connection->db->prepare($query);
1033 1033 
 				$sth->execute();
1034 
-			} catch(PDOException $e) {
1034 
+			} catch (PDOException $e) {
1035 1035 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1036 1036 
 			}
1037 1037 
 		}
 
@@ -1040,7 +1040,7 @@  discard block
 
 block discarded – undo
1040 1040 
 		try {
1041 1041 
 			$sth = $Connection->db->prepare($query);
1042 1042 
 			$sth->execute();
1043 
-		} catch(PDOException $e) {
1043 
+		} catch (PDOException $e) {
1044 1044 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1045 1045 
 		}
1046 1046 
 		return $error;
 
@@ -1050,13 +1050,13 @@  discard block
 
 block discarded – undo
1050 1050 
 		global $globalDBdriver;
1051 1051 
 		$Connection = new Connection();
1052 1052 
 		$error = '';
1053 
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
1053 
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
1054 1054 
 			// Add forsource to airlines
1055 1055 
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1056 1056 
 			try {
1057 1057 
 				$sth = $Connection->db->prepare($query);
1058 1058 
 				$sth->execute();
1059 
-			} catch(PDOException $e) {
1059 
+			} catch (PDOException $e) {
1060 1060 
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
1061 1061 
 			}
1062 1062 
 			// Add unique key
 
@@ -1068,17 +1068,17 @@  discard block
 
 block discarded – undo
1068 1068 
 			try {
1069 1069 
 				$sth = $Connection->db->prepare($query);
1070 1070 
 				$sth->execute();
1071 
-			} catch(PDOException $e) {
1071 
+			} catch (PDOException $e) {
1072 1072 
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
1073 1073 
 			}
1074 1074 
 		}
1075 
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
1075 
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
1076 1076 
 			// Add forsource to airlines
1077 1077 
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1078 1078 
 			try {
1079 1079 
 				$sth = $Connection->db->prepare($query);
1080 1080 
 				$sth->execute();
1081 
-			} catch(PDOException $e) {
1081 
+			} catch (PDOException $e) {
1082 1082 
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
1083 1083 
 			}
1084 1084 
 			// Add unique key
 
@@ -1090,7 +1090,7 @@  discard block
 
 block discarded – undo
1090 1090 
 			try {
1091 1091 
 				$sth = $Connection->db->prepare($query);
1092 1092 
 				$sth->execute();
1093 
-			} catch(PDOException $e) {
1093 
+			} catch (PDOException $e) {
1094 1094 
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
1095 1095 
 			}
1096 1096 
 		}
 
@@ -1098,7 +1098,7 @@  discard block
 
 block discarded – undo
1098 1098 
 		try {
1099 1099 
 			$sth = $Connection->db->prepare($query);
1100 1100 
 			$sth->execute();
1101 
-		} catch(PDOException $e) {
1101 
+		} catch (PDOException $e) {
1102 1102 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1103 1103 
 		}
1104 1104 
 		return $error;
 
@@ -1108,12 +1108,12 @@  discard block
 
 block discarded – undo
1108 1108 
 		global $globalDBdriver;
1109 1109 
 		$Connection = new Connection();
1110 1110 
 		$error = '';
1111 
-		if (!$Connection->checkColumnName('atc','format_source')) {
1111 
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
1112 1112 
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
1113 1113 
 			try {
1114 1114 
 				$sth = $Connection->db->prepare($query);
1115 1115 
 				$sth->execute();
1116 
-			} catch(PDOException $e) {
1116 
+			} catch (PDOException $e) {
1117 1117 
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
1118 1118 
 			}
1119 1119 
 		}
 
@@ -1121,7 +1121,7 @@  discard block
 
 block discarded – undo
1121 1121 
 		try {
1122 1122 
 			$sth = $Connection->db->prepare($query);
1123 1123 
 			$sth->execute();
1124 
-		} catch(PDOException $e) {
1124 
+		} catch (PDOException $e) {
1125 1125 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1126 1126 
 		}
1127 1127 
 		return $error;
 
@@ -1131,13 +1131,13 @@  discard block
 
 block discarded – undo
1131 1131 
 		global $globalDBdriver;
1132 1132 
 		$Connection = new Connection();
1133 1133 
 		$error = '';
1134 
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
1134 
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
1135 1135 
 			// Add forsource to airlines
1136 1136 
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
1137 1137 
 			try {
1138 1138 
 				$sth = $Connection->db->prepare($query);
1139 1139 
 				$sth->execute();
1140 
-			} catch(PDOException $e) {
1140 
+			} catch (PDOException $e) {
1141 1141 
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
1142 1142 
 			}
1143 1143 
 			// Add unique key
 
@@ -1149,7 +1149,7 @@  discard block
 
 block discarded – undo
1149 1149 
 			try {
1150 1150 
 				$sth = $Connection->db->prepare($query);
1151 1151 
 				$sth->execute();
1152 
-			} catch(PDOException $e) {
1152 
+			} catch (PDOException $e) {
1153 1153 
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
1154 1154 
 			}
1155 1155 
 		}
 
@@ -1157,7 +1157,7 @@  discard block
 
 block discarded – undo
1157 1157 
 		try {
1158 1158 
 			$sth = $Connection->db->prepare($query);
1159 1159 
 			$sth->execute();
1160 
-		} catch(PDOException $e) {
1160 
+		} catch (PDOException $e) {
1161 1161 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1162 1162 
 		}
1163 1163 
 		return $error;
 
@@ -1167,23 +1167,23 @@  discard block
 
 block discarded – undo
1167 1167 
 		global $globalDBdriver;
1168 1168 
 		$Connection = new Connection();
1169 1169 
 		$error = '';
1170 
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
1170 
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
1171 1171 
 			// Add unique key
1172 1172 
 			$query = "alter table spotter_live add index(latitude,longitude)";
1173 1173 
 			try {
1174 1174 
 				$sth = $Connection->db->prepare($query);
1175 1175 
 				$sth->execute();
1176 
-			} catch(PDOException $e) {
1176 
+			} catch (PDOException $e) {
1177 1177 
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1178 1178 
 			}
1179 1179 
                 }
1180 
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
1180 
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
1181 1181 
 			// Add mfr to aircraft
1182 1182 
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
1183 1183 
 			try {
1184 1184 
 				$sth = $Connection->db->prepare($query);
1185 1185 
 				$sth->execute();
1186 
-			} catch(PDOException $e) {
1186 
+			} catch (PDOException $e) {
1187 1187 
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
1188 1188 
 			}
1189 1189 
 		}
 
@@ -1199,7 +1199,7 @@  discard block
 
 block discarded – undo
1199 1199 
 		try {
1200 1200 
 			$sth = $Connection->db->prepare($query);
1201 1201 
 			$sth->execute();
1202 
-		} catch(PDOException $e) {
1202 
+		} catch (PDOException $e) {
1203 1203 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1204 1204 
 		}
1205 1205 
 		return $error;
 
@@ -1209,13 +1209,13 @@  discard block
 
 block discarded – undo
1209 1209 
 		global $globalDBdriver;
1210 1210 
 		$Connection = new Connection();
1211 1211 
 		$error = '';
1212 
-		if ($Connection->checkColumnName('aircraft','mfr')) {
1212 
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
1213 1213 
 			// drop mfr to aircraft
1214 1214 
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
1215 1215 
 			try {
1216 1216 
 				$sth = $Connection->db->prepare($query);
1217 1217 
 				$sth->execute();
1218 
-			} catch(PDOException $e) {
1218 
+			} catch (PDOException $e) {
1219 1219 
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
1220 1220 
 			}
1221 1221 
 		}
 
@@ -1231,7 +1231,7 @@  discard block
 
 block discarded – undo
1231 1231 
 		try {
1232 1232 
 			$sth = $Connection->db->prepare($query);
1233 1233 
 			$sth->execute();
1234 
-		} catch(PDOException $e) {
1234 
+		} catch (PDOException $e) {
1235 1235 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1236 1236 
 		}
1237 1237 
 		return $error;
 
@@ -1241,33 +1241,33 @@  discard block
 
 block discarded – undo
1241 1241 
 		global $globalDBdriver;
1242 1242 
 		$Connection = new Connection();
1243 1243 
 		$error = '';
1244 
-		if (!$Connection->indexExists('notam','ref_idx')) {
1244 
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
1245 1245 
 			// Add index key
1246 1246 
 			$query = "create index ref_idx on notam (ref)";
1247 1247 
 			try {
1248 1248 
 				$sth = $Connection->db->prepare($query);
1249 1249 
 				$sth->execute();
1250 
-			} catch(PDOException $e) {
1250 
+			} catch (PDOException $e) {
1251 1251 
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
1252 1252 
 			}
1253 1253 
                 }
1254 
-		if (!$Connection->indexExists('accidents','registration_idx')) {
1254 
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
1255 1255 
 			// Add index key
1256 1256 
 			$query = "create index registration_idx on accidents (registration)";
1257 1257 
 			try {
1258 1258 
 				$sth = $Connection->db->prepare($query);
1259 1259 
 				$sth->execute();
1260 
-			} catch(PDOException $e) {
1260 
+			} catch (PDOException $e) {
1261 1261 
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
1262 1262 
 			}
1263 1263 
                 }
1264 
-		if (!$Connection->indexExists('accidents','rdts')) {
1264 
+		if (!$Connection->indexExists('accidents', 'rdts')) {
1265 1265 
 			// Add index key
1266 1266 
 			$query = "create index rdts on accidents (registration,date,type,source)";
1267 1267 
 			try {
1268 1268 
 				$sth = $Connection->db->prepare($query);
1269 1269 
 				$sth->execute();
1270 
-			} catch(PDOException $e) {
1270 
+			} catch (PDOException $e) {
1271 1271 
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
1272 1272 
 			}
1273 1273 
                 }
 
@@ -1276,7 +1276,7 @@  discard block
 
 block discarded – undo
1276 1276 
 		try {
1277 1277 
 			$sth = $Connection->db->prepare($query);
1278 1278 
 			$sth->execute();
1279 
-		} catch(PDOException $e) {
1279 
+		} catch (PDOException $e) {
1280 1280 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1281 1281 
 		}
1282 1282 
 		return $error;
 
@@ -1286,23 +1286,23 @@  discard block
 
 block discarded – undo
1286 1286 
 		global $globalDBdriver;
1287 1287 
 		$Connection = new Connection();
1288 1288 
 		$error = '';
1289 
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
1289 
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
1290 1290 
 			// Add airline_name to accidents
1291 1291 
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
1292 1292 
 			try {
1293 1293 
 				$sth = $Connection->db->prepare($query);
1294 1294 
 				$sth->execute();
1295 
-			} catch(PDOException $e) {
1295 
+			} catch (PDOException $e) {
1296 1296 
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
1297 1297 
 			}
1298 1298 
 		}
1299 
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
1299 
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
1300 1300 
 			// Add airline_icao to accidents
1301 1301 
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
1302 1302 
 			try {
1303 1303 
 				$sth = $Connection->db->prepare($query);
1304 1304 
 				$sth->execute();
1305 
-			} catch(PDOException $e) {
1305 
+			} catch (PDOException $e) {
1306 1306 
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
1307 1307 
 			}
1308 1308 
 		}
 
@@ -1310,7 +1310,7 @@  discard block
 
 block discarded – undo
1310 1310 
 		try {
1311 1311 
 			$sth = $Connection->db->prepare($query);
1312 1312 
 			$sth->execute();
1313 
-		} catch(PDOException $e) {
1313 
+		} catch (PDOException $e) {
1314 1314 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1315 1315 
 		}
1316 1316 
 		return $error;
 
@@ -1320,13 +1320,13 @@  discard block
 
 block discarded – undo
1320 1320 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1321 1321 
 		$Connection = new Connection();
1322 1322 
 		$error = '';
1323 
-		if (!$Connection->checkColumnName('airlines','alliance')) {
1323 
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
1324 1324 
 			// Add alliance to airlines
1325 1325 
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
1326 1326 
 			try {
1327 1327 
 				$sth = $Connection->db->prepare($query);
1328 1328 
 				$sth->execute();
1329 
-			} catch(PDOException $e) {
1329 
+			} catch (PDOException $e) {
1330 1330 
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
1331 1331 
 			}
1332 1332 
 		}
 
@@ -1353,7 +1353,7 @@  discard block
 
 block discarded – undo
1353 1353 
 		try {
1354 1354 
 			$sth = $Connection->db->prepare($query);
1355 1355 
 			$sth->execute();
1356 
-		} catch(PDOException $e) {
1356 
+		} catch (PDOException $e) {
1357 1357 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1358 1358 
 		}
1359 1359 
 		return $error;
 
@@ -1363,13 +1363,13 @@  discard block
 
 block discarded – undo
1363 1363 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1364 1364 
 		$Connection = new Connection();
1365 1365 
 		$error = '';
1366 
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
1366 
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
1367 1367 
 			// Add ban_eu to airlines
1368 1368 
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
1369 1369 
 			try {
1370 1370 
 				$sth = $Connection->db->prepare($query);
1371 1371 
 				$sth->execute();
1372 
-			} catch(PDOException $e) {
1372 
+			} catch (PDOException $e) {
1373 1373 
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
1374 1374 
 			}
1375 1375 
 		}
 
@@ -1377,7 +1377,7 @@  discard block
 
 block discarded – undo
1377 1377 
 		try {
1378 1378 
 			$sth = $Connection->db->prepare($query);
1379 1379 
 			$sth->execute();
1380 
-		} catch(PDOException $e) {
1380 
+		} catch (PDOException $e) {
1381 1381 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1382 1382 
 		}
1383 1383 
 		return $error;
 
@@ -1388,19 +1388,19 @@  discard block
 
 block discarded – undo
1388 1388 
 		$Connection = new Connection();
1389 1389 
 		$error = '';
1390 1390 
 		if ($globalDBdriver == 'mysql') {
1391 
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
1391 
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
1392 1392 
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
1393 1393 
 				try {
1394 1394 
 					$sth = $Connection->db->prepare($query);
1395 1395 
 					$sth->execute();
1396 
-				} catch(PDOException $e) {
1396 
+				} catch (PDOException $e) {
1397 1397 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1398 1398 
 				}
1399 1399 
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
1400 1400 
 				try {
1401 1401 
 					$sth = $Connection->db->prepare($query);
1402 1402 
 					$sth->execute();
1403 
-				} catch(PDOException $e) {
1403 
+				} catch (PDOException $e) {
1404 1404 
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
1405 1405 
 				}
1406 1406 
 				
@@ -1408,7 +1408,7 @@  discard block
 
 block discarded – undo
1408 1408 
 				try {
1409 1409 
 					$sth = $Connection->db->prepare($query);
1410 1410 
 					$sth->execute();
1411 
-				} catch(PDOException $e) {
1411 
+				} catch (PDOException $e) {
1412 1412 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1413 1413 
 				}
1414 1414 
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
 
@@ -1459,7 +1459,7 @@  discard block
 
 block discarded – undo
1459 1459 
 				try {
1460 1460 
 					$sth = $Connection->db->prepare($query);
1461 1461 
 					$sth->execute();
1462 
-				} catch(PDOException $e) {
1462 
+				} catch (PDOException $e) {
1463 1463 
 					return "error (fix date) : ".$e->getMessage()."\n";
1464 1464 
 				}
1465 1465 
 			}
 
@@ -1544,7 +1544,7 @@  discard block
 
 block discarded – undo
1544 1544 
 		try {
1545 1545 
 			$sth = $Connection->db->prepare($query);
1546 1546 
 			$sth->execute();
1547 
-		} catch(PDOException $e) {
1547 
+		} catch (PDOException $e) {
1548 1548 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1549 1549 
 		}
1550 1550 
 		return $error;
 
@@ -1553,13 +1553,13 @@  discard block
 
 block discarded – undo
1553 1553 
 		global $globalDBdriver;
1554 1554 
 		$Connection = new Connection();
1555 1555 
 		$error = '';
1556 
-		if (!$Connection->indexExists('accidents','type')) {
1556 
+		if (!$Connection->indexExists('accidents', 'type')) {
1557 1557 
 			// Add index key
1558 1558 
 			$query = "create index type on accidents (type,date)";
1559 1559 
 			try {
1560 1560 
 				$sth = $Connection->db->prepare($query);
1561 1561 
 				$sth->execute();
1562 
-			} catch(PDOException $e) {
1562 
+			} catch (PDOException $e) {
1563 1563 
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
1564 1564 
 			}
1565 1565 
                 }
 
@@ -1567,7 +1567,7 @@  discard block
 
 block discarded – undo
1567 1567 
 		try {
1568 1568 
 			$sth = $Connection->db->prepare($query);
1569 1569 
 			$sth->execute();
1570 
-		} catch(PDOException $e) {
1570 
+		} catch (PDOException $e) {
1571 1571 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1572 1572 
 		}
1573 1573 
 		return $error;
 
@@ -1577,12 +1577,12 @@  discard block
 
 block discarded – undo
1577 1577 
 		global $globalDBdriver;
1578 1578 
 		$Connection = new Connection();
1579 1579 
 		$error = '';
1580 
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
1580 
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
1581 1581 
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
1582 1582 
 			try {
1583 1583 
 				$sth = $Connection->db->prepare($query);
1584 1584 
 				$sth->execute();
1585 
-			} catch(PDOException $e) {
1585 
+			} catch (PDOException $e) {
1586 1586 
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
1587 1587 
 			}
1588 1588 
 		}
 
@@ -1648,7 +1648,7 @@  discard block
 
 block discarded – undo
1648 1648 
 		try {
1649 1649 
 			$sth = $Connection->db->prepare($query);
1650 1650 
 			$sth->execute();
1651 
-		} catch(PDOException $e) {
1651 
+		} catch (PDOException $e) {
1652 1652 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1653 1653 
 		}
1654 1654 
 		return $error;
 
@@ -1700,7 +1700,7 @@  discard block
 
 block discarded – undo
1700 1700 
 			try {
1701 1701 
 				$sth = $Connection->db->prepare($query);
1702 1702 
 				$sth->execute();
1703 
-			} catch(PDOException $e) {
1703 
+			} catch (PDOException $e) {
1704 1704 
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
1705 1705 
 			}
1706 1706 
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -1709,18 +1709,18 @@  discard block
 
 block discarded – undo
1709 1709 
 				try {
1710 1710 
 					$sth = $Connection->db->prepare($query);
1711 1711 
 					$sth->execute();
1712 
-				} catch(PDOException $e) {
1712 
+				} catch (PDOException $e) {
1713 1713 
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
1714 1714 
 				}
1715 1715 
 			}
1716 1716 
 		}
1717 
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
1717 
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
1718 1718 
 			// Add index key
1719 1719 
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
1720 1720 
 			try {
1721 1721 
 				$sth = $Connection->db->prepare($query);
1722 1722 
 				$sth->execute();
1723 
-			} catch(PDOException $e) {
1723 
+			} catch (PDOException $e) {
1724 1724 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1725 1725 
 			}
1726 1726 
                 }
 
@@ -1728,7 +1728,7 @@  discard block
 
 block discarded – undo
1728 1728 
 		try {
1729 1729 
 			$sth = $Connection->db->prepare($query);
1730 1730 
 			$sth->execute();
1731 
-		} catch(PDOException $e) {
1731 
+		} catch (PDOException $e) {
1732 1732 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1733 1733 
 		}
1734 1734 
 		return $error;
 
@@ -1739,148 +1739,148 @@  discard block
 
 block discarded – undo
1739 1739 
 		$Connection = new Connection();
1740 1740 
 		$error = '';
1741 1741 
 		if ($globalDBdriver == 'mysql') {
1742 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1742 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1743 1743 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
1744 1744 
 				try {
1745 1745 
 					$sth = $Connection->db->prepare($query);
1746 1746 
 					$sth->execute();
1747 
-				} catch(PDOException $e) {
1747 
+				} catch (PDOException $e) {
1748 1748 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1749 1749 
 				}
1750 1750 
 			}
1751 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1751 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1752 1752 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
1753 1753 
 				try {
1754 1754 
 					$sth = $Connection->db->prepare($query);
1755 1755 
 					$sth->execute();
1756 
-				} catch(PDOException $e) {
1756 
+				} catch (PDOException $e) {
1757 1757 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1758 1758 
 				}
1759 1759 
 			}
1760 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1760 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1761 1761 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
1762 1762 
 				try {
1763 1763 
 					$sth = $Connection->db->prepare($query);
1764 1764 
 					$sth->execute();
1765 
-				} catch(PDOException $e) {
1765 
+				} catch (PDOException $e) {
1766 1766 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1767 1767 
 				}
1768 1768 
 			}
1769 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1769 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1770 1770 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
1771 1771 
 				try {
1772 1772 
 					$sth = $Connection->db->prepare($query);
1773 1773 
 					$sth->execute();
1774 
-				} catch(PDOException $e) {
1774 
+				} catch (PDOException $e) {
1775 1775 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1776 1776 
 				}
1777 1777 
 			}
1778 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1778 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1779 1779 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
1780 1780 
 				try {
1781 1781 
 					$sth = $Connection->db->prepare($query);
1782 1782 
 					$sth->execute();
1783 
-				} catch(PDOException $e) {
1783 
+				} catch (PDOException $e) {
1784 1784 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1785 1785 
 				}
1786 1786 
 			}
1787 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1787 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1788 1788 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
1789 1789 
 				try {
1790 1790 
 					$sth = $Connection->db->prepare($query);
1791 1791 
 					$sth->execute();
1792 
-				} catch(PDOException $e) {
1792 
+				} catch (PDOException $e) {
1793 1793 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1794 1794 
 				}
1795 1795 
 			}
1796 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1796 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1797 1797 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
1798 1798 
 				try {
1799 1799 
 					$sth = $Connection->db->prepare($query);
1800 1800 
 					$sth->execute();
1801 
-				} catch(PDOException $e) {
1801 
+				} catch (PDOException $e) {
1802 1802 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1803 1803 
 				}
1804 1804 
 			}
1805 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1805 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1806 1806 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
1807 1807 
 				try {
1808 1808 
 					$sth = $Connection->db->prepare($query);
1809 1809 
 					$sth->execute();
1810 
-				} catch(PDOException $e) {
1810 
+				} catch (PDOException $e) {
1811 1811 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1812 1812 
 				}
1813 1813 
 			}
1814 1814 
 		} else {
1815 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1815 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1816 1816 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
1817 1817 
 				try {
1818 1818 
 					$sth = $Connection->db->prepare($query);
1819 1819 
 					$sth->execute();
1820 
-				} catch(PDOException $e) {
1820 
+				} catch (PDOException $e) {
1821 1821 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1822 1822 
 				}
1823 1823 
 			}
1824 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1824 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1825 1825 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
1826 1826 
 				try {
1827 1827 
 					$sth = $Connection->db->prepare($query);
1828 1828 
 					$sth->execute();
1829 
-				} catch(PDOException $e) {
1829 
+				} catch (PDOException $e) {
1830 1830 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1831 1831 
 				}
1832 1832 
 			}
1833 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1833 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1834 1834 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
1835 1835 
 				try {
1836 1836 
 					$sth = $Connection->db->prepare($query);
1837 1837 
 					$sth->execute();
1838 
-				} catch(PDOException $e) {
1838 
+				} catch (PDOException $e) {
1839 1839 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1840 1840 
 				}
1841 1841 
 			}
1842 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1842 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1843 1843 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
1844 1844 
 				try {
1845 1845 
 					$sth = $Connection->db->prepare($query);
1846 1846 
 					$sth->execute();
1847 
-				} catch(PDOException $e) {
1847 
+				} catch (PDOException $e) {
1848 1848 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1849 1849 
 				}
1850 1850 
 			}
1851 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1851 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1852 1852 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
1853 1853 
 				try {
1854 1854 
 					$sth = $Connection->db->prepare($query);
1855 1855 
 					$sth->execute();
1856 
-				} catch(PDOException $e) {
1856 
+				} catch (PDOException $e) {
1857 1857 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1858 1858 
 				}
1859 1859 
 			}
1860 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1860 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1861 1861 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
1862 1862 
 				try {
1863 1863 
 					$sth = $Connection->db->prepare($query);
1864 1864 
 					$sth->execute();
1865 
-				} catch(PDOException $e) {
1865 
+				} catch (PDOException $e) {
1866 1866 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1867 1867 
 				}
1868 1868 
 			}
1869 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1869 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1870 1870 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
1871 1871 
 				try {
1872 1872 
 					$sth = $Connection->db->prepare($query);
1873 1873 
 					$sth->execute();
1874 
-				} catch(PDOException $e) {
1874 
+				} catch (PDOException $e) {
1875 1875 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1876 1876 
 				}
1877 1877 
 			}
1878 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1878 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1879 1879 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
1880 1880 
 				try {
1881 1881 
 					$sth = $Connection->db->prepare($query);
1882 1882 
 					$sth->execute();
1883 
-				} catch(PDOException $e) {
1883 
+				} catch (PDOException $e) {
1884 1884 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1885 1885 
 				}
1886 1886 
 			}
 
@@ -1889,7 +1889,7 @@  discard block
 
 block discarded – undo
1889 1889 
 		try {
1890 1890 
 			$sth = $Connection->db->prepare($query);
1891 1891 
 			$sth->execute();
1892 
-		} catch(PDOException $e) {
1892 
+		} catch (PDOException $e) {
1893 1893 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1894 1894 
 		}
1895 1895 
 		return $error;
 
@@ -1904,14 +1904,14 @@  discard block
 
 block discarded – undo
1904 1904 
 			try {
1905 1905 
 				$sth = $Connection->db->prepare($query);
1906 1906 
 				$sth->execute();
1907 
-			} catch(PDOException $e) {
1907 
+			} catch (PDOException $e) {
1908 1908 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1909 1909 
 			}
1910 1910 
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
1911 1911 
 			try {
1912 1912 
 				$sth = $Connection->db->prepare($query);
1913 1913 
 				$sth->execute();
1914 
-			} catch(PDOException $e) {
1914 
+			} catch (PDOException $e) {
1915 1915 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1916 1916 
 			}
1917 1917 
 		} else {
 
@@ -1919,14 +1919,14 @@  discard block
 
 block discarded – undo
1919 1919 
 			try {
1920 1920 
 				$sth = $Connection->db->prepare($query);
1921 1921 
 				$sth->execute();
1922 
-			} catch(PDOException $e) {
1922 
+			} catch (PDOException $e) {
1923 1923 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1924 1924 
 			}
1925 1925 
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
1926 1926 
 			try {
1927 1927 
 				$sth = $Connection->db->prepare($query);
1928 1928 
 				$sth->execute();
1929 
-			} catch(PDOException $e) {
1929 
+			} catch (PDOException $e) {
1930 1930 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1931 1931 
 			}
1932 1932 
 		}
 
@@ -1934,7 +1934,7 @@  discard block
 
 block discarded – undo
1934 1934 
 		try {
1935 1935 
 			$sth = $Connection->db->prepare($query);
1936 1936 
 			$sth->execute();
1937 
-		} catch(PDOException $e) {
1937 
+		} catch (PDOException $e) {
1938 1938 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1939 1939 
 		}
1940 1940 
 		return $error;
 
@@ -1944,32 +1944,32 @@  discard block
 
 block discarded – undo
1944 1944 
 		global $globalDBdriver;
1945 1945 
 		$Connection = new Connection();
1946 1946 
 		$error = '';
1947 
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
1947 
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
1948 1948 
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
1949 1949 
 			try {
1950 1950 
 				$sth = $Connection->db->prepare($query);
1951 1951 
 				$sth->execute();
1952 
-			} catch(PDOException $e) {
1952 
+			} catch (PDOException $e) {
1953 1953 
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
1954 1954 
 			}
1955 1955 
 		}
1956 1956 
 		if ($globalDBdriver == 'mysql') {
1957 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1957 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1958 1958 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
1959 1959 
 				try {
1960 1960 
 					$sth = $Connection->db->prepare($query);
1961 1961 
 					$sth->execute();
1962 
-				} catch(PDOException $e) {
1962 
+				} catch (PDOException $e) {
1963 1963 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1964 1964 
 				}
1965 1965 
 			}
1966 1966 
 		} else {
1967 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1967 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1968 1968 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
1969 1969 
 				try {
1970 1970 
 					$sth = $Connection->db->prepare($query);
1971 1971 
 					$sth->execute();
1972 
-				} catch(PDOException $e) {
1972 
+				} catch (PDOException $e) {
1973 1973 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1974 1974 
 				}
1975 1975 
 			}
 
@@ -1978,7 +1978,7 @@  discard block
 
 block discarded – undo
1978 1978 
 		try {
1979 1979 
 			$sth = $Connection->db->prepare($query);
1980 1980 
 			$sth->execute();
1981 
-		} catch(PDOException $e) {
1981 
+		} catch (PDOException $e) {
1982 1982 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1983 1983 
 		}
1984 1984 
 		return $error;
 
@@ -1988,12 +1988,12 @@  discard block
 
 block discarded – undo
1988 1988 
 		global $globalDBdriver;
1989 1989 
 		$Connection = new Connection();
1990 1990 
 		$error = '';
1991 
-		if (!$Connection->checkColumnName('source_location','description')) {
1991 
+		if (!$Connection->checkColumnName('source_location', 'description')) {
1992 1992 
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
1993 1993 
 			try {
1994 1994 
 				$sth = $Connection->db->prepare($query);
1995 1995 
 				$sth->execute();
1996 
-			} catch(PDOException $e) {
1996 
+			} catch (PDOException $e) {
1997 1997 
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
1998 1998 
 			}
1999 1999 
 		}
 
@@ -2001,7 +2001,7 @@  discard block
 
 block discarded – undo
2001 2001 
 		try {
2002 2002 
 			$sth = $Connection->db->prepare($query);
2003 2003 
 			$sth->execute();
2004 
-		} catch(PDOException $e) {
2004 
+		} catch (PDOException $e) {
2005 2005 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2006 2006 
 		}
2007 2007 
 		return $error;
 
@@ -2011,39 +2011,39 @@  discard block
 
 block discarded – undo
2011 2011 
 		global $globalDBdriver;
2012 2012 
 		$Connection = new Connection();
2013 2013 
 		$error = '';
2014 
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
2014 
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
2015 2015 
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
2016 2016 
 			try {
2017 2017 
 				$sth = $Connection->db->prepare($query);
2018 2018 
 				$sth->execute();
2019 
-			} catch(PDOException $e) {
2019 
+			} catch (PDOException $e) {
2020 2020 
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
2021 2021 
 			}
2022 2022 
 		}
2023 
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
2023 
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
2024 2024 
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
2025 2025 
 			try {
2026 2026 
 				$sth = $Connection->db->prepare($query);
2027 2027 
 				$sth->execute();
2028 
-			} catch(PDOException $e) {
2028 
+			} catch (PDOException $e) {
2029 2029 
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
2030 2030 
 			}
2031 2031 
 		}
2032 
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
2032 
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
2033 2033 
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
2034 2034 
 			try {
2035 2035 
 				$sth = $Connection->db->prepare($query);
2036 2036 
 				$sth->execute();
2037 
-			} catch(PDOException $e) {
2037 
+			} catch (PDOException $e) {
2038 2038 
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
2039 2039 
 			}
2040 2040 
 		}
2041 
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
2041 
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
2042 2042 
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
2043 2043 
 			try {
2044 2044 
 				$sth = $Connection->db->prepare($query);
2045 2045 
 				$sth->execute();
2046 
-			} catch(PDOException $e) {
2046 
+			} catch (PDOException $e) {
2047 2047 
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
2048 2048 
 			}
2049 2049 
 		}
 
@@ -2051,7 +2051,7 @@  discard block
 
 block discarded – undo
2051 2051 
 		try {
2052 2052 
 			$sth = $Connection->db->prepare($query);
2053 2053 
 			$sth->execute();
2054 
-		} catch(PDOException $e) {
2054 
+		} catch (PDOException $e) {
2055 2055 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2056 2056 
 		}
2057 2057 
 		return $error;
 
@@ -2073,14 +2073,14 @@  discard block
 
 block discarded – undo
2073 2073 
 		try {
2074 2074 
 			$sth = $Connection->db->prepare($query);
2075 2075 
 			$sth->execute();
2076 
-		} catch(PDOException $e) {
2076 
+		} catch (PDOException $e) {
2077 2077 
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
2078 2078 
 		}
2079 2079 
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
2080 2080 
 		try {
2081 2081 
 			$sth = $Connection->db->prepare($query);
2082 2082 
 			$sth->execute();
2083 
-		} catch(PDOException $e) {
2083 
+		} catch (PDOException $e) {
2084 2084 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2085 2085 
 		}
2086 2086 
 		return $error;
 
@@ -2121,7 +2121,7 @@  discard block
 
 block discarded – undo
2121 2121 
 		try {
2122 2122 
 			$sth = $Connection->db->prepare($query);
2123 2123 
 			$sth->execute();
2124 
-		} catch(PDOException $e) {
2124 
+		} catch (PDOException $e) {
2125 2125 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2126 2126 
 		}
2127 2127 
 		return $error;
 
@@ -2144,7 +2144,7 @@  discard block
 
 block discarded – undo
2144 2144 
 		    try {
2145 2145 
             		$sth = $Connection->db->prepare($query);
2146 2146 
 		        $sth->execute();
2147 
-		    } catch(PDOException $e) {
2147 
+		    } catch (PDOException $e) {
2148 2148 
 			return "error : ".$e->getMessage()."\n";
2149 2149 
     		    }
2150 2150 
     		    $result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
Braces   +414 added lines, -153 removed lines patch added patch discarded remove patch 
@@ -258,7 +258,9 @@  discard block
 
 block discarded – undo
258 258 
     		// Update table countries
259 259 
     		if ($Connection->tableExists('airspace')) {
260 260 
     		    $error .= update_db::update_countries();
261 
-		    if ($error != '') return $error;
261 
+		    if ($error != '') {
262 
+		    	return $error;
263 
+		    }
262 264 
 		}
263 265 
 		// Update schema_version to 7
264 266 
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
 
@@ -314,7 +316,9 @@  discard block
 
 block discarded – undo
314 316 
     		$error = '';
315 317 
     		// Update table aircraft
316 318 
 		$error .= create_db::import_file('../db/source_location.sql');
317 
-		if ($error != '') return $error;
319 
+		if ($error != '') {
320 
+			return $error;
321 
+		}
318 322 
 		// Update schema_version to 6
319 323 
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 324 
         	try {
 
@@ -331,7 +335,9 @@  discard block
 
 block discarded – undo
331 335 
     		$error = '';
332 336 
     		// Update table aircraft
333 337 
 		$error .= create_db::import_file('../db/notam.sql');
334 
-		if ($error != '') return $error;
338 
+		if ($error != '') {
339 
+			return $error;
340 
+		}
335 341 
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 342 
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 343 
                         DELETE FROM config WHERE name = 'last_update_notam_db';
 
@@ -365,7 +371,9 @@  discard block
 
 block discarded – undo
365 371 
 		$error = '';
366 372 
     		// Update table atc
367 373 
 		$error .= create_db::import_file('../db/atc.sql');
368 
-		if ($error != '') return $error;
374 
+		if ($error != '') {
375 
+			return $error;
376 
+		}
369 377
370 378 
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 379 
         	try {
 
@@ -389,13 +397,21 @@  discard block
 
 block discarded – undo
389 397 
 		$error = '';
390 398 
     		// Add tables
391 399 
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 
-		if ($error != '') return $error;
400 
+		if ($error != '') {
401 
+			return $error;
402 
+		}
393 403 
 		$error .= create_db::import_file('../db/metar.sql');
394 
-		if ($error != '') return $error;
404 
+		if ($error != '') {
405 
+			return $error;
406 
+		}
395 407 
 		$error .= create_db::import_file('../db/taf.sql');
396 
-		if ($error != '') return $error;
408 
+		if ($error != '') {
409 
+			return $error;
410 
+		}
397 411 
 		$error .= create_db::import_file('../db/airport.sql');
398 
-		if ($error != '') return $error;
412 
+		if ($error != '') {
413 
+			return $error;
414 
+		}
399 415
400 416 
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 417 
         	try {
 
@@ -469,19 +485,33 @@  discard block
 
 block discarded – undo
469 485 
 		$error = '';
470 486 
     		// Add tables
471 487 
 		$error .= create_db::import_file('../db/stats.sql');
472 
-		if ($error != '') return $error;
488 
+		if ($error != '') {
489 
+			return $error;
490 
+		}
473 491 
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
474 
-		if ($error != '') return $error;
492 
+		if ($error != '') {
493 
+			return $error;
494 
+		}
475 495 
 		$error .= create_db::import_file('../db/stats_airline.sql');
476 
-		if ($error != '') return $error;
496 
+		if ($error != '') {
497 
+			return $error;
498 
+		}
477 499 
 		$error .= create_db::import_file('../db/stats_airport.sql');
478 
-		if ($error != '') return $error;
500 
+		if ($error != '') {
501 
+			return $error;
502 
+		}
479 503 
 		$error .= create_db::import_file('../db/stats_owner.sql');
480 
-		if ($error != '') return $error;
504 
+		if ($error != '') {
505 
+			return $error;
506 
+		}
481 507 
 		$error .= create_db::import_file('../db/stats_pilot.sql');
482 
-		if ($error != '') return $error;
508 
+		if ($error != '') {
509 
+			return $error;
510 
+		}
483 511 
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
484 
-		if ($error != '') return $error;
512 
+		if ($error != '') {
513 
+			return $error;
514 
+		}
485 515
486 516 
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 517 
         	try {
 
@@ -521,7 +551,9 @@  discard block
 
 block discarded – undo
521 551 
     		// Add tables
522 552 
     		if (!$Connection->tableExists('stats_flight')) {
523 553 
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 
-			if ($error != '') return $error;
554 
+			if ($error != '') {
555 
+				return $error;
556 
+			}
525 557 
 		}
526 558 
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 559 
         	try {
 
@@ -545,7 +577,9 @@  discard block
 
 block discarded – undo
545 577 
     		} catch(PDOException $e) {
546 578 
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 579 
     		}
548 
-		if ($error != '') return $error;
580 
+		if ($error != '') {
581 
+			return $error;
582 
+		}
549 583 
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 584 
         	try {
551 585 
             	    $sth = $Connection->db->prepare($query);
 
@@ -566,7 +600,9 @@  discard block
 
 block discarded – undo
566 600 
     		if (!$Connection->tableExists('stats_callsign')) {
567 601 
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 602 
 		}
569 
-		if ($error != '') return $error;
603 
+		if ($error != '') {
604 
+			return $error;
605 
+		}
570 606 
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 607 
         	try {
572 608 
             	    $sth = $Connection->db->prepare($query);
 
@@ -584,7 +620,9 @@  discard block
 
 block discarded – undo
584 620 
     		if (!$Connection->tableExists('stats_country')) {
585 621 
 			$error .= create_db::import_file('../db/stats_country.sql');
586 622 
 		}
587 
-		if ($error != '') return $error;
623 
+		if ($error != '') {
624 
+			return $error;
625 
+		}
588 626 
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 627 
         	try {
590 628 
             	    $sth = $Connection->db->prepare($query);
 
@@ -607,7 +645,9 @@  discard block
 
 block discarded – undo
607 645 
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 646 
     			}
609 647 
     		}
610 
-		if ($error != '') return $error;
648 
+		if ($error != '') {
649 
+			return $error;
650 
+		}
611 651 
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 652 
         	try {
613 653 
             	    $sth = $Connection->db->prepare($query);
 
@@ -623,7 +663,9 @@  discard block
 
 block discarded – undo
623 663 
 		$error = '';
624 664 
     		// Update airport table
625 665 
 		$error .= create_db::import_file('../db/airport.sql');
626 
-		if ($error != '') return 'Import airport.sql : '.$error;
666 
+		if ($error != '') {
667 
+			return 'Import airport.sql : '.$error;
668 
+		}
627 669 
 		// Remove primary key on Spotter_Archive
628 670 
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 671 
         	try {
 
@@ -699,7 +741,9 @@  discard block
 
 block discarded – undo
699 741 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 742 
     			}
701 743 
     		}
702 
-		if ($error != '') return $error;
744 
+		if ($error != '') {
745 
+			return $error;
746 
+		}
703 747 
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 748 
         	try {
705 749 
             	    $sth = $Connection->db->prepare($query);
 
@@ -717,7 +761,9 @@  discard block
 
 block discarded – undo
717 761 
     		// Update airline table
718 762 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 763 
 			$error .= create_db::import_file('../db/airlines.sql');
720 
-			if ($error != '') return 'Import airlines.sql : '.$error;
764 
+			if ($error != '') {
765 
+				return 'Import airlines.sql : '.$error;
766 
+			}
721 767 
 		}
722 768 
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 769 
 			// Add column over_country
 
@@ -729,7 +775,9 @@  discard block
 
 block discarded – undo
729 775 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 776 
     			}
731 777 
     		}
732 
-		if ($error != '') return $error;
778 
+		if ($error != '') {
779 
+			return $error;
780 
+		}
733 781 
 		/*
734 782 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
735 783 
 			// Force update ModeS (this will put type_flight data
 
@@ -759,7 +807,9 @@  discard block
 
 block discarded – undo
759 807 
 			} catch(PDOException $e) {
760 808 
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 809 
 			}
762 
-			if ($error != '') return $error;
810 
+			if ($error != '') {
811 
+				return $error;
812 
+			}
763 813 
 		}
764 814 
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 815 
         	try {
 
@@ -782,7 +832,9 @@  discard block
 
 block discarded – undo
782 832 
 			} else {
783 833 
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 834 
 			}
785 
-			if ($error != '') return $error;
835 
+			if ($error != '') {
836 
+				return $error;
837 
+			}
786 838 
 		}
787 839 
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 840 
         	try {
 
@@ -804,12 +856,16 @@  discard block
 
 block discarded – undo
804 856 
 		if ($globalDBdriver == 'mysql') {
805 857 
 			if (!$Connection->tableExists('tle')) {
806 858 
 				$error .= create_db::import_file('../db/tle.sql');
807 
-				if ($error != '') return $error;
859 
+				if ($error != '') {
860 
+					return $error;
861 
+				}
808 862 
 			}
809 863 
 		} else {
810 864 
 			if (!$Connection->tableExists('tle')) {
811 865 
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
812 
-				if ($error != '') return $error;
866 
+				if ($error != '') {
867 
+					return $error;
868 
+				}
813 869 
 			}
814 870 
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
815 871 
 			try {
 
@@ -849,7 +905,9 @@  discard block
 
 block discarded – undo
849 905 
 		} else {
850 906 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
851 907 
 		}
852 
-		if ($error != '') return 'Import airlines.sql : '.$error;
908 
+		if ($error != '') {
909 
+			return 'Import airlines.sql : '.$error;
910 
+		}
853 911 
 		if (!$Connection->checkColumnName('airlines','forsource')) {
854 912 
 			// Add forsource to airlines
855 913 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 
@@ -1332,20 +1390,28 @@  discard block
 
 block discarded – undo
1332 1390 
 		}
1333 1391 
 		if ($globalDBdriver == 'mysql') {
1334 1392 
 			$error .= create_db::import_file('../db/airlines.sql');
1335 
-			if ($error != '') return $error;
1393 
+			if ($error != '') {
1394 
+				return $error;
1395 
+			}
1336 1396 
 		} else {
1337 1397 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
1338 
-			if ($error != '') return $error;
1398 
+			if ($error != '') {
1399 
+				return $error;
1400 
+			}
1339 1401 
 		}
1340 1402 
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
1341 1403 
 			include_once(dirname(__FILE__).'/class.update_db.php');
1342 1404 
 			if (isset($globalVATSIM) && $globalVATSIM) {
1343 1405 
 				$error .= update_db::update_vatsim();
1344 
-				if ($error != '') return $error;
1406 
+				if ($error != '') {
1407 
+					return $error;
1408 
+				}
1345 1409 
 			}
1346 1410 
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
1347 1411 
 				$error .= update_db::update_IVAO();
1348 
-				if ($error != '') return $error;
1412 
+				if ($error != '') {
1413 
+					return $error;
1414 
+				}
1349 1415 
 			}
1350 1416 
 		}
1351 1417 
 
@@ -1608,41 +1674,65 @@  discard block
 
 block discarded – undo
1608 1674 
 		if ($globalDBdriver == 'mysql') {
1609 1675 
 			if (!$Connection->tableExists('tracker_output')) {
1610 1676 
 				$error .= create_db::import_file('../db/tracker_output.sql');
1611 
-				if ($error != '') return $error;
1677 
+				if ($error != '') {
1678 
+					return $error;
1679 
+				}
1612 1680 
 			}
1613 1681 
 			if (!$Connection->tableExists('tracker_live')) {
1614 1682 
 				$error .= create_db::import_file('../db/tracker_live.sql');
1615 
-				if ($error != '') return $error;
1683 
+				if ($error != '') {
1684 
+					return $error;
1685 
+				}
1616 1686 
 			}
1617 1687 
 			if (!$Connection->tableExists('marine_output')) {
1618 1688 
 				$error .= create_db::import_file('../db/marine_output.sql');
1619 
-				if ($error != '') return $error;
1689 
+				if ($error != '') {
1690 
+					return $error;
1691 
+				}
1620 1692 
 			}
1621 1693 
 			if (!$Connection->tableExists('marine_live')) {
1622 1694 
 				$error .= create_db::import_file('../db/marine_live.sql');
1623 
-				if ($error != '') return $error;
1695 
+				if ($error != '') {
1696 
+					return $error;
1697 
+				}
1624 1698 
 			}
1625 1699 
 			if (!$Connection->tableExists('marine_identity')) {
1626 1700 
 				$error .= create_db::import_file('../db/marine_identity.sql');
1627 
-				if ($error != '') return $error;
1701 
+				if ($error != '') {
1702 
+					return $error;
1703 
+				}
1628 1704 
 			}
1629 1705 
 			if (!$Connection->tableExists('marine_mid')) {
1630 1706 
 				$error .= create_db::import_file('../db/marine_mid.sql');
1631 
-				if ($error != '') return $error;
1707 
+				if ($error != '') {
1708 
+					return $error;
1709 
+				}
1632 1710 
 			}
1633 1711 
 		} else {
1634 1712 
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
1635 
-			if ($error != '') return $error;
1713 
+			if ($error != '') {
1714 
+				return $error;
1715 
+			}
1636 1716 
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
1637 
-			if ($error != '') return $error;
1717 
+			if ($error != '') {
1718 
+				return $error;
1719 
+			}
1638 1720 
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
1639 
-			if ($error != '') return $error;
1721 
+			if ($error != '') {
1722 
+				return $error;
1723 
+			}
1640 1724 
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
1641 
-			if ($error != '') return $error;
1725 
+			if ($error != '') {
1726 
+				return $error;
1727 
+			}
1642 1728 
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
1643 
-			if ($error != '') return $error;
1729 
+			if ($error != '') {
1730 
+				return $error;
1731 
+			}
1644 1732 
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
1645 
-			if ($error != '') return $error;
1733 
+			if ($error != '') {
1734 
+				return $error;
1735 
+			}
1646 1736 
 		}
1647 1737 
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
1648 1738 
 		try {
 
@@ -1661,39 +1751,61 @@  discard block
 
 block discarded – undo
1661 1751 
 		if ($globalDBdriver == 'mysql') {
1662 1752 
 			if (!$Connection->tableExists('marine_image')) {
1663 1753 
 				$error .= create_db::import_file('../db/marine_image.sql');
1664 
-				if ($error != '') return $error;
1754 
+				if ($error != '') {
1755 
+					return $error;
1756 
+				}
1665 1757 
 			}
1666 1758 
 			if (!$Connection->tableExists('marine_archive')) {
1667 1759 
 				$error .= create_db::import_file('../db/marine_archive.sql');
1668 
-				if ($error != '') return $error;
1760 
+				if ($error != '') {
1761 
+					return $error;
1762 
+				}
1669 1763 
 			}
1670 1764 
 			if (!$Connection->tableExists('marine_archive_output')) {
1671 1765 
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
1672 
-				if ($error != '') return $error;
1766 
+				if ($error != '') {
1767 
+					return $error;
1768 
+				}
1673 1769 
 			}
1674 1770 
 			if (!$Connection->tableExists('tracker_archive')) {
1675 1771 
 				$error .= create_db::import_file('../db/tracker_archive.sql');
1676 
-				if ($error != '') return $error;
1772 
+				if ($error != '') {
1773 
+					return $error;
1774 
+				}
1677 1775 
 			}
1678 1776 
 			if (!$Connection->tableExists('tracker_archive_output')) {
1679 1777 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1680 
-				if ($error != '') return $error;
1778 
+				if ($error != '') {
1779 
+					return $error;
1780 
+				}
1681 1781 
 			}
1682 1782 
 			if (!$Connection->tableExists('marine_archive_output')) {
1683 1783 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1684 
-				if ($error != '') return $error;
1784 
+				if ($error != '') {
1785 
+					return $error;
1786 
+				}
1685 1787 
 			}
1686 1788 
 		} else {
1687 1789 
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
1688 
-			if ($error != '') return $error;
1790 
+			if ($error != '') {
1791 
+				return $error;
1792 
+			}
1689 1793 
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
1690 
-			if ($error != '') return $error;
1794 
+			if ($error != '') {
1795 
+				return $error;
1796 
+			}
1691 1797 
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
1692 
-			if ($error != '') return $error;
1798 
+			if ($error != '') {
1799 
+				return $error;
1800 
+			}
1693 1801 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
1694 
-			if ($error != '') return $error;
1802 
+			if ($error != '') {
1803 
+				return $error;
1804 
+			}
1695 1805 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
1696 
-			if ($error != '') return $error;
1806 
+			if ($error != '') {
1807 
+				return $error;
1808 
+			}
1697 1809 
 		}
1698 1810 
 		if ($globalDBdriver == 'mysql') {
1699 1811 
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
 
@@ -2064,7 +2176,9 @@  discard block
 
 block discarded – undo
2064 2176 
 		if ($globalDBdriver == 'mysql') {
2065 2177 
 			if (!$Connection->tableExists('tracker_archive_output')) {
2066 2178 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
2067 
-				if ($error != '') return $error;
2179 
+				if ($error != '') {
2180 
+					return $error;
2181 
+				}
2068 2182 
 			}
2069 2183 
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
2070 2184 
 		} else {
 
@@ -2092,14 +2206,22 @@  discard block
 
 block discarded – undo
2092 2206 
 		$error = '';
2093 2207 
 		if ($globalDBdriver == 'mysql') {
2094 2208 
 			$error .= create_db::import_file('../db/airport.sql');
2095 
-			if ($error != '') return $error;
2209 
+			if ($error != '') {
2210 
+				return $error;
2211 
+			}
2096 2212 
 			$error .= create_db::import_file('../db/airlines.sql');
2097 
-			if ($error != '') return $error;
2213 
+			if ($error != '') {
2214 
+				return $error;
2215 
+			}
2098 2216 
 		} else {
2099 2217 
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
2100 
-			if ($error != '') return $error;
2218 
+			if ($error != '') {
2219 
+				return $error;
2220 
+			}
2101 2221 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
2102 
-			if ($error != '') return $error;
2222 
+			if ($error != '') {
2223 
+				return $error;
2224 
+			}
2103 2225 
 		}
2104 2226 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
2105 2227 
 			if (file_exists('tmp/ivae_feb2013.zip')) {
 
@@ -2116,7 +2238,9 @@  discard block
 
 block discarded – undo
2116 2238 
 				$error .= update_db::update_vatsim();
2117 2239 
 			}
2118 2240 
 		}
2119 
-		if ($error != '') return $error;
2241 
+		if ($error != '') {
2242 
+			return $error;
2243 
+		}
2120 2244 
 		$query = "UPDATE config SET value = '45' WHERE name = 'schema_version'";
2121 2245 
 		try {
2122 2246 
 			$sth = $Connection->db->prepare($query);
 
@@ -2136,8 +2260,11 @@  discard block
 
 block discarded – undo
2136 2260 
     	    if ($Connection->tableExists('aircraft')) {
2137 2261 
     		if (!$Connection->tableExists('config')) {
2138 2262 
     		    $version = '1';
2139 
-    		    if ($update) return self::update_from_1();
2140 
-    		    else return $version;
2263 
+    		    if ($update) {
2264 
+    		    	return self::update_from_1();
2265 
+    		    } else {
2266 
+    		    	return $version;
2267 
+    		    }
2141 2268 
 		} else {
2142 2269 
     		    $Connection = new Connection();
2143 2270 
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 
@@ -2151,182 +2278,316 @@  discard block
 
 block discarded – undo
2151 2278 
     		    if ($update) {
2152 2279 
     			if ($result['value'] == '2') {
2153 2280 
     			    $error = self::update_from_2();
2154 
-    			    if ($error != '') return $error;
2155 
-    			    else return self::check_version(true);
2281 
+    			    if ($error != '') {
2282 
+    			    	return $error;
2283 
+    			    } else {
2284 
+    			    	return self::check_version(true);
2285 
+    			    }
2156 2286 
     			} elseif ($result['value'] == '3') {
2157 2287 
     			    $error = self::update_from_3();
2158 
-    			    if ($error != '') return $error;
2159 
-    			    else return self::check_version(true);
2288 
+    			    if ($error != '') {
2289 
+    			    	return $error;
2290 
+    			    } else {
2291 
+    			    	return self::check_version(true);
2292 
+    			    }
2160 2293 
     			} elseif ($result['value'] == '4') {
2161 2294 
     			    $error = self::update_from_4();
2162 
-    			    if ($error != '') return $error;
2163 
-    			    else return self::check_version(true);
2295 
+    			    if ($error != '') {
2296 
+    			    	return $error;
2297 
+    			    } else {
2298 
+    			    	return self::check_version(true);
2299 
+    			    }
2164 2300 
     			} elseif ($result['value'] == '5') {
2165 2301 
     			    $error = self::update_from_5();
2166 
-    			    if ($error != '') return $error;
2167 
-    			    else return self::check_version(true);
2302 
+    			    if ($error != '') {
2303 
+    			    	return $error;
2304 
+    			    } else {
2305 
+    			    	return self::check_version(true);
2306 
+    			    }
2168 2307 
     			} elseif ($result['value'] == '6') {
2169 2308 
     			    $error = self::update_from_6();
2170 
-    			    if ($error != '') return $error;
2171 
-    			    else return self::check_version(true);
2309 
+    			    if ($error != '') {
2310 
+    			    	return $error;
2311 
+    			    } else {
2312 
+    			    	return self::check_version(true);
2313 
+    			    }
2172 2314 
     			} elseif ($result['value'] == '7') {
2173 2315 
     			    $error = self::update_from_7();
2174 
-    			    if ($error != '') return $error;
2175 
-    			    else return self::check_version(true);
2316 
+    			    if ($error != '') {
2317 
+    			    	return $error;
2318 
+    			    } else {
2319 
+    			    	return self::check_version(true);
2320 
+    			    }
2176 2321 
     			} elseif ($result['value'] == '8') {
2177 2322 
     			    $error = self::update_from_8();
2178 
-    			    if ($error != '') return $error;
2179 
-    			    else return self::check_version(true);
2323 
+    			    if ($error != '') {
2324 
+    			    	return $error;
2325 
+    			    } else {
2326 
+    			    	return self::check_version(true);
2327 
+    			    }
2180 2328 
     			} elseif ($result['value'] == '9') {
2181 2329 
     			    $error = self::update_from_9();
2182 
-    			    if ($error != '') return $error;
2183 
-    			    else return self::check_version(true);
2330 
+    			    if ($error != '') {
2331 
+    			    	return $error;
2332 
+    			    } else {
2333 
+    			    	return self::check_version(true);
2334 
+    			    }
2184 2335 
     			} elseif ($result['value'] == '10') {
2185 2336 
     			    $error = self::update_from_10();
2186 
-    			    if ($error != '') return $error;
2187 
-    			    else return self::check_version(true);
2337 
+    			    if ($error != '') {
2338 
+    			    	return $error;
2339 
+    			    } else {
2340 
+    			    	return self::check_version(true);
2341 
+    			    }
2188 2342 
     			} elseif ($result['value'] == '11') {
2189 2343 
     			    $error = self::update_from_11();
2190 
-    			    if ($error != '') return $error;
2191 
-    			    else return self::check_version(true);
2344 
+    			    if ($error != '') {
2345 
+    			    	return $error;
2346 
+    			    } else {
2347 
+    			    	return self::check_version(true);
2348 
+    			    }
2192 2349 
     			} elseif ($result['value'] == '12') {
2193 2350 
     			    $error = self::update_from_12();
2194 
-    			    if ($error != '') return $error;
2195 
-    			    else return self::check_version(true);
2351 
+    			    if ($error != '') {
2352 
+    			    	return $error;
2353 
+    			    } else {
2354 
+    			    	return self::check_version(true);
2355 
+    			    }
2196 2356 
     			} elseif ($result['value'] == '13') {
2197 2357 
     			    $error = self::update_from_13();
2198 
-    			    if ($error != '') return $error;
2199 
-    			    else return self::check_version(true);
2358 
+    			    if ($error != '') {
2359 
+    			    	return $error;
2360 
+    			    } else {
2361 
+    			    	return self::check_version(true);
2362 
+    			    }
2200 2363 
     			} elseif ($result['value'] == '14') {
2201 2364 
     			    $error = self::update_from_14();
2202 
-    			    if ($error != '') return $error;
2203 
-    			    else return self::check_version(true);
2365 
+    			    if ($error != '') {
2366 
+    			    	return $error;
2367 
+    			    } else {
2368 
+    			    	return self::check_version(true);
2369 
+    			    }
2204 2370 
     			} elseif ($result['value'] == '15') {
2205 2371 
     			    $error = self::update_from_15();
2206 
-    			    if ($error != '') return $error;
2207 
-    			    else return self::check_version(true);
2372 
+    			    if ($error != '') {
2373 
+    			    	return $error;
2374 
+    			    } else {
2375 
+    			    	return self::check_version(true);
2376 
+    			    }
2208 2377 
     			} elseif ($result['value'] == '16') {
2209 2378 
     			    $error = self::update_from_16();
2210 
-    			    if ($error != '') return $error;
2211 
-    			    else return self::check_version(true);
2379 
+    			    if ($error != '') {
2380 
+    			    	return $error;
2381 
+    			    } else {
2382 
+    			    	return self::check_version(true);
2383 
+    			    }
2212 2384 
     			} elseif ($result['value'] == '17') {
2213 2385 
     			    $error = self::update_from_17();
2214 
-    			    if ($error != '') return $error;
2215 
-    			    else return self::check_version(true);
2386 
+    			    if ($error != '') {
2387 
+    			    	return $error;
2388 
+    			    } else {
2389 
+    			    	return self::check_version(true);
2390 
+    			    }
2216 2391 
     			} elseif ($result['value'] == '18') {
2217 2392 
     			    $error = self::update_from_18();
2218 
-    			    if ($error != '') return $error;
2219 
-    			    else return self::check_version(true);
2393 
+    			    if ($error != '') {
2394 
+    			    	return $error;
2395 
+    			    } else {
2396 
+    			    	return self::check_version(true);
2397 
+    			    }
2220 2398 
     			} elseif ($result['value'] == '19') {
2221 2399 
     			    $error = self::update_from_19();
2222 
-    			    if ($error != '') return $error;
2223 
-    			    else return self::check_version(true);
2400 
+    			    if ($error != '') {
2401 
+    			    	return $error;
2402 
+    			    } else {
2403 
+    			    	return self::check_version(true);
2404 
+    			    }
2224 2405 
     			} elseif ($result['value'] == '20') {
2225 2406 
     			    $error = self::update_from_20();
2226 
-    			    if ($error != '') return $error;
2227 
-    			    else return self::check_version(true);
2407 
+    			    if ($error != '') {
2408 
+    			    	return $error;
2409 
+    			    } else {
2410 
+    			    	return self::check_version(true);
2411 
+    			    }
2228 2412 
     			} elseif ($result['value'] == '21') {
2229 2413 
     			    $error = self::update_from_21();
2230 
-    			    if ($error != '') return $error;
2231 
-    			    else return self::check_version(true);
2414 
+    			    if ($error != '') {
2415 
+    			    	return $error;
2416 
+    			    } else {
2417 
+    			    	return self::check_version(true);
2418 
+    			    }
2232 2419 
     			} elseif ($result['value'] == '22') {
2233 2420 
     			    $error = self::update_from_22();
2234 
-    			    if ($error != '') return $error;
2235 
-    			    else return self::check_version(true);
2421 
+    			    if ($error != '') {
2422 
+    			    	return $error;
2423 
+    			    } else {
2424 
+    			    	return self::check_version(true);
2425 
+    			    }
2236 2426 
     			} elseif ($result['value'] == '23') {
2237 2427 
     			    $error = self::update_from_23();
2238 
-    			    if ($error != '') return $error;
2239 
-    			    else return self::check_version(true);
2428 
+    			    if ($error != '') {
2429 
+    			    	return $error;
2430 
+    			    } else {
2431 
+    			    	return self::check_version(true);
2432 
+    			    }
2240 2433 
     			} elseif ($result['value'] == '24') {
2241 2434 
     			    $error = self::update_from_24();
2242 
-    			    if ($error != '') return $error;
2243 
-    			    else return self::check_version(true);
2435 
+    			    if ($error != '') {
2436 
+    			    	return $error;
2437 
+    			    } else {
2438 
+    			    	return self::check_version(true);
2439 
+    			    }
2244 2440 
     			} elseif ($result['value'] == '25') {
2245 2441 
     			    $error = self::update_from_25();
2246 
-    			    if ($error != '') return $error;
2247 
-    			    else return self::check_version(true);
2442 
+    			    if ($error != '') {
2443 
+    			    	return $error;
2444 
+    			    } else {
2445 
+    			    	return self::check_version(true);
2446 
+    			    }
2248 2447 
     			} elseif ($result['value'] == '26') {
2249 2448 
     			    $error = self::update_from_26();
2250 
-    			    if ($error != '') return $error;
2251 
-    			    else return self::check_version(true);
2449 
+    			    if ($error != '') {
2450 
+    			    	return $error;
2451 
+    			    } else {
2452 
+    			    	return self::check_version(true);
2453 
+    			    }
2252 2454 
     			} elseif ($result['value'] == '27') {
2253 2455 
     			    $error = self::update_from_27();
2254 
-    			    if ($error != '') return $error;
2255 
-    			    else return self::check_version(true);
2456 
+    			    if ($error != '') {
2457 
+    			    	return $error;
2458 
+    			    } else {
2459 
+    			    	return self::check_version(true);
2460 
+    			    }
2256 2461 
     			} elseif ($result['value'] == '28') {
2257 2462 
     			    $error = self::update_from_28();
2258 
-    			    if ($error != '') return $error;
2259 
-    			    else return self::check_version(true);
2463 
+    			    if ($error != '') {
2464 
+    			    	return $error;
2465 
+    			    } else {
2466 
+    			    	return self::check_version(true);
2467 
+    			    }
2260 2468 
     			} elseif ($result['value'] == '29') {
2261 2469 
     			    $error = self::update_from_29();
2262 
-    			    if ($error != '') return $error;
2263 
-    			    else return self::check_version(true);
2470 
+    			    if ($error != '') {
2471 
+    			    	return $error;
2472 
+    			    } else {
2473 
+    			    	return self::check_version(true);
2474 
+    			    }
2264 2475 
     			} elseif ($result['value'] == '30') {
2265 2476 
     			    $error = self::update_from_30();
2266 
-    			    if ($error != '') return $error;
2267 
-    			    else return self::check_version(true);
2477 
+    			    if ($error != '') {
2478 
+    			    	return $error;
2479 
+    			    } else {
2480 
+    			    	return self::check_version(true);
2481 
+    			    }
2268 2482 
     			} elseif ($result['value'] == '31') {
2269 2483 
     			    $error = self::update_from_31();
2270 
-    			    if ($error != '') return $error;
2271 
-    			    else return self::check_version(true);
2484 
+    			    if ($error != '') {
2485 
+    			    	return $error;
2486 
+    			    } else {
2487 
+    			    	return self::check_version(true);
2488 
+    			    }
2272 2489 
     			} elseif ($result['value'] == '32') {
2273 2490 
     			    $error = self::update_from_32();
2274 
-    			    if ($error != '') return $error;
2275 
-    			    else return self::check_version(true);
2491 
+    			    if ($error != '') {
2492 
+    			    	return $error;
2493 
+    			    } else {
2494 
+    			    	return self::check_version(true);
2495 
+    			    }
2276 2496 
     			} elseif ($result['value'] == '33') {
2277 2497 
     			    $error = self::update_from_33();
2278 
-    			    if ($error != '') return $error;
2279 
-    			    else return self::check_version(true);
2498 
+    			    if ($error != '') {
2499 
+    			    	return $error;
2500 
+    			    } else {
2501 
+    			    	return self::check_version(true);
2502 
+    			    }
2280 2503 
     			} elseif ($result['value'] == '34') {
2281 2504 
     			    $error = self::update_from_34();
2282 
-    			    if ($error != '') return $error;
2283 
-    			    else return self::check_version(true);
2505 
+    			    if ($error != '') {
2506 
+    			    	return $error;
2507 
+    			    } else {
2508 
+    			    	return self::check_version(true);
2509 
+    			    }
2284 2510 
     			} elseif ($result['value'] == '35') {
2285 2511 
     			    $error = self::update_from_35();
2286 
-    			    if ($error != '') return $error;
2287 
-    			    else return self::check_version(true);
2512 
+    			    if ($error != '') {
2513 
+    			    	return $error;
2514 
+    			    } else {
2515 
+    			    	return self::check_version(true);
2516 
+    			    }
2288 2517 
     			} elseif ($result['value'] == '36') {
2289 2518 
     			    $error = self::update_from_36();
2290 
-    			    if ($error != '') return $error;
2291 
-    			    else return self::check_version(true);
2519 
+    			    if ($error != '') {
2520 
+    			    	return $error;
2521 
+    			    } else {
2522 
+    			    	return self::check_version(true);
2523 
+    			    }
2292 2524 
     			} elseif ($result['value'] == '37') {
2293 2525 
     			    $error = self::update_from_37();
2294 
-    			    if ($error != '') return $error;
2295 
-    			    else return self::check_version(true);
2526 
+    			    if ($error != '') {
2527 
+    			    	return $error;
2528 
+    			    } else {
2529 
+    			    	return self::check_version(true);
2530 
+    			    }
2296 2531 
     			} elseif ($result['value'] == '38') {
2297 2532 
     			    $error = self::update_from_38();
2298 
-    			    if ($error != '') return $error;
2299 
-    			    else return self::check_version(true);
2533 
+    			    if ($error != '') {
2534 
+    			    	return $error;
2535 
+    			    } else {
2536 
+    			    	return self::check_version(true);
2537 
+    			    }
2300 2538 
     			} elseif ($result['value'] == '39') {
2301 2539 
     			    $error = self::update_from_39();
2302 
-    			    if ($error != '') return $error;
2303 
-    			    else return self::check_version(true);
2540 
+    			    if ($error != '') {
2541 
+    			    	return $error;
2542 
+    			    } else {
2543 
+    			    	return self::check_version(true);
2544 
+    			    }
2304 2545 
     			} elseif ($result['value'] == '40') {
2305 2546 
     			    $error = self::update_from_40();
2306 
-    			    if ($error != '') return $error;
2307 
-    			    else return self::check_version(true);
2547 
+    			    if ($error != '') {
2548 
+    			    	return $error;
2549 
+    			    } else {
2550 
+    			    	return self::check_version(true);
2551 
+    			    }
2308 2552 
     			} elseif ($result['value'] == '41') {
2309 2553 
     			    $error = self::update_from_41();
2310 
-    			    if ($error != '') return $error;
2311 
-    			    else return self::check_version(true);
2554 
+    			    if ($error != '') {
2555 
+    			    	return $error;
2556 
+    			    } else {
2557 
+    			    	return self::check_version(true);
2558 
+    			    }
2312 2559 
     			} elseif ($result['value'] == '42') {
2313 2560 
     			    $error = self::update_from_42();
2314 
-    			    if ($error != '') return $error;
2315 
-    			    else return self::check_version(true);
2561 
+    			    if ($error != '') {
2562 
+    			    	return $error;
2563 
+    			    } else {
2564 
+    			    	return self::check_version(true);
2565 
+    			    }
2316 2566 
     			} elseif ($result['value'] == '43') {
2317 2567 
     			    $error = self::update_from_43();
2318 
-    			    if ($error != '') return $error;
2319 
-    			    else return self::check_version(true);
2568 
+    			    if ($error != '') {
2569 
+    			    	return $error;
2570 
+    			    } else {
2571 
+    			    	return self::check_version(true);
2572 
+    			    }
2320 2573 
     			} elseif ($result['value'] == '44') {
2321 2574 
     			    $error = self::update_from_44();
2322 
-    			    if ($error != '') return $error;
2323 
-    			    else return self::check_version(true);
2324 
-    			} else return '';
2575 
+    			    if ($error != '') {
2576 
+    			    	return $error;
2577 
+    			    } else {
2578 
+    			    	return self::check_version(true);
2579 
+    			    }
2580 
+    			} else {
2581 
+    				return '';
2582 
+    			}
2583 
+    		    } else {
2584 
+    		    	return $result['value'];
2325 2585 
     		    }
2326 
-    		    else return $result['value'];
2327 2586 
 		}
2328 2587
2329 
-	    } else return $version;
2588 
+	    } else {
2589 
+	    	return $version;
2590 
+	    }
2330 2591 
     	}
2331 2592
2332 2593 
 }
Please login to merge, or discard this patch.