@@ -5,8 +5,11 @@ discard block |
||
5 | 5 | setcookie("MapFormat",'2d'); |
6 | 6 | |
7 | 7 | // Compressed GeoJson is used if true |
8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
9 | -else $compress = $globalJsonCompress; |
|
8 | +if (!isset($globalJsonCompress)) { |
|
9 | + $compress = true; |
|
10 | +} else { |
|
11 | + $compress = $globalJsonCompress; |
|
12 | +} |
|
10 | 13 | ?> |
11 | 14 | |
12 | 15 | |
@@ -143,9 +146,13 @@ discard block |
||
143 | 146 | if (callsign != ""){ markerTrackerLabel += callsign; } |
144 | 147 | if (type != ""){ markerTrackerLabel += ' - '+type; } |
145 | 148 | <?php |
146 | - if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor']; |
|
147 | - elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor; |
|
148 | - else $IconColor = '1a3151'; |
|
149 | + if (isset($_COOKIE['IconColor'])) { |
|
150 | + $IconColor = $_COOKIE['IconColor']; |
|
151 | + } elseif (isset($globalAircraftIconColor)) { |
|
152 | + $IconColor = $globalAircraftIconColor; |
|
153 | + } else { |
|
154 | + $IconColor = '1a3151'; |
|
155 | + } |
|
149 | 156 | if (!isset($ident) && !isset($famtrackid)) { |
150 | 157 | ?> |
151 | 158 | info_tracker_update(feature.properties.fc); |
@@ -179,7 +186,12 @@ discard block |
||
179 | 186 | <?php |
180 | 187 | } else { |
181 | 188 | ?> |
182 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
189 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
190 | + print $archiveupdatetime*1000; |
|
191 | +} else { |
|
192 | + print $globalMapRefresh*1000+20000; |
|
193 | +} |
|
194 | +?>+feature.properties.sqt*1000); |
|
183 | 195 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
184 | 196 | <?php |
185 | 197 | } |
@@ -228,7 +240,12 @@ discard block |
||
228 | 240 | <?php |
229 | 241 | } else { |
230 | 242 | ?> |
231 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
243 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
244 | + print $archiveupdatetime*1000; |
|
245 | +} else { |
|
246 | + print $globalMapRefresh*1000+20000; |
|
247 | +} |
|
248 | +?>+feature.properties.sqt*1000); |
|
232 | 249 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
233 | 250 | <?php |
234 | 251 | } |
@@ -276,7 +293,12 @@ discard block |
||
276 | 293 | <?php |
277 | 294 | } else { |
278 | 295 | ?> |
279 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
296 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
297 | + print $archiveupdatetime*1000; |
|
298 | +} else { |
|
299 | + print $globalMapRefresh*1000+20000; |
|
300 | +} |
|
301 | +?>+feature.properties.sqt*1000); |
|
280 | 302 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
281 | 303 | <?php |
282 | 304 | } |
@@ -559,14 +581,24 @@ discard block |
||
559 | 581 | if (isset($archive) && $archive) { |
560 | 582 | ?> |
561 | 583 | //then load it again every 30 seconds |
562 | -// var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
584 | +// var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) { |
|
585 | + print ($globalMapRefresh*1000)/2; |
|
586 | +} else { |
|
587 | + print '15000'; |
|
588 | +} |
|
589 | +?>); |
|
563 | 590 | reloadTrackerPage = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php print $archiveupdatetime*1000; ?>); |
564 | 591 | <?php |
565 | 592 | } else { |
566 | 593 | ?> |
567 | 594 | //then load it again every 30 seconds |
568 | 595 | reloadTrackerPage = setInterval( |
569 | - function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
596 | + function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) { |
|
597 | + print $globalMapRefresh*1000; |
|
598 | +} else { |
|
599 | + print '30000'; |
|
600 | +} |
|
601 | +?>); |
|
570 | 602 | <?php |
571 | 603 | } |
572 | 604 | ?> |
@@ -156,7 +156,12 @@ discard block |
||
156 | 156 | // viewer.dataSources.get(dsn).entities.remove(entity); |
157 | 157 | // } |
158 | 158 | //console.log(entity.lastupdate); |
159 | - if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) { |
|
159 | + if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) { |
|
160 | + print $globalMapRefresh*2000; |
|
161 | +} else { |
|
162 | + print '60000'; |
|
163 | +} |
|
164 | +?>)) { |
|
160 | 165 | // console.log('Remove an entity date'); |
161 | 166 | viewer.dataSources.get(dsn).entities.remove(entity); |
162 | 167 | } else { |
@@ -230,7 +235,12 @@ discard block |
||
230 | 235 | } else { |
231 | 236 | for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) { |
232 | 237 | var entity = viewer.dataSources.get(dsn).entities.values[i]; |
233 | - if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) { |
|
238 | + if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) { |
|
239 | + print $globalMapRefresh*2000; |
|
240 | +} else { |
|
241 | + print '60000'; |
|
242 | +} |
|
243 | +?>)) { |
|
234 | 244 | viewer.dataSources.get(dsn).entities.remove(entity); |
235 | 245 | } |
236 | 246 | } |
@@ -560,7 +570,12 @@ discard block |
||
560 | 570 | if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
561 | 571 | ?> |
562 | 572 | update_polarLayer(); |
563 | -setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
573 | +setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) { |
|
574 | + print $globalMapRefresh*1000*2; |
|
575 | +} else { |
|
576 | + print '60000'; |
|
577 | +} |
|
578 | +?>); |
|
564 | 579 | <?php |
565 | 580 | } |
566 | 581 | ?> |
@@ -656,7 +671,12 @@ discard block |
||
656 | 671 | } |
657 | 672 | } |
658 | 673 | } |
659 | - ,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
674 | + ,<?php if (isset($globalMapRefresh)) { |
|
675 | + print $globalMapRefresh*1000; |
|
676 | +} else { |
|
677 | + print '30000'; |
|
678 | +} |
|
679 | +?>); |
|
660 | 680 | } else { |
661 | 681 | //var widget = new Cesium.CesiumWidget('archivebox'); |
662 | 682 | // var timeline = new Cesium.Timeline(viewer); |
@@ -5,8 +5,11 @@ discard block |
||
5 | 5 | setcookie("MapFormat",'2d'); |
6 | 6 | |
7 | 7 | // Compressed GeoJson is used if true |
8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
9 | -else $compress = $globalJsonCompress; |
|
8 | +if (!isset($globalJsonCompress)) { |
|
9 | + $compress = true; |
|
10 | +} else { |
|
11 | + $compress = $globalJsonCompress; |
|
12 | +} |
|
10 | 13 | if (isset($_GET['archive'])) { |
11 | 14 | $archive = true; |
12 | 15 | //$archiveupdatetime = 50; |
@@ -17,8 +20,11 @@ discard block |
||
17 | 20 | //$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10)); |
18 | 21 | //$lastupd = 20; |
19 | 22 | $lastupd = $_GET['archivespeed']*$archiveupdatetime; |
20 | - if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate']; |
|
21 | - else $enddate = time(); |
|
23 | + if (isset($_GET['enddate']) && $_GET['enddate'] != '') { |
|
24 | + $enddate = $_GET['enddate']; |
|
25 | + } else { |
|
26 | + $enddate = time(); |
|
27 | + } |
|
22 | 28 | setcookie("archive_begin",$begindate); |
23 | 29 | setcookie("archive_end",$enddate); |
24 | 30 | setcookie("archive_update",$lastupd); |
@@ -105,7 +111,17 @@ discard block |
||
105 | 111 | } |
106 | 112 | |
107 | 113 | //create the map |
108 | - 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); |
|
114 | + map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) { |
|
115 | + print $latitude; |
|
116 | +} else { |
|
117 | + print $globalCenterLatitude; |
|
118 | +} |
|
119 | +?>,<?php if (isset($longitude)) { |
|
120 | + print $longitude; |
|
121 | +} else { |
|
122 | + print $globalCenterLongitude; |
|
123 | +} |
|
124 | +?>], zoom); |
|
109 | 125 | <?php |
110 | 126 | } else { |
111 | 127 | ?> |
@@ -118,9 +134,19 @@ discard block |
||
118 | 134 | || navigator.userAgent.match(/BlackBerry/i) |
119 | 135 | || navigator.userAgent.match(/Windows Phone/i)) |
120 | 136 | { |
121 | - var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>; |
|
137 | + var zoom = <?php if (isset($globalLiveZoom)) { |
|
138 | + print $globalLiveZoom-1; |
|
139 | +} else { |
|
140 | + print '8'; |
|
141 | +} |
|
142 | +?>; |
|
122 | 143 | } else { |
123 | - var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>; |
|
144 | + var zoom = <?php if (isset($globalLiveZoom)) { |
|
145 | + print $globalLiveZoom; |
|
146 | +} else { |
|
147 | + print '9'; |
|
148 | +} |
|
149 | +?>; |
|
124 | 150 | } |
125 | 151 | |
126 | 152 | //create the map |
@@ -145,16 +171,27 @@ discard block |
||
145 | 171 | bounds = L.latLngBounds(southWest,northEast); |
146 | 172 | //a few title layers |
147 | 173 | <?php |
148 | - if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType']; |
|
149 | - else $MapType = $globalMapProvider; |
|
174 | + if (isset($_COOKIE['MapType'])) { |
|
175 | + $MapType = $_COOKIE['MapType']; |
|
176 | + } else { |
|
177 | + $MapType = $globalMapProvider; |
|
178 | + } |
|
150 | 179 | |
151 | 180 | if ($MapType == 'Mapbox') { |
152 | - if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId; |
|
153 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
154 | -?> |
|
181 | + if ($_COOKIE['MapTypeId'] == 'default') { |
|
182 | + $MapBoxId = $globalMapboxId; |
|
183 | + } else { |
|
184 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
185 | + } |
|
186 | + ?> |
|
155 | 187 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
156 | 188 | maxZoom: 18, |
157 | - noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>, |
|
189 | + noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) { |
|
190 | + print 'false'; |
|
191 | +} else { |
|
192 | + print 'true'; |
|
193 | +} |
|
194 | +?>, |
|
158 | 195 | attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' + |
159 | 196 | '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + |
160 | 197 | 'Imagery © <a href="http://mapbox.com">Mapbox</a>', |
@@ -166,7 +203,12 @@ discard block |
||
166 | 203 | ?> |
167 | 204 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
168 | 205 | maxZoom: 18, |
169 | - noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>, |
|
206 | + noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) { |
|
207 | + print 'false'; |
|
208 | +} else { |
|
209 | + print 'true'; |
|
210 | +} |
|
211 | +?>, |
|
170 | 212 | attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' + |
171 | 213 | '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>' |
172 | 214 | }).addTo(map); |
@@ -212,20 +254,26 @@ discard block |
||
212 | 254 | map.addLayer(yandexLayer); |
213 | 255 | <?php |
214 | 256 | } elseif ($MapType == 'Bing-Aerial') { |
215 | - if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
216 | -?> |
|
257 | + if (!isset($globalBingMapKey) || $globalBingMapKey == '') { |
|
258 | + setcookie('MapType','OpenStreetMap'); |
|
259 | + } |
|
260 | + ?> |
|
217 | 261 | var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'}); |
218 | 262 | map.addLayer(bingLayer); |
219 | 263 | <?php |
220 | 264 | } elseif ($MapType == 'Bing-Hybrid') { |
221 | - if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
222 | -?> |
|
265 | + if (!isset($globalBingMapKey) || $globalBingMapKey == '') { |
|
266 | + setcookie('MapType','OpenStreetMap'); |
|
267 | + } |
|
268 | + ?> |
|
223 | 269 | var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'}); |
224 | 270 | map.addLayer(bingLayer); |
225 | 271 | <?php |
226 | 272 | } elseif ($MapType == 'Bing-Road') { |
227 | - if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
228 | -?> |
|
273 | + if (!isset($globalBingMapKey) || $globalBingMapKey == '') { |
|
274 | + setcookie('MapType','OpenStreetMap'); |
|
275 | + } |
|
276 | + ?> |
|
229 | 277 | var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'}); |
230 | 278 | map.addLayer(bingLayer); |
231 | 279 | <?php |
@@ -273,7 +321,12 @@ discard block |
||
273 | 321 | } |
274 | 322 | } elseif ($globalBounding == 'circle') { |
275 | 323 | ?> |
276 | - var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{ |
|
324 | + var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) { |
|
325 | + print $globalBoundingCircleSize; |
|
326 | +} else { |
|
327 | + print '70000'; |
|
328 | +} |
|
329 | +?>,{ |
|
277 | 330 | color: '#92C7D1', |
278 | 331 | fillColor: '#92C7D1', |
279 | 332 | fillOpacity: 0.3, |
@@ -96,8 +96,11 @@ |
||
96 | 96 | } elseif (isset($_GET['marine'])) { |
97 | 97 | readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
98 | 98 | } else { |
99 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
100 | - else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
99 | + if ($color == 'FF0000') { |
|
100 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
101 | + } else { |
|
102 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
103 | + } |
|
101 | 104 | } |
102 | 105 | } |
103 | 106 | ?> |
104 | 107 | \ No newline at end of file |
@@ -63,7 +63,9 @@ |
||
63 | 63 | { |
64 | 64 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
65 | 65 | $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
66 | - } else $image = $spotter_item['image_thumbnail']; |
|
66 | + } else { |
|
67 | + $image = $spotter_item['image_thumbnail']; |
|
68 | + } |
|
67 | 69 | |
68 | 70 | } |
69 | 71 | /* else { |
@@ -63,7 +63,9 @@ |
||
63 | 63 | { |
64 | 64 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
65 | 65 | $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
66 | - } else $image = $spotter_item['image_thumbnail']; |
|
66 | + } else { |
|
67 | + $image = $spotter_item['image_thumbnail']; |
|
68 | + } |
|
67 | 69 | |
68 | 70 | } |
69 | 71 | /* else { |
@@ -37,8 +37,11 @@ discard block |
||
37 | 37 | } else { |
38 | 38 | curl_setopt($ch, CURLOPT_USERAGENT, $useragent); |
39 | 39 | } |
40 | - if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
|
41 | - else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
|
40 | + if ($timeout == '') { |
|
41 | + curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
|
42 | + } else { |
|
43 | + curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
|
44 | + } |
|
42 | 45 | curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback")); |
43 | 46 | if ($type == 'post') { |
44 | 47 | curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); |
@@ -85,8 +88,9 @@ discard block |
||
85 | 88 | private function curlResponseHeaderCallback($ch, $headerLine) { |
86 | 89 | //global $cookies; |
87 | 90 | $cookies = array(); |
88 | - if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) |
|
89 | - $cookies[] = $cookie; |
|
91 | + if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) { |
|
92 | + $cookies[] = $cookie; |
|
93 | + } |
|
90 | 94 | return strlen($headerLine); // Needed by curl |
91 | 95 | } |
92 | 96 | |
@@ -97,11 +101,15 @@ discard block |
||
97 | 101 | curl_setopt($ch, CURLOPT_URL, $url); |
98 | 102 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
99 | 103 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
100 | - if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
104 | + if ($referer != '') { |
|
105 | + curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
106 | + } |
|
101 | 107 | curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
102 | 108 | curl_setopt($ch, CURLOPT_FILE, $fp); |
103 | 109 | curl_exec($ch); |
104 | - if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch); |
|
110 | + if (curl_errno($ch) && $globalDebug) { |
|
111 | + echo 'Download error: '.curl_error($ch); |
|
112 | + } |
|
105 | 113 | curl_close($ch); |
106 | 114 | fclose($fp); |
107 | 115 | } |
@@ -112,10 +120,16 @@ discard block |
||
112 | 120 | * @return Array array of the tables in HTML page |
113 | 121 | */ |
114 | 122 | public function table2array($data) { |
115 | - if (!is_string($data)) return array(); |
|
116 | - if ($data == '') return array(); |
|
123 | + if (!is_string($data)) { |
|
124 | + return array(); |
|
125 | + } |
|
126 | + if ($data == '') { |
|
127 | + return array(); |
|
128 | + } |
|
117 | 129 | $html = str_get_html($data); |
118 | - if ($html === false) return array(); |
|
130 | + if ($html === false) { |
|
131 | + return array(); |
|
132 | + } |
|
119 | 133 | $tabledata=array(); |
120 | 134 | foreach($html->find('tr') as $element) |
121 | 135 | { |
@@ -150,7 +164,9 @@ discard block |
||
150 | 164 | */ |
151 | 165 | public function text2array($data) { |
152 | 166 | $html = str_get_html($data); |
153 | - if ($html === false) return array(); |
|
167 | + if ($html === false) { |
|
168 | + return array(); |
|
169 | + } |
|
154 | 170 | $tabledata=array(); |
155 | 171 | foreach($html->find('p') as $element) |
156 | 172 | { |
@@ -171,7 +187,9 @@ discard block |
||
171 | 187 | * @return Float Distance in $unit |
172 | 188 | */ |
173 | 189 | public function distance($lat, $lon, $latc, $lonc, $unit = 'km') { |
174 | - if ($lat == $latc && $lon == $lonc) return 0; |
|
190 | + if ($lat == $latc && $lon == $lonc) { |
|
191 | + return 0; |
|
192 | + } |
|
175 | 193 | $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515; |
176 | 194 | if ($unit == "km") { |
177 | 195 | return round($dist * 1.609344); |
@@ -195,10 +213,16 @@ discard block |
||
195 | 213 | public function withinThreshold ($timeDifference, $distance) { |
196 | 214 | $x = abs($timeDifference); |
197 | 215 | $d = abs($distance); |
198 | - if ($x == 0 || $d == 0) return true; |
|
216 | + if ($x == 0 || $d == 0) { |
|
217 | + return true; |
|
218 | + } |
|
199 | 219 | // may be due to Internet jitter; distance is realistic |
200 | - if ($x < 0.7 && $d < 2000) return true; |
|
201 | - else return $d/$x < 1500*0.27778; // 1500 km/h max |
|
220 | + if ($x < 0.7 && $d < 2000) { |
|
221 | + return true; |
|
222 | + } else { |
|
223 | + return $d/$x < 1500*0.27778; |
|
224 | + } |
|
225 | + // 1500 km/h max |
|
202 | 226 | } |
203 | 227 | |
204 | 228 | |
@@ -226,11 +250,17 @@ discard block |
||
226 | 250 | |
227 | 251 | public function convertDM($coord,$latlong) { |
228 | 252 | if ($latlong == 'latitude') { |
229 | - if ($coord < 0) $NSEW = 'S'; |
|
230 | - else $NSEW = 'N'; |
|
253 | + if ($coord < 0) { |
|
254 | + $NSEW = 'S'; |
|
255 | + } else { |
|
256 | + $NSEW = 'N'; |
|
257 | + } |
|
231 | 258 | } elseif ($latlong == 'longitude') { |
232 | - if ($coord < 0) $NSEW = 'W'; |
|
233 | - else $NSEW = 'E'; |
|
259 | + if ($coord < 0) { |
|
260 | + $NSEW = 'W'; |
|
261 | + } else { |
|
262 | + $NSEW = 'E'; |
|
263 | + } |
|
234 | 264 | } |
235 | 265 | $coord = abs($coord); |
236 | 266 | $deg = floor($coord); |
@@ -273,7 +303,9 @@ discard block |
||
273 | 303 | public function hex2str($hex) { |
274 | 304 | $str = ''; |
275 | 305 | $hexln = strlen($hex); |
276 | - for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2))); |
|
306 | + for($i=0;$i<$hexln;$i+=2) { |
|
307 | + $str .= chr(hexdec(substr($hex,$i,2))); |
|
308 | + } |
|
277 | 309 | return $str; |
278 | 310 | } |
279 | 311 | |
@@ -301,8 +333,11 @@ discard block |
||
301 | 333 | $b = $lat2 - $lat1; |
302 | 334 | $c = -($a*$lat1+$b*$lon1); |
303 | 335 | $d = $a*$lat3+$b*$lon3+$c; |
304 | - if ($d > -$approx && $d < $approx) return true; |
|
305 | - else return false; |
|
336 | + if ($d > -$approx && $d < $approx) { |
|
337 | + return true; |
|
338 | + } else { |
|
339 | + return false; |
|
340 | + } |
|
306 | 341 | } |
307 | 342 | |
308 | 343 | public function array_merge_noappend() { |
@@ -361,7 +396,9 @@ discard block |
||
361 | 396 | return $result; |
362 | 397 | } |
363 | 398 | $handle = @opendir('./locale'); |
364 | - if ($handle === false) return $result; |
|
399 | + if ($handle === false) { |
|
400 | + return $result; |
|
401 | + } |
|
365 | 402 | while (false !== ($file = readdir($handle))) { |
366 | 403 | $path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo'; |
367 | 404 | if ($file != "." && $file != ".." && @file_exists($path)) { |
@@ -428,8 +465,9 @@ discard block |
||
428 | 465 | $error = false; |
429 | 466 | if ($fp_out = gzopen($dest, $mode)) { |
430 | 467 | if ($fp_in = fopen($source,'rb')) { |
431 | - while (!feof($fp_in)) |
|
432 | - gzwrite($fp_out, fread($fp_in, 1024 * 512)); |
|
468 | + while (!feof($fp_in)) { |
|
469 | + gzwrite($fp_out, fread($fp_in, 1024 * 512)); |
|
470 | + } |
|
433 | 471 | fclose($fp_in); |
434 | 472 | } else { |
435 | 473 | $error = true; |
@@ -438,14 +476,17 @@ discard block |
||
438 | 476 | } else { |
439 | 477 | $error = true; |
440 | 478 | } |
441 | - if ($error) |
|
442 | - return false; |
|
443 | - else |
|
444 | - return $dest; |
|
479 | + if ($error) { |
|
480 | + return false; |
|
481 | + } else { |
|
482 | + return $dest; |
|
483 | + } |
|
445 | 484 | } |
446 | 485 | |
447 | 486 | public function remove_accents($string) { |
448 | - if ( !preg_match('/[\x80-\xff]/', $string) ) return $string; |
|
487 | + if ( !preg_match('/[\x80-\xff]/', $string) ) { |
|
488 | + return $string; |
|
489 | + } |
|
449 | 490 | $chars = array( |
450 | 491 | // Decompositions for Latin-1 Supplement |
451 | 492 | chr(195).chr(128) => 'A', chr(195).chr(129) => 'A', |
@@ -569,7 +610,9 @@ discard block |
||
569 | 610 | $ip = gethostbyname($host); |
570 | 611 | $s = socket_create(AF_INET, SOCK_STREAM, 0); |
571 | 612 | $r = @socket_connect($s, $ip, $port); |
572 | - if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n"; |
|
613 | + if (!socket_set_nonblock($s)) { |
|
614 | + echo "Unable to set nonblock on socket\n"; |
|
615 | + } |
|
573 | 616 | if ($r || socket_last_error() == 114 || socket_last_error() == 115) { |
574 | 617 | return $s; |
575 | 618 | } |
@@ -1,6 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
4 | -if ($date == '') $date = date('Y-m-d'); |
|
4 | +if ($date == '') { |
|
5 | + $date = date('Y-m-d'); |
|
6 | +} |
|
5 | 7 | header('Location: '.$globalURL.'/accident/'.$date); |
6 | 8 | ?> |
7 | 9 | \ No newline at end of file |
@@ -5,7 +5,9 @@ |
||
5 | 5 | $Spotter = new Spotter(); |
6 | 6 | $title = _("Statistics").' - '._("Most common Route by Waypoint"); |
7 | 7 | require_once('header.php'); |
8 | -if (!isset($filter_name)) $filter_name = ''; |
|
8 | +if (!isset($filter_name)) { |
|
9 | + $filter_name = ''; |
|
10 | +} |
|
9 | 11 | include('statistics-sub-menu.php'); |
10 | 12 | |
11 | 13 | print '<div class="info"> |