Completed
Push — master ( 67e91c...dfe66c )
by Yannick
07:57
created
require/class.ATC.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -15,22 +15,22 @@  discard block
 block discarded – undo
15 15
     * @param Array $filter the filter
16 16
     * @return Array the SQL part
17 17
     */
18
-    public function getFilter($filter = array(),$where = false,$and = false) {
18
+    public function getFilter($filter = array(), $where = false, $and = false) {
19 19
 	global $globalFilter, $globalStatsFilters, $globalFilterName;
20 20
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21
 	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22
-		foreach($globalStatsFilters[$globalFilterName] as $source) {
22
+		foreach ($globalStatsFilters[$globalFilterName] as $source) {
23 23
 			if (isset($source['source'])) $filter['source'][] = $source['source'];
24 24
 		}
25 25
 	    } else {
26 26
 		$filter = $globalStatsFilters[$globalFilterName];
27 27
 	    }
28 28
 	}
29
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
29
+	if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
30 30
 	$filter_query_join = '';
31 31
 	$filter_query_where = '';
32 32
 	if (isset($filter['source']) && !empty($filter['source'])) {
33
-	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
33
+	    $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
34 34
 	}
35 35
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36 36
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -45,25 +45,25 @@  discard block
 block discarded – undo
45 45
                  try {
46 46
                         $sth = $this->db->prepare($query);
47 47
                         $sth->execute($query_values);
48
-                } catch(PDOException $e) {
48
+                } catch (PDOException $e) {
49 49
                         return "error : ".$e->getMessage();
50 50
                 }
51 51
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
52 52
                 return $all;
53 53
         }
54 54
 
55
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
56
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
57
-    		$info = str_replace('^','<br />',$info);
58
-    		$info = str_replace('&amp;sect;','',$info);
59
-    		$info = str_replace('"','',$info);
55
+       public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
56
+    		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
57
+    		$info = str_replace('^', '<br />', $info);
58
+    		$info = str_replace('&amp;sect;', '', $info);
59
+    		$info = str_replace('"', '', $info);
60 60
     		if ($type == '') $type = NULL;
61 61
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
62
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
62
+                $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
63 63
                  try {
64 64
                         $sth = $this->db->prepare($query);
65 65
                         $sth->execute($query_values);
66
-                } catch(PDOException $e) {
66
+                } catch (PDOException $e) {
67 67
                         return "error : ".$e->getMessage();
68 68
                 }
69 69
         }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                  try {
75 75
                         $sth = $this->db->prepare($query);
76 76
                         $sth->execute($query_values);
77
-                } catch(PDOException $e) {
77
+                } catch (PDOException $e) {
78 78
                         return "error : ".$e->getMessage();
79 79
                 }
80 80
         }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                  try {
86 86
                         $sth = $this->db->prepare($query);
87 87
                         $sth->execute($query_values);
88
-                } catch(PDOException $e) {
88
+                } catch (PDOException $e) {
89 89
                         return "error : ".$e->getMessage();
90 90
                 }
91 91
         }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                 try {
101 101
                         $sth = $this->db->prepare($query);
102 102
                         $sth->execute();
103
-                } catch(PDOException $e) {
103
+                } catch (PDOException $e) {
104 104
                         return "error";
105 105
                 }
106 106
                 return "success";
Please login to merge, or discard this patch.
install/index.php 1 patch
Spacing   +201 added lines, -201 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 require_once(dirname(__FILE__).'/class.create_db.php');
10 10
 require_once(dirname(__FILE__).'/class.update_schema.php');
11 11
 require_once(dirname(__FILE__).'/class.settings.php');
12
-$title="Install";
12
+$title = "Install";
13 13
 require(dirname(__FILE__).'/../require/settings.php');
14 14
 require(dirname(__FILE__).'/header.php');
15 15
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 if (!extension_loaded('curl')) {
67 67
 	$error[] = "Curl is not loaded.";
68 68
 }
69
-if(function_exists('apache_get_modules') ){
70
-	if(!in_array('mod_rewrite',apache_get_modules())) {
69
+if (function_exists('apache_get_modules')) {
70
+	if (!in_array('mod_rewrite', apache_get_modules())) {
71 71
 		$error[] = "mod_rewrite is not available.";
72 72
 	}
73 73
 /*
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>';
84 84
 if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
85 85
 	if (function_exists('get_headers')) {
86
-		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
87
-		if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
86
+		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
87
+		if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
88 88
 			print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
89 89
 		}
90 90
 	}
@@ -424,13 +424,13 @@  discard block
 block discarded – undo
424 424
 ?>
425 425
 							<tr>
426 426
 								<?php
427
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
427
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
428 428
 								?>
429 429
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
430 430
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
431 431
 								<?php
432 432
 								    } else {
433
-									$hostport = explode(':',$source['host']);
433
+									$hostport = explode(':', $source['host']);
434 434
 									if (isset($hostport[1])) {
435 435
 										$host = $hostport[0];
436 436
 										$port = $hostport[1];
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
 			<br />
765 765
 			<p>
766 766
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
767
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
767
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
768 768
 			</p>
769 769
 			<br />
770 770
 			<p>
@@ -810,14 +810,14 @@  discard block
 block discarded – undo
810 810
 $error = '';
811 811
 
812 812
 if (isset($_POST['dbtype'])) {
813
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
814
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
815
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
816
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
817
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
818
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
819
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
820
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
813
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
814
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
815
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
816
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
817
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
818
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
819
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
820
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
821 821
 
822 822
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
823 823
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -837,48 +837,48 @@  discard block
 block discarded – undo
837 837
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
838 838
 	*/
839 839
 	
840
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
840
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
841 841
 
842
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
843
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
844
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
845
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
846
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
842
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
843
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
844
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
845
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
846
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
847 847
 
848
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
849
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
850
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
851
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
852
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
853
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
854
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
855
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
856
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey));
848
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
849
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
850
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
851
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
852
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
853
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
854
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
855
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
856
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey));
857 857
 	
858
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
859
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
860
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
861
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
862
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
863
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
858
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
859
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
860
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
861
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
862
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
863
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
864 864
 
865
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
866
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
865
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
866
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
867 867
 
868
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
869
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
870
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
868
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
869
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
870
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
871 871
 
872
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
872
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
873 873
 	if ($acars == 'acars') {
874
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
874
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
875 875
 	} else {
876
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
876
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
877 877
 	}
878 878
 
879
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
880
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
881
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
879
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
880
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
881
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
882 882
 	
883 883
 	$source_name = $_POST['source_name'];
884 884
 	$source_latitude = $_POST['source_latitude'];
@@ -892,8 +892,8 @@  discard block
 block discarded – undo
892 892
 	
893 893
 	$sources = array();
894 894
 	foreach ($source_name as $keys => $name) {
895
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
896
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
895
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
896
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
897 897
 	}
898 898
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
899 899
 
@@ -906,13 +906,13 @@  discard block
 block discarded – undo
906 906
 	$sbsurl = $_POST['sbsurl'];
907 907
 	*/
908 908
 
909
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
910
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
911
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
912
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
913
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
914
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
915
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
909
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
910
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
911
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
912
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
913
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
914
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
915
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
916 916
 
917 917
 /*	
918 918
 	$globalSBS1Hosts = array();
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
 	}
929 929
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
930 930
 */
931
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
931
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
932 932
 	$host = $_POST['host'];
933 933
 	$port = $_POST['port'];
934 934
 	$name = $_POST['name'];
@@ -939,96 +939,96 @@  discard block
 block discarded – undo
939 939
 	foreach ($host as $key => $h) {
940 940
 		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
941 941
 		else $cov = 'FALSE';
942
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
942
+		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov);
943 943
 	}
944
-	$settings = array_merge($settings,array('globalSources' => $gSources));
944
+	$settings = array_merge($settings, array('globalSources' => $gSources));
945 945
 
946 946
 /*
947 947
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
948 948
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
949 949
 */
950
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
951
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
952
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
950
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
951
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
952
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
953 953
 
954
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
955
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
954
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
955
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
956 956
 
957
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
958
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
959
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
960
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
957
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
958
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
959
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
960
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
961 961
 
962
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
963
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
964
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
962
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
963
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
964
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
965 965
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
966
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
967
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
966
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
967
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
968 968
 
969
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
970
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
971
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
972
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
973
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
974
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
975
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
976
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
969
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
970
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
971
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
972
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
973
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
974
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
975
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
976
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
977 977
 
978
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
979
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
978
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
979
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
980 980
 
981
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
982
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
981
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
982
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
983 983
 	
984
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
984
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
985 985
 	if ($archiveyear == "archiveyear") {
986
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
986
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
987 987
 	} else {
988
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
988
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
989 989
 	}
990
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
991
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
992
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
993
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
990
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
991
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
992
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
993
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
994 994
 
995
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
996
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
997
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
998
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
995
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
996
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
997
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
998
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
999 999
 
1000
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1001
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1002
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1000
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1001
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1002
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1003 1003
 
1004 1004
 	// Create in settings.php keys not yet configurable if not already here
1005 1005
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1006
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1006
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1007 1007
 
1008
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1008
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1009 1009
 	if ($resetyearstats == 'resetyearstats') {
1010
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1010
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1011 1011
 	} else {
1012
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1012
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1013 1013
 	}
1014 1014
 
1015
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1015
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1016 1016
 	if ($archive == 'archive') {
1017
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1017
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1018 1018
 	} else {
1019
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1019
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1020 1020
 	}
1021
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1021
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1022 1022
 	if ($daemon == 'daemon') {
1023
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1023
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1024 1024
 	} else {
1025
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1025
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1026 1026
 	}
1027
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1027
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1028 1028
 	if ($schedules == 'schedules') {
1029
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1029
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1030 1030
 	} else {
1031
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1031
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1032 1032
 	}
1033 1033
 
1034 1034
 /*
@@ -1039,177 +1039,177 @@  discard block
 block discarded – undo
1039 1039
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1040 1040
 	}
1041 1041
 */
1042
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1043
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1044
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1045
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1046
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1042
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1043
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1044
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1045
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1046
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1047 1047
 	if ($globalivao == 'ivao') {
1048 1048
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
1049
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1050
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1049
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1050
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1051 1051
 	if ($globalvatsim == 'vatsim') {
1052 1052
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
1053
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1054
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1053
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1054
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1055 1055
 	if ($globalphpvms == 'phpvms') {
1056
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1057
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1056
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1057
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1058 1058
 	if ($globalvam == 'vam') {
1059
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1060
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1059
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1060
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1061 1061
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
1062
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1063
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1062
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1063
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1064 1064
 	
1065 1065
 
1066 1066
 
1067
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1067
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1068 1068
 	if ($notam == 'notam') {
1069
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1069
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1070 1070
 	} else {
1071
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1071
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1072 1072
 	}
1073
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1073
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1074 1074
 	if ($owner == 'owner') {
1075
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1075
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1076 1076
 	} else {
1077
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1077
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1078 1078
 	}
1079
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1079
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1080 1080
 	if ($map3d == 'map3d') {
1081
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1081
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1082 1082
 	} else {
1083
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1083
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1084 1084
 	}
1085
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1085
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1086 1086
 	if ($crash == 'crash') {
1087
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1087
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1088 1088
 	} else {
1089
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1089
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1090 1090
 	}
1091
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1091
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1092 1092
 	if ($mapsatellites == 'mapsatellites') {
1093
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1093
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1094 1094
 	} else {
1095
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1095
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1096 1096
 	}
1097
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1097
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1098 1098
 	if ($map3ddefault == 'map3ddefault') {
1099
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1099
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1100 1100
 	} else {
1101
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1101
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1102 1102
 	}
1103
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1103
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1104 1104
 	if ($translate == 'translate') {
1105
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1105
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1106 1106
 	} else {
1107
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1107
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1108 1108
 	}
1109
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1109
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1110 1110
 	if ($realairlines == 'realairlines') {
1111
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1111
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1112 1112
 	} else {
1113
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1113
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1114 1114
 	}
1115
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1115
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1116 1116
 	if ($estimation == 'estimation') {
1117
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1117
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1118 1118
 	} else {
1119
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1119
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1120 1120
 	}
1121
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1121
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1122 1122
 	if ($metar == 'metar') {
1123
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1123
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1124 1124
 	} else {
1125
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1125
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1126 1126
 	}
1127
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1127
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1128 1128
 	if ($metarcycle == 'metarcycle') {
1129
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1129
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1130 1130
 	} else {
1131
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1131
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1132 1132
 	}
1133
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1133
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1134 1134
 	if ($fork == 'fork') {
1135
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1135
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1136 1136
 	} else {
1137
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1137
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1138 1138
 	}
1139 1139
 
1140
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1140
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1141 1141
 	if ($colormap == 'colormap') {
1142
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1142
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1143 1143
 	} else {
1144
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1144
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1145 1145
 	}
1146 1146
 	
1147 1147
 	if (isset($_POST['aircrafticoncolor'])) {
1148
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1149
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1148
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1149
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1150 1150
 	}
1151 1151
 
1152
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1153
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1152
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1153
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1154 1154
 
1155
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1156
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1157
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1158
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1159
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1160
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1155
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1156
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1157
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1158
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1159
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1160
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1161 1161
 
1162
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1162
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1163 1163
 	if ($mappopup == 'mappopup') {
1164
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1164
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1165 1165
 	} else {
1166
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1166
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1167 1167
 	}
1168
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1168
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1169 1169
 	if ($airportpopup == 'airportpopup') {
1170
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1170
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1171 1171
 	} else {
1172
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1172
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1173 1173
 	}
1174
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1174
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1175 1175
 	if ($maphistory == 'maphistory') {
1176
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1176
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1177 1177
 	} else {
1178
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1178
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1179 1179
 	}
1180
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1180
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1181 1181
 	if ($flightroute == 'flightroute') {
1182
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1182
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1183 1183
 	} else {
1184
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1184
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1185 1185
 	}
1186
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1186
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1187 1187
 	if ($allflights == 'allflights') {
1188
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1188
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1189 1189
 	} else {
1190
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1190
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1191 1191
 	}
1192
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1192
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1193 1193
 	if ($waypoints == 'waypoints') {
1194
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1194
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1195 1195
 	} else {
1196
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1196
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1197 1197
 	}
1198 1198
 
1199
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1199
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1200 1200
 
1201 1201
 	// Set some defaults values...
1202 1202
 	if (!isset($globalAircraftImageSources)) {
1203
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1204
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1203
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1204
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1205 1205
 	}
1206 1206
 
1207 1207
 	if (!isset($globalSchedulesSources)) {
1208
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1209
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1208
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1209
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1210 1210
     	}
1211 1211
 
1212
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1212
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1213 1213
 
1214 1214
 	if ($error == '') settings::modify_settings($settings);
1215 1215
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.
incident-latest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 $page_url = $globalURL.'/accident-latest';
10 10
 
11
-if(!isset($_GET['limit']))
11
+if (!isset($_GET['limit']))
12 12
 {
13 13
 	$limit_start = 0;
14 14
 	$limit_end = 25;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 print '<div class="table column">';
36 36
 print '<p>'._("The table below shows the latest Incidents.").'</p>';
37
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident');
37
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident');
38 38
 //print_r($spotter_array);
39 39
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
40 40
 	include('table-output.php');
Please login to merge, or discard this patch.
accident.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
2
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
3 3
 if ($date == '') $date = date('Y-m-d');
4 4
 header('Location: '.$globalURL.'/accident/'.$date);
5 5
 ?>
6 6
\ No newline at end of file
Please login to merge, or discard this patch.
date.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
2
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
3 3
 if ($date == '') $date = date('Y-m-d');
4 4
 header('Location: '.$globalURL.'/date/'.$date);
5 5
 ?>
6 6
\ No newline at end of file
Please login to merge, or discard this patch.
incident-detailed.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,10 +10,10 @@  discard block
 block discarded – undo
10 10
 {
11 11
 	$date = date('Y-m-d');
12 12
 } else {
13
-	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
13
+	$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
14 14
 }
15 15
 
16
-if(!isset($_GET['limit']))
16
+if (!isset($_GET['limit']))
17 17
 {
18 18
 	$limit_start = 0;
19 19
 	$limit_end = 25;
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
48 48
 print '<br />';
49 49
 
50 50
 print '<div class="info column">';
51
-print '<h1>'.sprintf(_("Incidents from %s"),date("l F j, Y",strtotime($date))).'</h1>';
51
+print '<h1>'.sprintf(_("Incidents from %s"), date("l F j, Y", strtotime($date))).'</h1>';
52 52
 print '</div>';
53 53
 
54 54
 print '<div class="table column">';
55
-print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>';
56
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident',$date);
55
+print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>';
56
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident', $date);
57 57
 //print_r($spotter_array);
58 58
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59 59
 	include('table-output.php');
Please login to merge, or discard this patch.
incident.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
2
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
3 3
 if ($date == '') $date = date('Y-m-d');
4 4
 header('Location: '.$globalURL.'/incident/'.$date);
5 5
 ?>
6 6
\ No newline at end of file
Please login to merge, or discard this patch.
manufacturer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@
 block discarded – undo
5 5
 
6 6
 if ($_POST['aircraft_manufacturer'] != "")
7 7
 {
8
-	$aircraft_manufacturer = filter_input(INPUT_POST,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
8
+	$aircraft_manufacturer = filter_input(INPUT_POST, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
9 9
 	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
10 10
 } elseif ($_GET['aircraft_manufacturer'] != "")
11 11
 {
12
-	$aircraft_manufacturer = filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
12
+	$aircraft_manufacturer = filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
13 13
 	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
14 14
 } else {
15 15
 	header('Location: '.$globalURL);
Please login to merge, or discard this patch.
registration.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 
6 6
 if ($_POST['registration'] != "")
7 7
 {
8
-	$registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
8
+	$registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
9 9
 	header('Location: '.$globalURL.'/registration/'.$registration);
10 10
 } else {
11 11
 	header('Location: '.$globalURL);
Please login to merge, or discard this patch.