Completed
Push — master ( d652ce...4d5be8 )
by Yannick
23:18
created
statistics.php 1 patch
Braces   +104 added lines, -43 removed lines patch added patch discarded remove patch
@@ -18,11 +18,15 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
@@ -137,8 +148,9 @@  discard block
 block discarded – undo
137 148
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
138 149
                  <?php
139 150
                   $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
140
-		    if (count($aircraft_array) == 0) print _("No data available");
141
-		    else {
151
+		    if (count($aircraft_array) == 0) {
152
+		    	print _("No data available");
153
+		    } else {
142 154
                     print '<div id="chart1" class="chart" width="100%"></div><script>';
143 155
                     $aircraft_data = '';
144 156
                     foreach($aircraft_array as $aircraft_item)
@@ -160,11 +172,17 @@  discard block
 block discarded – undo
160 172
             	    <?php
161 173
             		if ($year != '' && $month != '') {
162 174
             	    ?>
163
-            	    <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"); ?>&raquo;</a>
175
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
176
+	echo '/'.$airline_icao;
177
+}
178
+?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
164 179
             	    <?php
165 180
             		} else {
166 181
             	    ?>
167
-            	    <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"); ?>&raquo;</a>
182
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
183
+	echo '/'.$airline_icao;
184
+}
185
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
168 186
             	    <?php
169 187
             		}
170 188
             	    ?>
@@ -195,11 +213,15 @@  discard block
 block discarded – undo
195 213
 				print '</script>';
196 214
 				if ($year != '' && $month != '') {
197 215
 					print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
198
-					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
216
+					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
217
+						echo '/'.$airline_icao;
218
+					}
199 219
 					print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
200 220
 				} else {
201 221
 					print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
202
-					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
+					}
203 225
 					print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
204 226
 				}
205 227
 				print '</div>';
@@ -229,8 +251,9 @@  discard block
 block discarded – undo
229 251
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
230 252
 <?php
231 253
 			$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
232
-			if (count($pilot_array) == 0) print _("No data available");
233
-			else {
254
+			if (count($pilot_array) == 0) {
255
+				print _("No data available");
256
+			} else {
234 257
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
235 258
 				$pilot_data = '';
236 259
 				foreach($pilot_array as $pilot_item)
@@ -249,7 +272,9 @@  discard block
 block discarded – undo
249 272
 			}
250 273
 			print '<div class="more">';
251 274
 			print '<a href="'.$globalURL.'/statistics/pilot'; 
252
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
275
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
276
+				echo '/'.$airline_icao;
277
+			}
253 278
 			print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
254 279
 			print '</div>';
255 280
 ?>
@@ -263,8 +288,9 @@  discard block
 block discarded – undo
263 288
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
264 289
 <?php
265 290
 			$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
266
-			if (count($owner_array) == 0) print _("No data available");
267
-			else {
291
+			if (count($owner_array) == 0) {
292
+				print _("No data available");
293
+			} else {
268 294
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
269 295
 				$owner_data = '';
270 296
 				foreach($owner_array as $owner_item)
@@ -283,7 +309,10 @@  discard block
 block discarded – undo
283 309
 			}
284 310
 ?>
285 311
                 <div class="more">
286
-                    <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"); ?>&raquo;</a>
312
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
313
+	echo '/'.$airline_icao;
314
+}
315
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
287 316
                 </div>
288 317
             </div>
289 318
         
@@ -296,8 +325,9 @@  discard block
 block discarded – undo
296 325
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
297 326
 <?php
298 327
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
299
-			if (count($flightover_array) == 0) print _("No data available");
300
-			else {
328
+			if (count($flightover_array) == 0) {
329
+				print _("No data available");
330
+			} else {
301 331
 				print '<div id="chart10" class="chart" width="100%"></div><script>';
302 332
 				print 'var series = [';
303 333
 				$flightover_data = '';
@@ -340,7 +370,10 @@  discard block
 block discarded – undo
340 370
 			}
341 371
 ?>
342 372
                 <div class="more">
343
-                    <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"); ?>&raquo;</a>
373
+                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
374
+	echo '/'.$airline_icao;
375
+}
376
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
344 377
                 </div>
345 378
             </div>
346 379
 <?php
@@ -411,7 +444,9 @@  discard block
 block discarded – undo
411 444
 			});";
412 445
 			print '</script>';
413 446
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
414
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
447
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
448
+				echo '/'.$airline_icao;
449
+			}
415 450
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
416 451
 		}
417 452
 ?>
@@ -473,7 +508,9 @@  discard block
 block discarded – undo
473 508
 			});";
474 509
 			print '</script>';
475 510
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
476
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
511
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
512
+				echo '/'.$airline_icao;
513
+			}
477 514
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
478 515
 		}
479 516
 ?>
@@ -494,8 +531,9 @@  discard block
 block discarded – undo
494 531
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
495 532
 <?php
496 533
 			$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
497
-			if (count($year_array) == 0) print _("No data available");
498
-			else {
534
+			if (count($year_array) == 0) {
535
+				print _("No data available");
536
+			} else {
499 537
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
500 538
 				$year_data = '';
501 539
 				$year_cnt = '';
@@ -515,7 +553,10 @@  discard block
 block discarded – undo
515 553
 			}
516 554
 ?>
517 555
                 <div class="more">
518
-                    <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"); ?>&raquo;</a>
556
+                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
557
+	echo '/'.$airline_icao;
558
+}
559
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
519 560
                 </div>
520 561
             </div>
521 562
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -523,8 +564,9 @@  discard block
 block discarded – undo
523 564
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
524 565
 <?php
525 566
 			$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
526
-			if (count($month_array) == 0) print _("No data available");
527
-			else {
567
+			if (count($month_array) == 0) {
568
+				print _("No data available");
569
+			} else {
528 570
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
529 571
 				$month_data = '';
530 572
 				$month_cnt = '';
@@ -544,7 +586,10 @@  discard block
 block discarded – undo
544 586
 			}
545 587
 ?>
546 588
                 <div class="more">
547
-                    <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"); ?>&raquo;</a>
589
+                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
590
+	echo '/'.$airline_icao;
591
+}
592
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
548 593
                 </div>
549 594
             </div>
550 595
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -553,8 +598,9 @@  discard block
 block discarded – undo
553 598
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
554 599
 <?php
555 600
 			$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
556
-			if (empty($date_array)) print _("No data available");
557
-			else {
601
+			if (empty($date_array)) {
602
+				print _("No data available");
603
+			} else {
558 604
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
559 605
 				$date_data = '';
560 606
 				$date_cnt = '';
@@ -574,7 +620,10 @@  discard block
 block discarded – undo
574 620
 			}
575 621
 ?>
576 622
                 <div class="more">
577
-                    <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"); ?>&raquo;</a>
623
+                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
624
+	echo '/'.$airline_icao;
625
+}
626
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
578 627
                 </div>
579 628
             </div>
580 629
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -582,8 +631,9 @@  discard block
 block discarded – undo
582 631
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
583 632
 <?php
584 633
 			$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
585
-			if (empty($hour_array)) print _("No data available");
586
-			else {
634
+			if (empty($hour_array)) {
635
+				print _("No data available");
636
+			} else {
587 637
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
588 638
 				$hour_data = '';
589 639
 				$hour_cnt = '';
@@ -603,7 +653,10 @@  discard block
 block discarded – undo
603 653
 			}
604 654
 ?>
605 655
                 <div class="more">
606
-                    <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"); ?>&raquo;</a>
656
+                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
657
+	echo '/'.$airline_icao;
658
+}
659
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
607 660
                 </div>
608 661
             </div>
609 662
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -625,8 +678,9 @@  discard block
 block discarded – undo
625 678
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
626 679
 <?php
627 680
 			$year_array = $Stats->countFatalitiesByYear();
628
-			if (count($year_array) == 0) print _("No data available");
629
-			else {
681
+			if (count($year_array) == 0) {
682
+				print _("No data available");
683
+			} else {
630 684
 				print '<div id="chart32" class="chart" width="100%"></div><script>';
631 685
 				$year_data = '';
632 686
 				$year_cnt = '';
@@ -656,8 +710,9 @@  discard block
 block discarded – undo
656 710
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
657 711
 <?php
658 712
 			$year_array = $Stats->countFatalitiesLast12Months();
659
-			if (count($year_array) == 0) print _("No data available");
660
-			else {
713
+			if (count($year_array) == 0) {
714
+				print _("No data available");
715
+			} else {
661 716
 				print '<div id="chart33" class="chart" width="100%"></div><script>';
662 717
 				$year_data = '';
663 718
 				$year_cnt = '';
@@ -722,8 +777,11 @@  discard block
 block discarded – undo
722 777
 							$distance = $distance;
723 778
 							$unit = 'km';
724 779
 						}
725
-						if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
726
-						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
780
+						if (!isset($polar_data)) {
781
+							$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
782
+						} else {
783
+							$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
784
+						}
727 785
 					}
728 786
 ?>
729 787
             <div class="col-md-6">
@@ -775,9 +833,12 @@  discard block
 block discarded – undo
775 833
 				foreach ($msg as $eachmsg) {
776 834
 					//$eachmsg = $msg[0];
777 835
 					$data = $eachmsg['source_data'];
778
-					if ($data > 500) $max = (round(($data+100)/100))*100;
779
-					else $max = 500;
780
-?>
836
+					if ($data > 500) {
837
+						$max = (round(($data+100)/100))*100;
838
+					} else {
839
+						$max = 500;
840
+					}
841
+					?>
781 842
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
782 843
         	<script>
783 844
 		      var g = new JustGage({
Please login to merge, or discard this patch.