@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | <?php |
353 | 353 | if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom']; |
354 | 354 | else $getZoom = '7'; |
355 | - ?> |
|
355 | + ?> |
|
356 | 356 | //if (map.getZoom() <= <?php print $getZoom; ?>) { |
357 | 357 | if (typeof airportsLayer != 'undefined') { |
358 | 358 | if (map.hasLayer(airportsLayer) == true) { |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | update_locationsLayer(); |
513 | 513 | |
514 | 514 | <?php |
515 | - if (!isset($ident) && !isset($flightaware_id)) { |
|
515 | + if (!isset($ident) && !isset($flightaware_id)) { |
|
516 | 516 | ?> |
517 | 517 | |
518 | 518 | function info_update (props) { |
@@ -520,11 +520,11 @@ discard block |
||
520 | 520 | } |
521 | 521 | |
522 | 522 | <?php |
523 | - } |
|
523 | + } |
|
524 | 524 | ?> |
525 | 525 | |
526 | 526 | <?php |
527 | - if (isset($_GET['archive'])) { |
|
527 | + if (isset($_GET['archive'])) { |
|
528 | 528 | ?> |
529 | 529 | var archive = L.control(); |
530 | 530 | archive.onAdd = function (map) { |
@@ -543,12 +543,12 @@ discard block |
||
543 | 543 | }; |
544 | 544 | archive.addTo(map); |
545 | 545 | <?php |
546 | - } |
|
546 | + } |
|
547 | 547 | ?> |
548 | 548 | |
549 | 549 | |
550 | 550 | <?php |
551 | - //if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) { |
|
551 | + //if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) { |
|
552 | 552 | ?> |
553 | 553 | |
554 | 554 | $(".showdetails").on("click",".close",function(){ |
@@ -1041,15 +1041,15 @@ discard block |
||
1041 | 1041 | if (map.getZoom() > 7) { |
1042 | 1042 | var style = { |
1043 | 1043 | <?php |
1044 | - if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1044 | + if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1045 | 1045 | ?> |
1046 | 1046 | "color": "#1a3151", |
1047 | 1047 | <?php |
1048 | - } else { |
|
1048 | + } else { |
|
1049 | 1049 | ?> |
1050 | 1050 | "color": getAltitudeColor(altitude), |
1051 | 1051 | <?php |
1052 | - } |
|
1052 | + } |
|
1053 | 1053 | ?> |
1054 | 1054 | "weight": 3, |
1055 | 1055 | "opacity": 1 |
@@ -1059,15 +1059,15 @@ discard block |
||
1059 | 1059 | } else { |
1060 | 1060 | var style = { |
1061 | 1061 | <?php |
1062 | - if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1062 | + if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1063 | 1063 | ?> |
1064 | 1064 | "color": "#1a3151", |
1065 | 1065 | <?php |
1066 | - } else { |
|
1066 | + } else { |
|
1067 | 1067 | ?> |
1068 | 1068 | "color": getAltitudeColor(altitude), |
1069 | 1069 | <?php |
1070 | - } |
|
1070 | + } |
|
1071 | 1071 | ?> |
1072 | 1072 | "weight": 2, |
1073 | 1073 | "opacity": 1 |
@@ -1079,15 +1079,15 @@ discard block |
||
1079 | 1079 | if (map.getZoom() > 7) { |
1080 | 1080 | var style = { |
1081 | 1081 | <?php |
1082 | - if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1082 | + if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1083 | 1083 | ?> |
1084 | 1084 | "color": "#1a3151", |
1085 | 1085 | <?php |
1086 | - } else { |
|
1086 | + } else { |
|
1087 | 1087 | ?> |
1088 | 1088 | "color": getAltitudeColor(altitude), |
1089 | 1089 | <?php |
1090 | - } |
|
1090 | + } |
|
1091 | 1091 | ?> |
1092 | 1092 | "weight": 3, |
1093 | 1093 | "opacity": 0.6 |
@@ -1097,15 +1097,15 @@ discard block |
||
1097 | 1097 | } else { |
1098 | 1098 | var style = { |
1099 | 1099 | <?php |
1100 | - if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1100 | + if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
|
1101 | 1101 | ?> |
1102 | 1102 | "color": "#1a3151", |
1103 | 1103 | <?php |
1104 | - } else { |
|
1104 | + } else { |
|
1105 | 1105 | ?> |
1106 | 1106 | "color": getAltitudeColor(altitude), |
1107 | 1107 | <?php |
1108 | - } |
|
1108 | + } |
|
1109 | 1109 | ?> |
1110 | 1110 | "weight": 2, |
1111 | 1111 | "opacity": 0.6 |
@@ -1115,21 +1115,21 @@ discard block |
||
1115 | 1115 | } |
1116 | 1116 | } |
1117 | 1117 | <?php |
1118 | - } else { |
|
1119 | - ?> |
|
1118 | + } else { |
|
1119 | + ?> |
|
1120 | 1120 | if (map.getZoom() > 7) { |
1121 | 1121 | var style = { |
1122 | 1122 | <?php |
1123 | 1123 | if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
1124 | - ?> |
|
1124 | + ?> |
|
1125 | 1125 | "color": "#1a3151", |
1126 | 1126 | <?php |
1127 | 1127 | } else { |
1128 | - ?> |
|
1128 | + ?> |
|
1129 | 1129 | "color": getAltitudeColor(altitude), |
1130 | 1130 | <?php |
1131 | 1131 | } |
1132 | - ?> |
|
1132 | + ?> |
|
1133 | 1133 | "weight": 3, |
1134 | 1134 | "opacity": 0.6 |
1135 | 1135 | }; |
@@ -1139,15 +1139,15 @@ discard block |
||
1139 | 1139 | var style = { |
1140 | 1140 | <?php |
1141 | 1141 | if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) { |
1142 | - ?> |
|
1142 | + ?> |
|
1143 | 1143 | "color": "#1a3151", |
1144 | 1144 | <?php |
1145 | 1145 | } else { |
1146 | - ?> |
|
1146 | + ?> |
|
1147 | 1147 | "color": getAltitudeColor(altitude), |
1148 | 1148 | <?php |
1149 | 1149 | } |
1150 | - ?> |
|
1150 | + ?> |
|
1151 | 1151 | "weight": 2, |
1152 | 1152 | "opacity": 0.6 |
1153 | 1153 | }; |
@@ -1155,7 +1155,7 @@ discard block |
||
1155 | 1155 | layer_data.addLayer(layer); |
1156 | 1156 | } |
1157 | 1157 | <?php |
1158 | - } |
|
1158 | + } |
|
1159 | 1159 | ?> |
1160 | 1160 | } |
1161 | 1161 | } |
@@ -1220,10 +1220,10 @@ discard block |
||
1220 | 1220 | |
1221 | 1221 | |
1222 | 1222 | <?php |
1223 | - // Add support for custom json via $globalMapJson |
|
1224 | - if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
1223 | + // Add support for custom json via $globalMapJson |
|
1224 | + if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
1225 | 1225 | foreach ($globalMapJson as $json) { |
1226 | - if (isset($json['url'])) { |
|
1226 | + if (isset($json['url'])) { |
|
1227 | 1227 | ?> |
1228 | 1228 | update_genLayer('<?php print $json['url']; ?>'); |
1229 | 1229 | <?php |
@@ -1232,9 +1232,9 @@ discard block |
||
1232 | 1232 | setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>); |
1233 | 1233 | <?php |
1234 | 1234 | } |
1235 | - } |
|
1235 | + } |
|
1236 | + } |
|
1236 | 1237 | } |
1237 | - } |
|
1238 | 1238 | |
1239 | 1239 | ?> |
1240 | 1240 |
@@ -4,8 +4,8 @@ |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['airport'])) { |
7 | - header('Location: '.$globalURL.'/airport'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/airport'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | $Spotter = new Spotter(); |
11 | 11 |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -4,8 +4,8 @@ |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | |
11 | 11 | $Spotter = new Spotter(); |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | $Connection = new Connection(); |
12 | 12 | |
13 | 13 | if (!$Connection->tableExists('airspace')) { |
14 | - die; |
|
14 | + die; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | if (isset($_GET['coord'])) |
18 | 18 | { |
19 | 19 | $coords = explode(',',$_GET['coord']); |
20 | - if ($globalDBdriver == 'mysql') { |
|
20 | + if ($globalDBdriver == 'mysql') { |
|
21 | 21 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))"; |
22 | 22 | try { |
23 | 23 | $sth = $Connection->db->prepare($query); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | } |
39 | 39 | } else { |
40 | - if ($globalDBdriver == 'mysql') { |
|
40 | + if ($globalDBdriver == 'mysql') { |
|
41 | 41 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace"; |
42 | 42 | } else { |
43 | 43 | $query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace"; |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | $geojson = array( |
54 | - 'type' => 'FeatureCollection', |
|
55 | - 'features' => array() |
|
54 | + 'type' => 'FeatureCollection', |
|
55 | + 'features' => array() |
|
56 | 56 | ); |
57 | 57 | |
58 | 58 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | $properties['color'] = '#d9ffcb'; |
110 | 110 | } |
111 | 111 | $feature = array( |
112 | - 'type' => 'Feature', |
|
113 | - 'geometry' => json_decode($geom->out('json')), |
|
114 | - 'properties' => $properties |
|
112 | + 'type' => 'Feature', |
|
113 | + 'geometry' => json_decode($geom->out('json')), |
|
114 | + 'properties' => $properties |
|
115 | 115 | ); |
116 | 116 | array_push($geojson['features'], $feature); |
117 | 117 | } |
@@ -824,11 +824,11 @@ |
||
824 | 824 | } |
825 | 825 | |
826 | 826 | /** |
827 | - * Returns true if $string is valid UTF-8 and false otherwise. |
|
828 | - * |
|
829 | - * @param mixed $str String to be tested |
|
830 | - * @return boolean |
|
831 | - */ |
|
827 | + * Returns true if $string is valid UTF-8 and false otherwise. |
|
828 | + * |
|
829 | + * @param mixed $str String to be tested |
|
830 | + * @return boolean |
|
831 | + */ |
|
832 | 832 | static function is_utf8($str) |
833 | 833 | { |
834 | 834 | $c=0; $b=0; |