@@ -6,12 +6,12 @@ discard block |
||
6 | 6 | $title = _("Statistics").' - '._("Most common Aircraft"); |
7 | 7 | |
8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
9 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
9 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | 11 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
12 | 12 | } |
13 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
14 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
13 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
14 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
15 | 15 | |
16 | 16 | require_once('header.php'); |
17 | 17 | |
@@ -23,10 +23,10 @@ discard block |
||
23 | 23 | </div> |
24 | 24 | <p>'._("Below are the <strong>Top 10</strong> most common aircraft types.").'</p>'; |
25 | 25 | |
26 | -$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
26 | +$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
27 | 27 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
28 | 28 | $aircraft_data = ''; |
29 | -foreach($aircraft_array as $aircraft_item) |
|
29 | +foreach ($aircraft_array as $aircraft_item) |
|
30 | 30 | { |
31 | 31 | if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
32 | 32 | else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | print '</thead>'; |
53 | 53 | print '<tbody>'; |
54 | 54 | $i = 1; |
55 | - foreach($aircraft_array as $aircraft_item) |
|
55 | + foreach ($aircraft_array as $aircraft_item) |
|
56 | 56 | { |
57 | 57 | print '<tr>'; |
58 | 58 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -5,11 +5,15 @@ discard block |
||
5 | 5 | $Stats = new Stats(); |
6 | 6 | $title = _("Statistics").' - '._("Most common Aircraft"); |
7 | 7 | |
8 | -if (!isset($filter_name)) $filter_name = ''; |
|
8 | +if (!isset($filter_name)) { |
|
9 | + $filter_name = ''; |
|
10 | +} |
|
9 | 11 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 12 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
12 | -} |
|
13 | + if (isset($globalFilter['airline'])) { |
|
14 | + $airline_icao = $globalFilter['airline'][0]; |
|
15 | + } |
|
16 | + } |
|
13 | 17 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
14 | 18 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
15 | 19 | |
@@ -28,9 +32,12 @@ discard block |
||
28 | 32 | $aircraft_data = ''; |
29 | 33 | foreach($aircraft_array as $aircraft_item) |
30 | 34 | { |
31 | - if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
32 | - else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
33 | -} |
|
35 | + if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') { |
|
36 | + $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
37 | + } else { |
|
38 | + $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
39 | + } |
|
40 | + } |
|
34 | 41 | $aircraft_data = substr($aircraft_data, 0, -1); |
35 | 42 | print 'var series = ['.$aircraft_data.'];'; |
36 | 43 | print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
@@ -79,23 +79,23 @@ discard block |
||
79 | 79 | <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
80 | 80 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
81 | 81 | <?php |
82 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
82 | + if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
83 | 83 | ?> |
84 | 84 | <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
85 | 85 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
86 | 86 | <?php |
87 | - } else { |
|
88 | - ?> |
|
87 | + } else { |
|
88 | + ?> |
|
89 | 89 | <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
90 | 90 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
91 | 91 | <?php |
92 | - } |
|
93 | - ?> |
|
92 | + } |
|
93 | + ?> |
|
94 | 94 | <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
95 | 95 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
96 | 96 | <?php |
97 | - if ($airline_icao == '') { |
|
98 | - ?> |
|
97 | + if ($airline_icao == '') { |
|
98 | + ?> |
|
99 | 99 | <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
100 | 100 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
101 | 101 | <?php |
@@ -138,39 +138,39 @@ discard block |
||
138 | 138 | <div class="col-md-6"> |
139 | 139 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
140 | 140 | <?php |
141 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
142 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
143 | - else { |
|
144 | - print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
145 | - $aircraft_data = ''; |
|
146 | - foreach($aircraft_array as $aircraft_item) |
|
147 | - { |
|
148 | - if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
149 | - else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
150 | - } |
|
151 | - $aircraft_data = substr($aircraft_data, 0, -1); |
|
152 | - print 'var series = ['.$aircraft_data.'];'; |
|
153 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
154 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
155 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
156 | - print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
157 | - print 'dataset'; |
|
158 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
159 | - print '</script>'; |
|
160 | - } |
|
161 | - ?> |
|
141 | + $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
142 | + if (count($aircraft_array) == 0) print _("No data available"); |
|
143 | + else { |
|
144 | + print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
145 | + $aircraft_data = ''; |
|
146 | + foreach($aircraft_array as $aircraft_item) |
|
147 | + { |
|
148 | + if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
149 | + else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
150 | + } |
|
151 | + $aircraft_data = substr($aircraft_data, 0, -1); |
|
152 | + print 'var series = ['.$aircraft_data.'];'; |
|
153 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
154 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
155 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
156 | + print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
157 | + print 'dataset'; |
|
158 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
159 | + print '</script>'; |
|
160 | + } |
|
161 | + ?> |
|
162 | 162 | <div class="more"> |
163 | 163 | <?php |
164 | - if ($year != '' && $month != '') { |
|
165 | - ?> |
|
164 | + if ($year != '' && $month != '') { |
|
165 | + ?> |
|
166 | 166 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
167 | 167 | <?php |
168 | - } else { |
|
169 | - ?> |
|
168 | + } else { |
|
169 | + ?> |
|
170 | 170 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
171 | 171 | <?php |
172 | - } |
|
173 | - ?> |
|
172 | + } |
|
173 | + ?> |
|
174 | 174 | </div> |
175 | 175 | </div> |
176 | 176 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -223,29 +223,29 @@ discard block |
||
223 | 223 | <div class="col-md-6"> |
224 | 224 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
225 | 225 | <?php |
226 | - $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month,$day); |
|
227 | - if (count($marine_array) == 0) print _("No data available"); |
|
228 | - else { |
|
229 | - print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
230 | - $marine_data = ''; |
|
231 | - foreach($marine_array as $marine_item) |
|
232 | - { |
|
233 | - $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
|
234 | - } |
|
235 | - $marine_data = substr($marine_data, 0, -1); |
|
236 | - print 'var series = ['.$marine_data.'];'; |
|
237 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
238 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
239 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
240 | - print 'var marinetype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
241 | - print 'dataset'; |
|
242 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
243 | - print '</script>'; |
|
244 | - } |
|
245 | - ?> |
|
226 | + $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month,$day); |
|
227 | + if (count($marine_array) == 0) print _("No data available"); |
|
228 | + else { |
|
229 | + print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
230 | + $marine_data = ''; |
|
231 | + foreach($marine_array as $marine_item) |
|
232 | + { |
|
233 | + $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
|
234 | + } |
|
235 | + $marine_data = substr($marine_data, 0, -1); |
|
236 | + print 'var series = ['.$marine_data.'];'; |
|
237 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
238 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
239 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
240 | + print 'var marinetype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
241 | + print 'dataset'; |
|
242 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
243 | + print '</script>'; |
|
244 | + } |
|
245 | + ?> |
|
246 | 246 | <div class="more"> |
247 | 247 | <?php |
248 | - /* |
|
248 | + /* |
|
249 | 249 | if ($year != '' && $month != '') { |
250 | 250 | ?> |
251 | 251 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | <?php |
257 | 257 | } |
258 | 258 | */ |
259 | - ?> |
|
259 | + ?> |
|
260 | 260 | </div> |
261 | 261 | </div> |
262 | 262 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -271,29 +271,29 @@ discard block |
||
271 | 271 | <div class="col-md-6"> |
272 | 272 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
273 | 273 | <?php |
274 | - $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month,$day); |
|
275 | - if (count($tracker_array) == 0) print _("No data available"); |
|
276 | - else { |
|
277 | - print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
278 | - $tracker_data = ''; |
|
279 | - foreach($tracker_array as $tracker_item) |
|
280 | - { |
|
281 | - $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
|
282 | - } |
|
283 | - $tracker_data = substr($tracker_data, 0, -1); |
|
284 | - print 'var series = ['.$tracker_data.'];'; |
|
285 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
286 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
287 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
288 | - print 'var trackertype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
289 | - print 'dataset'; |
|
290 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
291 | - print '</script>'; |
|
292 | - } |
|
293 | - ?> |
|
274 | + $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month,$day); |
|
275 | + if (count($tracker_array) == 0) print _("No data available"); |
|
276 | + else { |
|
277 | + print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
278 | + $tracker_data = ''; |
|
279 | + foreach($tracker_array as $tracker_item) |
|
280 | + { |
|
281 | + $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
|
282 | + } |
|
283 | + $tracker_data = substr($tracker_data, 0, -1); |
|
284 | + print 'var series = ['.$tracker_data.'];'; |
|
285 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
286 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
287 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
288 | + print 'var trackertype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
289 | + print 'dataset'; |
|
290 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
291 | + print '</script>'; |
|
292 | + } |
|
293 | + ?> |
|
294 | 294 | <div class="more"> |
295 | 295 | <?php |
296 | - /* |
|
296 | + /* |
|
297 | 297 | if ($year != '' && $month != '') { |
298 | 298 | ?> |
299 | 299 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | <?php |
305 | 305 | } |
306 | 306 | */ |
307 | - ?> |
|
307 | + ?> |
|
308 | 308 | </div> |
309 | 309 | </div> |
310 | 310 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | if (!isset($filter_name)) $filter_name = ''; |
22 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
22 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
23 | 23 | if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) { |
24 | 24 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
25 | 25 | } |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $title = _("Statistics"); |
35 | 35 | } |
36 | 36 | |
37 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
38 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
37 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
38 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
39 | 39 | |
40 | 40 | require_once('header.php'); |
41 | 41 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | date_default_timezone_set('UTC'); |
63 | 63 | $lastupdate = strtotime($last_update[0]['value']); |
64 | 64 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
65 | - print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
|
65 | + print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>'; |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | ?> |
@@ -74,30 +74,30 @@ discard block |
||
74 | 74 | <?php |
75 | 75 | if ($type == 'aircraft') { |
76 | 76 | ?> |
77 | - <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span> |
|
78 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
79 | - <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
80 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
77 | + <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span> |
|
78 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
79 | + <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
80 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
81 | 81 | <?php |
82 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
82 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
83 | 83 | ?> |
84 | - <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
85 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
84 | + <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
85 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
86 | 86 | <?php |
87 | 87 | } else { |
88 | 88 | ?> |
89 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
90 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
89 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
90 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
91 | 91 | <?php |
92 | 92 | } |
93 | 93 | ?> |
94 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
95 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
94 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
95 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
96 | 96 | <?php |
97 | 97 | if ($airline_icao == '') { |
98 | 98 | ?> |
99 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
100 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
99 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
100 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
101 | 101 | <?php |
102 | 102 | } |
103 | 103 | ?> |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) { |
106 | 106 | if ($airline_icao == '' || $airline_icao == 'all') { |
107 | 107 | ?> |
108 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
109 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
108 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
109 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
110 | 110 | <?php |
111 | 111 | } |
112 | 112 | } |
@@ -114,22 +114,22 @@ discard block |
||
114 | 114 | <?php |
115 | 115 | } elseif ($type == 'marine') { |
116 | 116 | ?> |
117 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
118 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
119 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
120 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
117 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
118 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
119 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
120 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
121 | 121 | <?php |
122 | 122 | } elseif ($type == 'tracker') { |
123 | 123 | ?> |
124 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
125 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
126 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
127 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
124 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
125 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
126 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
127 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
128 | 128 | <?php |
129 | 129 | } |
130 | 130 | ?> |
131 | 131 | </p> |
132 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
132 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
133 | 133 | <div class="specific-stats"> |
134 | 134 | <?php |
135 | 135 | if ($type == 'aircraft') { |
@@ -138,12 +138,12 @@ discard block |
||
138 | 138 | <div class="col-md-6"> |
139 | 139 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
140 | 140 | <?php |
141 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
141 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
142 | 142 | if (count($aircraft_array) == 0) print _("No data available"); |
143 | 143 | else { |
144 | 144 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
145 | 145 | $aircraft_data = ''; |
146 | - foreach($aircraft_array as $aircraft_item) |
|
146 | + foreach ($aircraft_array as $aircraft_item) |
|
147 | 147 | { |
148 | 148 | if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
149 | 149 | else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
@@ -173,17 +173,17 @@ discard block |
||
173 | 173 | ?> |
174 | 174 | </div> |
175 | 175 | </div> |
176 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
176 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
177 | 177 | <?php |
178 | 178 | // echo $airline_icao; |
179 | 179 | if ($airline_icao == '' || $airline_icao == 'all') { |
180 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
180 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
181 | 181 | if (count($airline_array) > 0) { |
182 | 182 | print '<div class="col-md-6">'; |
183 | 183 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
184 | 184 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
185 | 185 | $airline_data = ''; |
186 | - foreach($airline_array as $airline_item) |
|
186 | + foreach ($airline_array as $airline_item) |
|
187 | 187 | { |
188 | 188 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
189 | 189 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | } |
210 | 210 | ?> |
211 | 211 | </div> |
212 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
212 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
213 | 213 | <?php |
214 | 214 | } |
215 | 215 | ?> |
@@ -223,12 +223,12 @@ discard block |
||
223 | 223 | <div class="col-md-6"> |
224 | 224 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
225 | 225 | <?php |
226 | - $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month,$day); |
|
226 | + $marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month, $day); |
|
227 | 227 | if (count($marine_array) == 0) print _("No data available"); |
228 | 228 | else { |
229 | 229 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
230 | 230 | $marine_data = ''; |
231 | - foreach($marine_array as $marine_item) |
|
231 | + foreach ($marine_array as $marine_item) |
|
232 | 232 | { |
233 | 233 | $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
234 | 234 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | ?> |
260 | 260 | </div> |
261 | 261 | </div> |
262 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
262 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
263 | 263 | <!-- </div>--> |
264 | 264 | <?php |
265 | 265 | } |
@@ -271,12 +271,12 @@ discard block |
||
271 | 271 | <div class="col-md-6"> |
272 | 272 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
273 | 273 | <?php |
274 | - $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month,$day); |
|
274 | + $tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month, $day); |
|
275 | 275 | if (count($tracker_array) == 0) print _("No data available"); |
276 | 276 | else { |
277 | 277 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
278 | 278 | $tracker_data = ''; |
279 | - foreach($tracker_array as $tracker_item) |
|
279 | + foreach ($tracker_array as $tracker_item) |
|
280 | 280 | { |
281 | 281 | $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
282 | 282 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | ?> |
308 | 308 | </div> |
309 | 309 | </div> |
310 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
310 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
311 | 311 | <!-- </div>--> |
312 | 312 | <?php |
313 | 313 | } |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | ?> |
318 | 318 | <div class="row column"> |
319 | 319 | <?php |
320 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
321 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
320 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
321 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
322 | 322 | if (empty($flightover_array)) { |
323 | 323 | print '<div class="col-md-12">'; |
324 | 324 | } else { |
@@ -327,12 +327,12 @@ discard block |
||
327 | 327 | ?> |
328 | 328 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
329 | 329 | <?php |
330 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
330 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
331 | 331 | if (count($pilot_array) == 0) print _("No data available"); |
332 | 332 | else { |
333 | 333 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
334 | 334 | $pilot_data = ''; |
335 | - foreach($pilot_array as $pilot_item) |
|
335 | + foreach ($pilot_array as $pilot_item) |
|
336 | 336 | { |
337 | 337 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
338 | 338 | } |
@@ -354,19 +354,19 @@ discard block |
||
354 | 354 | ?> |
355 | 355 | </div> |
356 | 356 | |
357 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
357 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
358 | 358 | <?php |
359 | 359 | } else { |
360 | 360 | ?> |
361 | 361 | <div class="col-md-6"> |
362 | 362 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
363 | 363 | <?php |
364 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
364 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
365 | 365 | if (count($owner_array) == 0) print _("No data available"); |
366 | 366 | else { |
367 | 367 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
368 | 368 | $owner_data = ''; |
369 | - foreach($owner_array as $owner_item) |
|
369 | + foreach ($owner_array as $owner_item) |
|
370 | 370 | { |
371 | 371 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
372 | 372 | } |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | </div> |
387 | 387 | </div> |
388 | 388 | |
389 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
389 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
390 | 390 | <?php |
391 | 391 | } |
392 | 392 | if (!empty($flightover_array)) { |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
401 | 401 | print 'var series = ['; |
402 | 402 | $flightover_data = ''; |
403 | - foreach($flightover_array as $flightover_item) |
|
403 | + foreach ($flightover_array as $flightover_item) |
|
404 | 404 | { |
405 | 405 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
406 | 406 | } |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | } |
447 | 447 | ?> |
448 | 448 | </div> |
449 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
449 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
450 | 450 | |
451 | 451 | |
452 | 452 | </div> |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
467 | 467 | print 'var series = ['; |
468 | 468 | $flightover_data = ''; |
469 | - foreach($flightover_array as $flightover_item) |
|
469 | + foreach ($flightover_array as $flightover_item) |
|
470 | 470 | { |
471 | 471 | $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],'; |
472 | 472 | } |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
527 | 527 | print 'var series = ['; |
528 | 528 | $flightover_data = ''; |
529 | - foreach($flightover_array as $flightover_item) |
|
529 | + foreach ($flightover_array as $flightover_item) |
|
530 | 530 | { |
531 | 531 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
532 | 532 | } |
@@ -579,14 +579,14 @@ discard block |
||
579 | 579 | <div class="row column"> |
580 | 580 | <div class="col-md-6"> |
581 | 581 | <?php |
582 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
582 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
583 | 583 | if (count($airport_airport_array) > 0) { |
584 | 584 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
585 | 585 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
586 | 586 | print "\n"; |
587 | 587 | print 'var series = ['; |
588 | 588 | $airport_data = ''; |
589 | - foreach($airport_airport_array as $airport_item) |
|
589 | + foreach ($airport_airport_array as $airport_item) |
|
590 | 590 | { |
591 | 591 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
592 | 592 | } |
@@ -637,18 +637,18 @@ discard block |
||
637 | 637 | } |
638 | 638 | ?> |
639 | 639 | </div> |
640 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
640 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
641 | 641 | |
642 | 642 | <div class="col-md-6"> |
643 | 643 | <?php |
644 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
644 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
645 | 645 | if (count($airport_airport_array2) > 0) { |
646 | 646 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
647 | 647 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
648 | 648 | print "\n"; |
649 | 649 | print 'var series = ['; |
650 | 650 | $airport_data = ''; |
651 | - foreach($airport_airport_array2 as $airport_item) |
|
651 | + foreach ($airport_airport_array2 as $airport_item) |
|
652 | 652 | { |
653 | 653 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
654 | 654 | } |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | ?> |
701 | 701 | </div> |
702 | 702 | </div> |
703 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
703 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
704 | 704 | <?php |
705 | 705 | } |
706 | 706 | ?> |
@@ -714,19 +714,19 @@ discard block |
||
714 | 714 | <div class="col-md-6"> |
715 | 715 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
716 | 716 | <?php |
717 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
717 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
718 | 718 | if (count($year_array) == 0) print _("No data available"); |
719 | 719 | else { |
720 | 720 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
721 | 721 | $year_data = ''; |
722 | 722 | $year_cnt = ''; |
723 | - foreach($year_array as $year_item) |
|
723 | + foreach ($year_array as $year_item) |
|
724 | 724 | { |
725 | 725 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
726 | 726 | $year_cnt .= $year_item['date_count'].','; |
727 | 727 | } |
728 | 728 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
729 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
729 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
730 | 730 | print 'c3.generate({ |
731 | 731 | bindto: "#chart8", |
732 | 732 | data: { x: "x", |
@@ -739,23 +739,23 @@ discard block |
||
739 | 739 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
740 | 740 | </div> |
741 | 741 | </div> |
742 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
742 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
743 | 743 | <div class="col-md-6"> |
744 | 744 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
745 | 745 | <?php |
746 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
746 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
747 | 747 | if (count($month_array) == 0) print _("No data available"); |
748 | 748 | else { |
749 | 749 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
750 | 750 | $month_data = ''; |
751 | 751 | $month_cnt = ''; |
752 | - foreach($month_array as $month_item) |
|
752 | + foreach ($month_array as $month_item) |
|
753 | 753 | { |
754 | 754 | $month_data .= '"'.$month_item['date_name'].'",'; |
755 | 755 | $month_cnt .= $month_item['date_count'].','; |
756 | 756 | } |
757 | 757 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
758 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
758 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
759 | 759 | print 'c3.generate({ |
760 | 760 | bindto: "#chart9", |
761 | 761 | data: { x: "x", |
@@ -768,24 +768,24 @@ discard block |
||
768 | 768 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
769 | 769 | </div> |
770 | 770 | </div> |
771 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
771 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
772 | 772 | |
773 | 773 | <div class="col-md-6"> |
774 | 774 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
775 | 775 | <?php |
776 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
776 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
777 | 777 | if (empty($date_array)) print _("No data available"); |
778 | 778 | else { |
779 | 779 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
780 | 780 | $date_data = ''; |
781 | 781 | $date_cnt = ''; |
782 | - foreach($date_array as $date_item) |
|
782 | + foreach ($date_array as $date_item) |
|
783 | 783 | { |
784 | 784 | $date_data .= '"'.$date_item['date_name'].'",'; |
785 | 785 | $date_cnt .= $date_item['date_count'].','; |
786 | 786 | } |
787 | 787 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
788 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
788 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
789 | 789 | print 'c3.generate({ |
790 | 790 | bindto: "#chart5", |
791 | 791 | data: { x: "x", |
@@ -798,23 +798,23 @@ discard block |
||
798 | 798 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
799 | 799 | </div> |
800 | 800 | </div> |
801 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
801 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
802 | 802 | <div class="col-md-6"> |
803 | 803 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
804 | 804 | <?php |
805 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
805 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
806 | 806 | if (empty($hour_array)) print _("No data available"); |
807 | 807 | else { |
808 | 808 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
809 | 809 | $hour_data = ''; |
810 | 810 | $hour_cnt = ''; |
811 | - foreach($hour_array as $hour_item) |
|
811 | + foreach ($hour_array as $hour_item) |
|
812 | 812 | { |
813 | 813 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
814 | 814 | $hour_cnt .= $hour_item['hour_count'].','; |
815 | 815 | } |
816 | 816 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
817 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
817 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
818 | 818 | print 'c3.generate({ |
819 | 819 | bindto: "#chart6", |
820 | 820 | data: { |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
828 | 828 | </div> |
829 | 829 | </div> |
830 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
830 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
831 | 831 | </div> |
832 | 832 | <?php |
833 | 833 | } |
@@ -845,19 +845,19 @@ discard block |
||
845 | 845 | <div class="col-md-6"> |
846 | 846 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
847 | 847 | <?php |
848 | - $year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
848 | + $year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
849 | 849 | if (count($year_array) == 0) print _("No data available"); |
850 | 850 | else { |
851 | 851 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
852 | 852 | $year_data = ''; |
853 | 853 | $year_cnt = ''; |
854 | - foreach($year_array as $year_item) |
|
854 | + foreach ($year_array as $year_item) |
|
855 | 855 | { |
856 | 856 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
857 | 857 | $year_cnt .= $year_item['date_count'].','; |
858 | 858 | } |
859 | 859 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
860 | - $year_cnt = "['vessels',".substr($year_cnt,0,-1)."]"; |
|
860 | + $year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]"; |
|
861 | 861 | print 'c3.generate({ |
862 | 862 | bindto: "#chart8", |
863 | 863 | data: { x: "x", |
@@ -871,23 +871,23 @@ discard block |
||
871 | 871 | </div> |
872 | 872 | </div> |
873 | 873 | |
874 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
874 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
875 | 875 | <div class="col-md-6"> |
876 | 876 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
877 | 877 | <?php |
878 | - $month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name); |
|
878 | + $month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name); |
|
879 | 879 | if (count($month_array) == 0) print _("No data available"); |
880 | 880 | else { |
881 | 881 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
882 | 882 | $month_data = ''; |
883 | 883 | $month_cnt = ''; |
884 | - foreach($month_array as $month_item) |
|
884 | + foreach ($month_array as $month_item) |
|
885 | 885 | { |
886 | 886 | $month_data .= '"'.$month_item['date_name'].'",'; |
887 | 887 | $month_cnt .= $month_item['date_count'].','; |
888 | 888 | } |
889 | 889 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
890 | - $month_cnt = "['vessels',".substr($month_cnt,0,-1)."]"; |
|
890 | + $month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]"; |
|
891 | 891 | print 'c3.generate({ |
892 | 892 | bindto: "#chart9", |
893 | 893 | data: { x: "x", |
@@ -900,24 +900,24 @@ discard block |
||
900 | 900 | <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
901 | 901 | </div> |
902 | 902 | </div> |
903 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
903 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
904 | 904 | |
905 | 905 | <div class="col-md-6"> |
906 | 906 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
907 | 907 | <?php |
908 | - $date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name); |
|
908 | + $date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name); |
|
909 | 909 | if (empty($date_array)) print _("No data available"); |
910 | 910 | else { |
911 | 911 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
912 | 912 | $date_data = ''; |
913 | 913 | $date_cnt = ''; |
914 | - foreach($date_array as $date_item) |
|
914 | + foreach ($date_array as $date_item) |
|
915 | 915 | { |
916 | 916 | $date_data .= '"'.$date_item['date_name'].'",'; |
917 | 917 | $date_cnt .= $date_item['date_count'].','; |
918 | 918 | } |
919 | 919 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
920 | - $date_cnt = "['vessels',".substr($date_cnt,0,-1)."]"; |
|
920 | + $date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]"; |
|
921 | 921 | print 'c3.generate({ |
922 | 922 | bindto: "#chart5", |
923 | 923 | data: { x: "x", |
@@ -930,23 +930,23 @@ discard block |
||
930 | 930 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
931 | 931 | </div> |
932 | 932 | </div> |
933 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
933 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
934 | 934 | <div class="col-md-6"> |
935 | 935 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
936 | 936 | <?php |
937 | - $hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name); |
|
937 | + $hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name); |
|
938 | 938 | if (empty($hour_array)) print _("No data available"); |
939 | 939 | else { |
940 | 940 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
941 | 941 | $hour_data = ''; |
942 | 942 | $hour_cnt = ''; |
943 | - foreach($hour_array as $hour_item) |
|
943 | + foreach ($hour_array as $hour_item) |
|
944 | 944 | { |
945 | 945 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
946 | 946 | $hour_cnt .= $hour_item['hour_count'].','; |
947 | 947 | } |
948 | 948 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
949 | - $hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]"; |
|
949 | + $hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]"; |
|
950 | 950 | print 'c3.generate({ |
951 | 951 | bindto: "#chart6", |
952 | 952 | data: { |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
960 | 960 | </div> |
961 | 961 | </div> |
962 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
962 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
963 | 963 | </div> |
964 | 964 | <?php |
965 | 965 | } |
@@ -983,13 +983,13 @@ discard block |
||
983 | 983 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
984 | 984 | $year_data = ''; |
985 | 985 | $year_cnt = ''; |
986 | - foreach($year_array as $year_item) |
|
986 | + foreach ($year_array as $year_item) |
|
987 | 987 | { |
988 | 988 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
989 | 989 | $year_cnt .= $year_item['date_count'].','; |
990 | 990 | } |
991 | 991 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
992 | - $year_cnt = "['trackers',".substr($year_cnt,0,-1)."]"; |
|
992 | + $year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]"; |
|
993 | 993 | print 'c3.generate({ |
994 | 994 | bindto: "#chart8", |
995 | 995 | data: { x: "x", |
@@ -1003,7 +1003,7 @@ discard block |
||
1003 | 1003 | </div> |
1004 | 1004 | </div> |
1005 | 1005 | |
1006 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1006 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1007 | 1007 | <div class="col-md-6"> |
1008 | 1008 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
1009 | 1009 | <?php |
@@ -1013,13 +1013,13 @@ discard block |
||
1013 | 1013 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
1014 | 1014 | $month_data = ''; |
1015 | 1015 | $month_cnt = ''; |
1016 | - foreach($month_array as $month_item) |
|
1016 | + foreach ($month_array as $month_item) |
|
1017 | 1017 | { |
1018 | 1018 | $month_data .= '"'.$month_item['date_name'].'",'; |
1019 | 1019 | $month_cnt .= $month_item['date_count'].','; |
1020 | 1020 | } |
1021 | 1021 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
1022 | - $month_cnt = "['trackers',".substr($month_cnt,0,-1)."]"; |
|
1022 | + $month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]"; |
|
1023 | 1023 | print 'c3.generate({ |
1024 | 1024 | bindto: "#chart9", |
1025 | 1025 | data: { x: "x", |
@@ -1032,7 +1032,7 @@ discard block |
||
1032 | 1032 | <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
1033 | 1033 | </div> |
1034 | 1034 | </div> |
1035 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1035 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1036 | 1036 | |
1037 | 1037 | <div class="col-md-6"> |
1038 | 1038 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -1043,13 +1043,13 @@ discard block |
||
1043 | 1043 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
1044 | 1044 | $date_data = ''; |
1045 | 1045 | $date_cnt = ''; |
1046 | - foreach($date_array as $date_item) |
|
1046 | + foreach ($date_array as $date_item) |
|
1047 | 1047 | { |
1048 | 1048 | $date_data .= '"'.$date_item['date_name'].'",'; |
1049 | 1049 | $date_cnt .= $date_item['date_count'].','; |
1050 | 1050 | } |
1051 | 1051 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
1052 | - $date_cnt = "['trackers',".substr($date_cnt,0,-1)."]"; |
|
1052 | + $date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]"; |
|
1053 | 1053 | print 'c3.generate({ |
1054 | 1054 | bindto: "#chart5", |
1055 | 1055 | data: { x: "x", |
@@ -1062,23 +1062,23 @@ discard block |
||
1062 | 1062 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
1063 | 1063 | </div> |
1064 | 1064 | </div> |
1065 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1065 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1066 | 1066 | <div class="col-md-6"> |
1067 | 1067 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
1068 | 1068 | <?php |
1069 | - $hour_array = $Tracker->countAllHours('hour',true); |
|
1069 | + $hour_array = $Tracker->countAllHours('hour', true); |
|
1070 | 1070 | if (empty($hour_array)) print _("No data available"); |
1071 | 1071 | else { |
1072 | 1072 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
1073 | 1073 | $hour_data = ''; |
1074 | 1074 | $hour_cnt = ''; |
1075 | - foreach($hour_array as $hour_item) |
|
1075 | + foreach ($hour_array as $hour_item) |
|
1076 | 1076 | { |
1077 | 1077 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
1078 | 1078 | $hour_cnt .= $hour_item['hour_count'].','; |
1079 | 1079 | } |
1080 | 1080 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
1081 | - $hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]"; |
|
1081 | + $hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]"; |
|
1082 | 1082 | print 'c3.generate({ |
1083 | 1083 | bindto: "#chart6", |
1084 | 1084 | data: { |
@@ -1091,7 +1091,7 @@ discard block |
||
1091 | 1091 | <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
1092 | 1092 | </div> |
1093 | 1093 | </div> |
1094 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1094 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1095 | 1095 | </div> |
1096 | 1096 | <?php |
1097 | 1097 | } |
@@ -1115,13 +1115,13 @@ discard block |
||
1115 | 1115 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
1116 | 1116 | $year_data = ''; |
1117 | 1117 | $year_cnt = ''; |
1118 | - foreach($year_array as $year_item) |
|
1118 | + foreach ($year_array as $year_item) |
|
1119 | 1119 | { |
1120 | 1120 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
1121 | 1121 | $year_cnt .= $year_item['count'].','; |
1122 | 1122 | } |
1123 | 1123 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
1124 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
1124 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
1125 | 1125 | print 'c3.generate({ |
1126 | 1126 | bindto: "#chart32", |
1127 | 1127 | data: { x: "x", |
@@ -1134,7 +1134,7 @@ discard block |
||
1134 | 1134 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
1135 | 1135 | </div> |
1136 | 1136 | </div> |
1137 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1137 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1138 | 1138 | |
1139 | 1139 | <div class="row column"> |
1140 | 1140 | <div class="col-md-6"> |
@@ -1146,13 +1146,13 @@ discard block |
||
1146 | 1146 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
1147 | 1147 | $year_data = ''; |
1148 | 1148 | $year_cnt = ''; |
1149 | - foreach($year_array as $year_item) |
|
1149 | + foreach ($year_array as $year_item) |
|
1150 | 1150 | { |
1151 | 1151 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
1152 | 1152 | $year_cnt .= $year_item['count'].','; |
1153 | 1153 | } |
1154 | 1154 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
1155 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
1155 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
1156 | 1156 | print 'c3.generate({ |
1157 | 1157 | bindto: "#chart33", |
1158 | 1158 | data: { x: "x", |
@@ -1165,7 +1165,7 @@ discard block |
||
1165 | 1165 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
1166 | 1166 | </div> |
1167 | 1167 | </div> |
1168 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1168 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1169 | 1169 | <br/> |
1170 | 1170 | <?php |
1171 | 1171 | } |
@@ -1183,9 +1183,9 @@ discard block |
||
1183 | 1183 | <?php |
1184 | 1184 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
1185 | 1185 | if ($year == '' && $month == '') { |
1186 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
1186 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
1187 | 1187 | } else { |
1188 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
1188 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
1189 | 1189 | } |
1190 | 1190 | if (!empty($polar)) { |
1191 | 1191 | print '<h2>'._("Coverage pattern").'</h2>'; |
@@ -1193,7 +1193,7 @@ discard block |
||
1193 | 1193 | unset($polar_data); |
1194 | 1194 | $Spotter = new Spotter(); |
1195 | 1195 | $data = json_decode($eachpolar['source_data']); |
1196 | - foreach($data as $value => $key) { |
|
1196 | + foreach ($data as $value => $key) { |
|
1197 | 1197 | $direction = $Spotter->parseDirection(($value*22.5)); |
1198 | 1198 | $distance = $key; |
1199 | 1199 | $unit = 'km'; |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | ?> |
1214 | 1214 | <div class="col-md-6"> |
1215 | 1215 | <h4><?php print $eachpolar['source_name']; ?></h4> |
1216 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
1216 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
1217 | 1217 | <script> |
1218 | 1218 | (function() { |
1219 | 1219 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -1237,7 +1237,7 @@ discard block |
||
1237 | 1237 | color: color, |
1238 | 1238 | unit: '<?php echo $unit; ?>' |
1239 | 1239 | }; |
1240 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
1240 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
1241 | 1241 | })(); |
1242 | 1242 | </script> |
1243 | 1243 | </div> |
@@ -1251,22 +1251,22 @@ discard block |
||
1251 | 1251 | <?php |
1252 | 1252 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
1253 | 1253 | if ($year == '' && $month == '') { |
1254 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
1254 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
1255 | 1255 | } else { |
1256 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
1256 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
1257 | 1257 | } |
1258 | 1258 | if (!empty($msg)) { |
1259 | 1259 | print '<h2>'._("Messages received").'</h2>'; |
1260 | 1260 | foreach ($msg as $eachmsg) { |
1261 | 1261 | //$eachmsg = $msg[0]; |
1262 | 1262 | $data = $eachmsg['source_data']; |
1263 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
1263 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
1264 | 1264 | else $max = 500; |
1265 | 1265 | ?> |
1266 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
1266 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
1267 | 1267 | <script> |
1268 | 1268 | var g = new JustGage({ |
1269 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
1269 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
1270 | 1270 | value: <?php echo $data; ?>, |
1271 | 1271 | min: 0, |
1272 | 1272 | max: <?php print $max; ?>, |
@@ -1287,9 +1287,9 @@ discard block |
||
1287 | 1287 | <?php |
1288 | 1288 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
1289 | 1289 | if ($year == '' && $month == '') { |
1290 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
1290 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
1291 | 1291 | } else { |
1292 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
1292 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
1293 | 1293 | } |
1294 | 1294 | foreach ($hist as $hists) { |
1295 | 1295 | //$hist_data = ''; |
@@ -1298,7 +1298,7 @@ discard block |
||
1298 | 1298 | $source = $hists['source_name']; |
1299 | 1299 | $hist_array = json_decode($hists['source_data']); |
1300 | 1300 | $unit = 'km'; |
1301 | - foreach($hist_array as $distance => $nb) |
|
1301 | + foreach ($hist_array as $distance => $nb) |
|
1302 | 1302 | { |
1303 | 1303 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
1304 | 1304 | $distance = round($distance*0.539957); |
@@ -1319,18 +1319,18 @@ discard block |
||
1319 | 1319 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
1320 | 1320 | ?> |
1321 | 1321 | <div class="col-md-6"> |
1322 | - <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
|
1322 | + <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2> |
|
1323 | 1323 | <?php |
1324 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
1324 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
1325 | 1325 | print 'c3.generate({ |
1326 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
1326 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
1327 | 1327 | data: { x: "x", |
1328 | 1328 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
1329 | 1329 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
1330 | 1330 | print '</script>'; |
1331 | 1331 | ?> |
1332 | 1332 | </div> |
1333 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
1333 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
1334 | 1334 | <?php |
1335 | 1335 | } |
1336 | 1336 | ?> |
@@ -18,11 +18,15 @@ discard block |
||
18 | 18 | require_once('require/class.Spotter.php'); |
19 | 19 | } |
20 | 20 | |
21 | -if (!isset($filter_name)) $filter_name = ''; |
|
21 | +if (!isset($filter_name)) { |
|
22 | + $filter_name = ''; |
|
23 | +} |
|
22 | 24 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
23 | 25 | if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) { |
24 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
25 | -} |
|
26 | + if (isset($globalFilter['airline'])) { |
|
27 | + $airline_icao = $globalFilter['airline'][0]; |
|
28 | + } |
|
29 | + } |
|
26 | 30 | if ($type == 'aircraft' && $airline_icao != '' && $airline_icao != 'all') { |
27 | 31 | $Spotter = new Spotter(); |
28 | 32 | $airline_info = $Spotter->getAllAirlineInfo($airline_icao); |
@@ -53,7 +57,12 @@ discard block |
||
53 | 57 | <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script> |
54 | 58 | <div class="column"> |
55 | 59 | <div class="info"> |
56 | - <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1> |
|
60 | + <h1><?php if (isset($airline_name)) { |
|
61 | + echo _("Statistics for ").$airline_name; |
|
62 | +} else { |
|
63 | + echo _("Statistics"); |
|
64 | +} |
|
65 | +?></h1> |
|
57 | 66 | <?php |
58 | 67 | if ($type == 'aircraft') { |
59 | 68 | $last_update = $Stats->getLastStatsUpdate(); |
@@ -61,7 +70,9 @@ discard block |
||
61 | 70 | if (isset($last_update[0]['value'])) { |
62 | 71 | date_default_timezone_set('UTC'); |
63 | 72 | $lastupdate = strtotime($last_update[0]['value']); |
64 | - if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
|
73 | + if (isset($globalTimezone) && $globalTimezone != '') { |
|
74 | + date_default_timezone_set($globalTimezone); |
|
75 | + } |
|
65 | 76 | print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
66 | 77 | } |
67 | 78 | } |
@@ -139,14 +150,18 @@ discard block |
||
139 | 150 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
140 | 151 | <?php |
141 | 152 | $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
142 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
143 | - else { |
|
153 | + if (count($aircraft_array) == 0) { |
|
154 | + print _("No data available"); |
|
155 | + } else { |
|
144 | 156 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
145 | 157 | $aircraft_data = ''; |
146 | 158 | foreach($aircraft_array as $aircraft_item) |
147 | 159 | { |
148 | - if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
149 | - else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
160 | + if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') { |
|
161 | + $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
162 | + } else { |
|
163 | + $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
164 | + } |
|
150 | 165 | } |
151 | 166 | $aircraft_data = substr($aircraft_data, 0, -1); |
152 | 167 | print 'var series = ['.$aircraft_data.'];'; |
@@ -163,11 +178,17 @@ discard block |
||
163 | 178 | <?php |
164 | 179 | if ($year != '' && $month != '') { |
165 | 180 | ?> |
166 | - <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
181 | + <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
182 | + echo '/'.$airline_icao; |
|
183 | +} |
|
184 | +?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
167 | 185 | <?php |
168 | 186 | } else { |
169 | 187 | ?> |
170 | - <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
188 | + <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
189 | + echo '/'.$airline_icao; |
|
190 | +} |
|
191 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
171 | 192 | <?php |
172 | 193 | } |
173 | 194 | ?> |
@@ -198,11 +219,15 @@ discard block |
||
198 | 219 | print '</script>'; |
199 | 220 | if ($year != '' && $month != '') { |
200 | 221 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
201 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
222 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
223 | + echo '/'.$airline_icao; |
|
224 | + } |
|
202 | 225 | print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
203 | 226 | } else { |
204 | 227 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
205 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
228 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
229 | + echo '/'.$airline_icao; |
|
230 | + } |
|
206 | 231 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
207 | 232 | } |
208 | 233 | print '</div>'; |
@@ -224,8 +249,9 @@ discard block |
||
224 | 249 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
225 | 250 | <?php |
226 | 251 | $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month,$day); |
227 | - if (count($marine_array) == 0) print _("No data available"); |
|
228 | - else { |
|
252 | + if (count($marine_array) == 0) { |
|
253 | + print _("No data available"); |
|
254 | + } else { |
|
229 | 255 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
230 | 256 | $marine_data = ''; |
231 | 257 | foreach($marine_array as $marine_item) |
@@ -272,8 +298,9 @@ discard block |
||
272 | 298 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
273 | 299 | <?php |
274 | 300 | $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month,$day); |
275 | - if (count($tracker_array) == 0) print _("No data available"); |
|
276 | - else { |
|
301 | + if (count($tracker_array) == 0) { |
|
302 | + print _("No data available"); |
|
303 | + } else { |
|
277 | 304 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
278 | 305 | $tracker_data = ''; |
279 | 306 | foreach($tracker_array as $tracker_item) |
@@ -328,8 +355,9 @@ discard block |
||
328 | 355 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
329 | 356 | <?php |
330 | 357 | $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
331 | - if (count($pilot_array) == 0) print _("No data available"); |
|
332 | - else { |
|
358 | + if (count($pilot_array) == 0) { |
|
359 | + print _("No data available"); |
|
360 | + } else { |
|
333 | 361 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
334 | 362 | $pilot_data = ''; |
335 | 363 | foreach($pilot_array as $pilot_item) |
@@ -348,7 +376,9 @@ discard block |
||
348 | 376 | } |
349 | 377 | print '<div class="more">'; |
350 | 378 | print '<a href="'.$globalURL.'/statistics/pilot'; |
351 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
379 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
380 | + echo '/'.$airline_icao; |
|
381 | + } |
|
352 | 382 | print'" class="btn btn-default btn" role="button">'._("See full statistic").'»</a>'; |
353 | 383 | print '</div>'; |
354 | 384 | ?> |
@@ -362,8 +392,9 @@ discard block |
||
362 | 392 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
363 | 393 | <?php |
364 | 394 | $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
365 | - if (count($owner_array) == 0) print _("No data available"); |
|
366 | - else { |
|
395 | + if (count($owner_array) == 0) { |
|
396 | + print _("No data available"); |
|
397 | + } else { |
|
367 | 398 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
368 | 399 | $owner_data = ''; |
369 | 400 | foreach($owner_array as $owner_item) |
@@ -382,7 +413,10 @@ discard block |
||
382 | 413 | } |
383 | 414 | ?> |
384 | 415 | <div class="more"> |
385 | - <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
416 | + <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
417 | + echo '/'.$airline_icao; |
|
418 | +} |
|
419 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
386 | 420 | </div> |
387 | 421 | </div> |
388 | 422 | |
@@ -395,8 +429,9 @@ discard block |
||
395 | 429 | <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2> |
396 | 430 | <?php |
397 | 431 | //$flightover_array = $Stats->countAllFlightOverCountries(); |
398 | - if (count($flightover_array) == 0) print _("No data available"); |
|
399 | - else { |
|
432 | + if (count($flightover_array) == 0) { |
|
433 | + print _("No data available"); |
|
434 | + } else { |
|
400 | 435 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
401 | 436 | print 'var series = ['; |
402 | 437 | $flightover_data = ''; |
@@ -439,7 +474,10 @@ discard block |
||
439 | 474 | } |
440 | 475 | ?> |
441 | 476 | <div class="more"> |
442 | - <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
477 | + <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
478 | + echo '/'.$airline_icao; |
|
479 | +} |
|
480 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
443 | 481 | </div> |
444 | 482 | </div> |
445 | 483 | <?php |
@@ -461,8 +499,9 @@ discard block |
||
461 | 499 | <div class="col-md-6"> |
462 | 500 | <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2> |
463 | 501 | <?php |
464 | - if (count($flightover_array) == 0) print _("No data available"); |
|
465 | - else { |
|
502 | + if (count($flightover_array) == 0) { |
|
503 | + print _("No data available"); |
|
504 | + } else { |
|
466 | 505 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
467 | 506 | print 'var series = ['; |
468 | 507 | $flightover_data = ''; |
@@ -521,8 +560,9 @@ discard block |
||
521 | 560 | <div class="col-md-6"> |
522 | 561 | <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2> |
523 | 562 | <?php |
524 | - if (count($flightover_array) == 0) print _("No data available"); |
|
525 | - else { |
|
563 | + if (count($flightover_array) == 0) { |
|
564 | + print _("No data available"); |
|
565 | + } else { |
|
526 | 566 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
527 | 567 | print 'var series = ['; |
528 | 568 | $flightover_data = ''; |
@@ -632,7 +672,9 @@ discard block |
||
632 | 672 | });"; |
633 | 673 | print '</script>'; |
634 | 674 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; |
635 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
675 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
676 | + echo '/'.$airline_icao; |
|
677 | + } |
|
636 | 678 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
637 | 679 | } |
638 | 680 | ?> |
@@ -694,7 +736,9 @@ discard block |
||
694 | 736 | });"; |
695 | 737 | print '</script>'; |
696 | 738 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival'; |
697 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
739 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
740 | + echo '/'.$airline_icao; |
|
741 | + } |
|
698 | 742 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
699 | 743 | } |
700 | 744 | ?> |
@@ -715,8 +759,9 @@ discard block |
||
715 | 759 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
716 | 760 | <?php |
717 | 761 | $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
718 | - if (count($year_array) == 0) print _("No data available"); |
|
719 | - else { |
|
762 | + if (count($year_array) == 0) { |
|
763 | + print _("No data available"); |
|
764 | + } else { |
|
720 | 765 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
721 | 766 | $year_data = ''; |
722 | 767 | $year_cnt = ''; |
@@ -736,7 +781,10 @@ discard block |
||
736 | 781 | } |
737 | 782 | ?> |
738 | 783 | <div class="more"> |
739 | - <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
784 | + <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
785 | + echo '/'.$airline_icao; |
|
786 | +} |
|
787 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
740 | 788 | </div> |
741 | 789 | </div> |
742 | 790 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -744,8 +792,9 @@ discard block |
||
744 | 792 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
745 | 793 | <?php |
746 | 794 | $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
747 | - if (count($month_array) == 0) print _("No data available"); |
|
748 | - else { |
|
795 | + if (count($month_array) == 0) { |
|
796 | + print _("No data available"); |
|
797 | + } else { |
|
749 | 798 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
750 | 799 | $month_data = ''; |
751 | 800 | $month_cnt = ''; |
@@ -765,7 +814,10 @@ discard block |
||
765 | 814 | } |
766 | 815 | ?> |
767 | 816 | <div class="more"> |
768 | - <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
817 | + <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
818 | + echo '/'.$airline_icao; |
|
819 | +} |
|
820 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
769 | 821 | </div> |
770 | 822 | </div> |
771 | 823 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -774,8 +826,9 @@ discard block |
||
774 | 826 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
775 | 827 | <?php |
776 | 828 | $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
777 | - if (empty($date_array)) print _("No data available"); |
|
778 | - else { |
|
829 | + if (empty($date_array)) { |
|
830 | + print _("No data available"); |
|
831 | + } else { |
|
779 | 832 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
780 | 833 | $date_data = ''; |
781 | 834 | $date_cnt = ''; |
@@ -795,7 +848,10 @@ discard block |
||
795 | 848 | } |
796 | 849 | ?> |
797 | 850 | <div class="more"> |
798 | - <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
851 | + <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
852 | + echo '/'.$airline_icao; |
|
853 | +} |
|
854 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
799 | 855 | </div> |
800 | 856 | </div> |
801 | 857 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -803,8 +859,9 @@ discard block |
||
803 | 859 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
804 | 860 | <?php |
805 | 861 | $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
806 | - if (empty($hour_array)) print _("No data available"); |
|
807 | - else { |
|
862 | + if (empty($hour_array)) { |
|
863 | + print _("No data available"); |
|
864 | + } else { |
|
808 | 865 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
809 | 866 | $hour_data = ''; |
810 | 867 | $hour_cnt = ''; |
@@ -824,7 +881,10 @@ discard block |
||
824 | 881 | } |
825 | 882 | ?> |
826 | 883 | <div class="more"> |
827 | - <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
884 | + <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
885 | + echo '/'.$airline_icao; |
|
886 | +} |
|
887 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
828 | 888 | </div> |
829 | 889 | </div> |
830 | 890 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -846,8 +906,9 @@ discard block |
||
846 | 906 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
847 | 907 | <?php |
848 | 908 | $year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
849 | - if (count($year_array) == 0) print _("No data available"); |
|
850 | - else { |
|
909 | + if (count($year_array) == 0) { |
|
910 | + print _("No data available"); |
|
911 | + } else { |
|
851 | 912 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
852 | 913 | $year_data = ''; |
853 | 914 | $year_cnt = ''; |
@@ -876,8 +937,9 @@ discard block |
||
876 | 937 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
877 | 938 | <?php |
878 | 939 | $month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name); |
879 | - if (count($month_array) == 0) print _("No data available"); |
|
880 | - else { |
|
940 | + if (count($month_array) == 0) { |
|
941 | + print _("No data available"); |
|
942 | + } else { |
|
881 | 943 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
882 | 944 | $month_data = ''; |
883 | 945 | $month_cnt = ''; |
@@ -906,8 +968,9 @@ discard block |
||
906 | 968 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
907 | 969 | <?php |
908 | 970 | $date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name); |
909 | - if (empty($date_array)) print _("No data available"); |
|
910 | - else { |
|
971 | + if (empty($date_array)) { |
|
972 | + print _("No data available"); |
|
973 | + } else { |
|
911 | 974 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
912 | 975 | $date_data = ''; |
913 | 976 | $date_cnt = ''; |
@@ -935,8 +998,9 @@ discard block |
||
935 | 998 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
936 | 999 | <?php |
937 | 1000 | $hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name); |
938 | - if (empty($hour_array)) print _("No data available"); |
|
939 | - else { |
|
1001 | + if (empty($hour_array)) { |
|
1002 | + print _("No data available"); |
|
1003 | + } else { |
|
940 | 1004 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
941 | 1005 | $hour_data = ''; |
942 | 1006 | $hour_cnt = ''; |
@@ -978,8 +1042,9 @@ discard block |
||
978 | 1042 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
979 | 1043 | <?php |
980 | 1044 | $year_array = $Tracker->countAllMonthsLastYear(true); |
981 | - if (count($year_array) == 0) print _("No data available"); |
|
982 | - else { |
|
1045 | + if (count($year_array) == 0) { |
|
1046 | + print _("No data available"); |
|
1047 | + } else { |
|
983 | 1048 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
984 | 1049 | $year_data = ''; |
985 | 1050 | $year_cnt = ''; |
@@ -1008,8 +1073,9 @@ discard block |
||
1008 | 1073 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
1009 | 1074 | <?php |
1010 | 1075 | $month_array = $Tracker->countAllDatesLastMonth(); |
1011 | - if (count($month_array) == 0) print _("No data available"); |
|
1012 | - else { |
|
1076 | + if (count($month_array) == 0) { |
|
1077 | + print _("No data available"); |
|
1078 | + } else { |
|
1013 | 1079 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
1014 | 1080 | $month_data = ''; |
1015 | 1081 | $month_cnt = ''; |
@@ -1038,8 +1104,9 @@ discard block |
||
1038 | 1104 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
1039 | 1105 | <?php |
1040 | 1106 | $date_array = $Tracker->countAllDatesLast7Days(); |
1041 | - if (empty($date_array)) print _("No data available"); |
|
1042 | - else { |
|
1107 | + if (empty($date_array)) { |
|
1108 | + print _("No data available"); |
|
1109 | + } else { |
|
1043 | 1110 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
1044 | 1111 | $date_data = ''; |
1045 | 1112 | $date_cnt = ''; |
@@ -1067,8 +1134,9 @@ discard block |
||
1067 | 1134 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
1068 | 1135 | <?php |
1069 | 1136 | $hour_array = $Tracker->countAllHours('hour',true); |
1070 | - if (empty($hour_array)) print _("No data available"); |
|
1071 | - else { |
|
1137 | + if (empty($hour_array)) { |
|
1138 | + print _("No data available"); |
|
1139 | + } else { |
|
1072 | 1140 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
1073 | 1141 | $hour_data = ''; |
1074 | 1142 | $hour_cnt = ''; |
@@ -1110,8 +1178,9 @@ discard block |
||
1110 | 1178 | <h2><?php echo _("Fatalities by Years"); ?></h2> |
1111 | 1179 | <?php |
1112 | 1180 | $year_array = $Stats->countFatalitiesByYear(); |
1113 | - if (count($year_array) == 0) print _("No data available"); |
|
1114 | - else { |
|
1181 | + if (count($year_array) == 0) { |
|
1182 | + print _("No data available"); |
|
1183 | + } else { |
|
1115 | 1184 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
1116 | 1185 | $year_data = ''; |
1117 | 1186 | $year_cnt = ''; |
@@ -1141,8 +1210,9 @@ discard block |
||
1141 | 1210 | <h2><?php echo _("Fatalities last 12 Months"); ?></h2> |
1142 | 1211 | <?php |
1143 | 1212 | $year_array = $Stats->countFatalitiesLast12Months(); |
1144 | - if (count($year_array) == 0) print _("No data available"); |
|
1145 | - else { |
|
1213 | + if (count($year_array) == 0) { |
|
1214 | + print _("No data available"); |
|
1215 | + } else { |
|
1146 | 1216 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
1147 | 1217 | $year_data = ''; |
1148 | 1218 | $year_cnt = ''; |
@@ -1207,8 +1277,11 @@ discard block |
||
1207 | 1277 | $distance = $distance; |
1208 | 1278 | $unit = 'km'; |
1209 | 1279 | } |
1210 | - if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
1211 | - else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
1280 | + if (!isset($polar_data)) { |
|
1281 | + $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
1282 | + } else { |
|
1283 | + $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
1284 | + } |
|
1212 | 1285 | } |
1213 | 1286 | ?> |
1214 | 1287 | <div class="col-md-6"> |
@@ -1260,9 +1333,12 @@ discard block |
||
1260 | 1333 | foreach ($msg as $eachmsg) { |
1261 | 1334 | //$eachmsg = $msg[0]; |
1262 | 1335 | $data = $eachmsg['source_data']; |
1263 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
1264 | - else $max = 500; |
|
1265 | -?> |
|
1336 | + if ($data > 500) { |
|
1337 | + $max = (round(($data+100)/100))*100; |
|
1338 | + } else { |
|
1339 | + $max = 500; |
|
1340 | + } |
|
1341 | + ?> |
|
1266 | 1342 | <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
1267 | 1343 | <script> |
1268 | 1344 | var g = new JustGage({ |