Completed
Push — master ( 83aaff...7b298e )
by Yannick
32:28
created
statistics-month.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	$Tracker = new Tracker();
17 17
 }
18 18
 if (!isset($filter_name)) $filter_name = '';
19
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
19
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
20 20
 if ($airline_icao == '' && isset($globalFilter)) {
21 21
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
22 22
 }
@@ -32,20 +32,20 @@  discard block
 block discarded – undo
32 32
 	  </div>
33 33
       <p>'._("Below is a chart that plots the busiest day during the <strong>last month</strong>.").'</p>';
34 34
 
35
-if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
35
+if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
36 36
 elseif ($type == 'marine') $date_array = $Marine->countAllDatesLastMonth();
37 37
 elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLastMonth();
38 38
 
39 39
 print '<div id="chart" class="chart" width="100%"></div><script>';
40 40
 $month_data = '';
41 41
 $month_cnt = '';
42
-foreach($date_array as $month_item)
42
+foreach ($date_array as $month_item)
43 43
 {
44 44
 	$month_data .= '"'.$month_item['date_name'].'",';
45 45
 	$month_cnt .= $month_item['date_count'].',';
46 46
 }
47 47
 $month_data = "['x',".substr($month_data, 0, -1)."]";
48
-$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
48
+$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
49 49
 print 'c3.generate({
50 50
     bindto: "#chart",
51 51
     data: { x: "x",
@@ -56,11 +56,11 @@  discard block
 block discarded – undo
56 56
 //$date_array = $Stats->countAllDates();
57 57
 if (!empty($date_array))
58 58
 {
59
-	foreach($date_array as $key => $row) {
59
+	foreach ($date_array as $key => $row) {
60 60
 		$years[$key] = $row['date_name'];
61 61
 		$counts[$key] = $row['date_count'];
62 62
 	}
63
-	array_multisort($counts,SORT_DESC,$date_array);
63
+	array_multisort($counts, SORT_DESC, $date_array);
64 64
 	print '<div class="table-responsive">';
65 65
 	print '<table class="common-date table-striped">';
66 66
 	print '<thead>';
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	print '</thead>';
71 71
 	print '<tbody>';
72 72
 	$i = 1;
73
-	foreach($date_array as $date_item)
73
+	foreach ($date_array as $date_item)
74 74
 	{
75 75
 		print '<tr>';
76 76
 		print '<td><strong>'.$i.'</strong></td>';
77 77
 		print '<td>';
78
-		if ($type == 'aircraft') print '<a href="'.$globalURL.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
79
-		else print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
78
+		if ($type == 'aircraft') print '<a href="'.$globalURL.'/date/'.date('Y-m-d', strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
79
+		else print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d', strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
80 80
 		print '</td>';
81 81
 		print '<td>';
82 82
 		print $date_item['date_count'];
Please login to merge, or discard this patch.
Braces   +22 added lines, -9 removed lines patch added patch discarded remove patch
@@ -15,14 +15,20 @@  discard block
 block discarded – undo
15 15
 	require_once('require/class.Tracker.php');
16 16
 	$Tracker = new Tracker();
17 17
 }
18
-if (!isset($filter_name)) $filter_name = '';
18
+if (!isset($filter_name)) {
19
+	$filter_name = '';
20
+}
19 21
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
20 22
 if ($airline_icao == '' && isset($globalFilter)) {
21
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
22
-}
23
+    if (isset($globalFilter['airline'])) {
24
+    	$airline_icao = $globalFilter['airline'][0];
25
+    }
26
+    }
23 27
 
24 28
 require_once('header.php');
25
-if ($type == 'aircraft') include('statistics-sub-menu.php'); 
29
+if ($type == 'aircraft') {
30
+	include('statistics-sub-menu.php');
31
+}
26 32
 
27 33
 print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
28 34
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -32,9 +38,13 @@  discard block
 block discarded – undo
32 38
 	  </div>
33 39
       <p>'._("Below is a chart that plots the busiest day during the <strong>last month</strong>.").'</p>';
34 40
 
35
-if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
36
-elseif ($type == 'marine') $date_array = $Marine->countAllDatesLastMonth();
37
-elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLastMonth();
41
+if ($type == 'aircraft') {
42
+	$date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
43
+} elseif ($type == 'marine') {
44
+	$date_array = $Marine->countAllDatesLastMonth();
45
+} elseif ($type == 'tracker') {
46
+	$date_array = $Tracker->countAllDatesLastMonth();
47
+}
38 48
 
39 49
 print '<div id="chart" class="chart" width="100%"></div><script>';
40 50
 $month_data = '';
@@ -75,8 +85,11 @@  discard block
 block discarded – undo
75 85
 		print '<tr>';
76 86
 		print '<td><strong>'.$i.'</strong></td>';
77 87
 		print '<td>';
78
-		if ($type == 'aircraft') print '<a href="'.$globalURL.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
79
-		else print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
88
+		if ($type == 'aircraft') {
89
+			print '<a href="'.$globalURL.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
90
+		} else {
91
+			print '<a href="'.$globalURL.'/'.$type.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
92
+		}
80 93
 		print '</td>';
81 94
 		print '<td>';
82 95
 		print $date_item['date_count'];
Please login to merge, or discard this patch.
statistics-country.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 }
22 22
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
23 23
 if ($airline_icao == '' && isset($globalFilter)) {
24
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
24
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25 25
 }
26 26
 
27 27
 require_once('header.php');
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 } else {
20 20
 	$title = _("Statistics").' - '._("Most common Country a flight was over");
21 21
 }
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 ($airline_icao == '' && isset($globalFilter)) {
24 24
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25 25
 }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 }
49 49
 
50 50
 if ($type == 'aircraft') {
51
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
51
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
52 52
 } elseif ($type == 'marine') {
53 53
 	$flightover_array = $Marine->countAllMarineOverCountries();
54 54
 } elseif ($type == 'tracker') {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 print '<div id="chart" class="chart" width="100%"></div><script>';
63 63
 print 'var series = [';
64 64
 $flightover_data = '';
65
-foreach($flightover_array as $flightover_item)
65
+foreach ($flightover_array as $flightover_item)
66 66
 {
67 67
 	$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
68 68
 }
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 	print '</thead>';
112 112
 	print '<tbody>';
113 113
 	$i = 1;
114
-	array_splice($flightover_array,10);
115
-	foreach($flightover_array as $flightover_item)
114
+	array_splice($flightover_array, 10);
115
+	foreach ($flightover_array as $flightover_item)
116 116
 	{
117 117
 		print '<tr>';
118 118
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,7 +4,9 @@  discard block
 block discarded – undo
4 4
 require_once('require/class.Language.php');
5 5
 $Stats = new Stats();
6 6
 
7
-if (!isset($filter_name)) $filter_name = '';
7
+if (!isset($filter_name)) {
8
+	$filter_name = '';
9
+}
8 10
 $type = 'aircraft';
9 11
 if (isset($_GET['marine'])) {
10 12
 	$type = 'marine';
@@ -21,11 +23,15 @@  discard block
 block discarded – undo
21 23
 }
22 24
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
23 25
 if ($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
 
27 31
 require_once('header.php');
28
-if ($type == 'aircraft') include('statistics-sub-menu.php'); 
32
+if ($type == 'aircraft') {
33
+	include('statistics-sub-menu.php');
34
+}
29 35
 
30 36
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
31 37
 print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
Please login to merge, or discard this patch.
statistics-time.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 }
18 18
 
19 19
 if (!isset($filter_name)) $filter_name = '';
20
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
20
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
21 21
 if ($airline_icao == '' && isset($globalFilter)) {
22 22
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
23 23
 }
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 	</div>
34 34
 	<p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>';
35 35
 
36
-if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
37
-elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour',true);
38
-elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour',true);
36
+if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
37
+elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour', true);
38
+elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour', true);
39 39
 print '<div id="chartHour" class="chart" width="100%"></div><script>';
40 40
 $hour_data = '';
41 41
 $hour_cnt = '';
42
-foreach($hour_array as $hour_item)
42
+foreach ($hour_array as $hour_item)
43 43
 {
44 44
 	$hour_data .= '"'.$hour_item['hour_name'].':00",';
45 45
 	$hour_cnt .= $hour_item['hour_count'].',';
46 46
 }
47 47
 $hour_data = "[".substr($hour_data, 0, -1)."]";
48
-$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
48
+$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
49 49
 print 'c3.generate({
50 50
     bindto: "#chartHour",
51 51
     data: {
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
     axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});';
54 54
 print '</script>';
55 55
 
56
-if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name);
57
-elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count',true);
58
-elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count',true);
56
+if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count', true, $airline_icao, $filter_name);
57
+elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count', true);
58
+elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count', true);
59 59
 if (!empty($hour_array))
60 60
 {
61 61
 	print '<div class="table-responsive">';
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	print '</thead>';
68 68
 	print '<tbody>';
69 69
 	$i = 1;
70
-	foreach($hour_array as $hour_item)
70
+	foreach ($hour_array as $hour_item)
71 71
 	{
72 72
 		print '<tr>';
73 73
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
Braces   +24 added lines, -10 removed lines patch added patch discarded remove patch
@@ -16,14 +16,20 @@  discard block
 block discarded – undo
16 16
 	$Tracker = new Tracker();
17 17
 }
18 18
 
19
-if (!isset($filter_name)) $filter_name = '';
19
+if (!isset($filter_name)) {
20
+	$filter_name = '';
21
+}
20 22
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
21 23
 if ($airline_icao == '' && isset($globalFilter)) {
22
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
23
-}
24
+    if (isset($globalFilter['airline'])) {
25
+    	$airline_icao = $globalFilter['airline'][0];
26
+    }
27
+    }
24 28
 
25 29
 require_once('header.php');
26
-if ($type == 'aircraft') include('statistics-sub-menu.php');
30
+if ($type == 'aircraft') {
31
+	include('statistics-sub-menu.php');
32
+}
27 33
 
28 34
 print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
29 35
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -33,9 +39,13 @@  discard block
 block discarded – undo
33 39
 	</div>
34 40
 	<p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>';
35 41
 
36
-if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
37
-elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour',true);
38
-elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour',true);
42
+if ($type == 'aircraft') {
43
+	$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
44
+} elseif ($type == 'marine') {
45
+	$hour_array = $Marine->countAllHours('hour',true);
46
+} elseif ($type == 'tracker') {
47
+	$hour_array = $Tracker->countAllHours('hour',true);
48
+}
39 49
 print '<div id="chartHour" class="chart" width="100%"></div><script>';
40 50
 $hour_data = '';
41 51
 $hour_cnt = '';
@@ -53,9 +63,13 @@  discard block
 block discarded – undo
53 63
     axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});';
54 64
 print '</script>';
55 65
 
56
-if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name);
57
-elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count',true);
58
-elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count',true);
66
+if ($type == 'aircraft') {
67
+	$hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name);
68
+} elseif ($type == 'marine') {
69
+	$hour_array = $Marine->countAllHours('count',true);
70
+} elseif ($type == 'tracker') {
71
+	$hour_array = $Tracker->countAllHours('count',true);
72
+}
59 73
 if (!empty($hour_array))
60 74
 {
61 75
 	print '<div class="table-responsive">';
Please login to merge, or discard this patch.
statistics-year.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 
20 20
 if (!isset($filter_name)) $filter_name = '';
21
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
21
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
22 22
 if ($airline_icao == '' && isset($globalFilter)) {
23 23
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
24 24
 }
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 	</div>
34 34
       <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>';
35 35
 
36
-if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
36
+if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
37 37
 elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true);
38 38
 elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true);
39 39
 print '<div id="chart" class="chart" width="100%"></div><script>';
40 40
 $year_data = '';
41 41
 $year_cnt = '';
42
-foreach($date_array as $year_item)
42
+foreach ($date_array as $year_item)
43 43
 {
44 44
 	$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
45 45
 	$year_cnt .= $year_item['date_count'].',';
46 46
 }
47 47
 $year_data = "['x',".substr($year_data, 0, -1)."]";
48
-$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
48
+$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
49 49
 print 'c3.generate({
50 50
     bindto: "#chart",
51 51
     data: { x: "x",
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	print '</thead>';
69 69
 	print '<tbody>';
70 70
 	$i = 1;
71
-	foreach($date_array as $date_item)
71
+	foreach ($date_array as $date_item)
72 72
 	{
73 73
 		print '<tr>';
74 74
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
Braces   +24 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,14 +17,20 @@  discard block
 block discarded – undo
17 17
 $title = _("Statistics").' - '._("Busiest Month of Last Year");
18 18
 
19 19
 
20
-if (!isset($filter_name)) $filter_name = '';
20
+if (!isset($filter_name)) {
21
+	$filter_name = '';
22
+}
21 23
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
22 24
 if ($airline_icao == '' && isset($globalFilter)) {
23
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
24
-}
25
+    if (isset($globalFilter['airline'])) {
26
+    	$airline_icao = $globalFilter['airline'][0];
27
+    }
28
+    }
25 29
 
26 30
 require_once('header.php');
27
-if ($type == 'aircraft') include('statistics-sub-menu.php');
31
+if ($type == 'aircraft') {
32
+	include('statistics-sub-menu.php');
33
+}
28 34
 print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
29 35
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
30 36
 print '<script type="text/javascript" src="'.$globalURL.'/js/c3.min.js"></script>';
@@ -33,9 +39,13 @@  discard block
 block discarded – undo
33 39
 	</div>
34 40
       <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>';
35 41
 
36
-if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
37
-elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true);
38
-elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true);
42
+if ($type == 'aircraft') {
43
+	$date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
44
+} elseif ($type == 'marine') {
45
+	$date_array = $Marine->countAllMonthsLastYear(true);
46
+} elseif ($type == 'tracker') {
47
+	$date_array = $Tracker->countAllMonthsLastYear(true);
48
+}
39 49
 print '<div id="chart" class="chart" width="100%"></div><script>';
40 50
 $year_data = '';
41 51
 $year_cnt = '';
@@ -53,9 +63,13 @@  discard block
 block discarded – undo
53 63
     axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "#"}},legend: { show: false }});';
54 64
 print '</script>';
55 65
 
56
-if ($type == 'aircraft') $date_array = $Stats->countAllMonths($airline_icao);
57
-elseif ($type == 'marine') $date_array = $Marine->countAllMonths();
58
-elseif ($type == 'tracker') $date_array = $Tracker->countAllMonths();
66
+if ($type == 'aircraft') {
67
+	$date_array = $Stats->countAllMonths($airline_icao);
68
+} elseif ($type == 'marine') {
69
+	$date_array = $Marine->countAllMonths();
70
+} elseif ($type == 'tracker') {
71
+	$date_array = $Tracker->countAllMonths();
72
+}
59 73
 
60 74
 if (!empty($date_array))
61 75
 {
Please login to merge, or discard this patch.
require/class.Stats.php 2 patches
Indentation   +820 added lines, -820 removed lines patch added patch discarded remove patch
@@ -16,33 +16,33 @@  discard block
 block discarded – undo
16 16
 		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
17 17
 		$Connection = new Connection($dbc);
18 18
 		$this->db = $Connection->db();
19
-        }
19
+		}
20 20
               
21 21
 	public function addLastStatsUpdate($type,$stats_date) {
22
-                $query = "DELETE FROM config WHERE name = :type;
22
+				$query = "DELETE FROM config WHERE name = :type;
23 23
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
24
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
25
-                 try {
26
-                        $sth = $this->db->prepare($query);
27
-                        $sth->execute($query_values);
28
-                } catch(PDOException $e) {
29
-                        return "error : ".$e->getMessage();
30
-                }
31
-        }
24
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+				 try {
26
+						$sth = $this->db->prepare($query);
27
+						$sth->execute($query_values);
28
+				} catch(PDOException $e) {
29
+						return "error : ".$e->getMessage();
30
+				}
31
+		}
32 32
 
33 33
 	public function getLastStatsUpdate($type = 'last_update_stats') {
34
-                $query = "SELECT value FROM config WHERE name = :type";
35
-                 try {
36
-                        $sth = $this->db->prepare($query);
37
-                        $sth->execute(array(':type' => $type));
38
-                } catch(PDOException $e) {
39
-                        echo "error : ".$e->getMessage();
40
-                }
41
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
42
-                return $all;
43
-        }
44
-        public function deleteStats($filter_name = '') {
45
-        	/*
34
+				$query = "SELECT value FROM config WHERE name = :type";
35
+				 try {
36
+						$sth = $this->db->prepare($query);
37
+						$sth->execute(array(':type' => $type));
38
+				} catch(PDOException $e) {
39
+						echo "error : ".$e->getMessage();
40
+				}
41
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
42
+				return $all;
43
+		}
44
+		public function deleteStats($filter_name = '') {
45
+			/*
46 46
         	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
47 47
                  try {
48 48
                         $sth = $this->db->prepare($query);
@@ -51,109 +51,109 @@  discard block
 block discarded – undo
51 51
                         return "error : ".$e->getMessage();
52 52
                 }
53 53
                 */
54
-        	$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
55
-                 try {
56
-                        $sth = $this->db->prepare($query);
57
-                        $sth->execute(array(':filter_name' => $filter_name));
58
-                } catch(PDOException $e) {
59
-                        return "error : ".$e->getMessage();
60
-                }
61
-        }
62
-        public function deleteOldStats($filter_name = '') {
63
-        	if ($filter_name == '') {
64
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65
-        	} else {
66
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67
-        	}
68
-                 try {
69
-                        $sth = $this->db->prepare($query);
70
-                        $sth->execute();
71
-                } catch(PDOException $e) {
72
-                        return "error : ".$e->getMessage();
73
-                }
54
+			$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
55
+				 try {
56
+						$sth = $this->db->prepare($query);
57
+						$sth->execute(array(':filter_name' => $filter_name));
58
+				} catch(PDOException $e) {
59
+						return "error : ".$e->getMessage();
60
+				}
61
+		}
62
+		public function deleteOldStats($filter_name = '') {
63
+			if ($filter_name == '') {
64
+				$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65
+			} else {
66
+				$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67
+			}
68
+				 try {
69
+						$sth = $this->db->prepare($query);
70
+						$sth->execute();
71
+				} catch(PDOException $e) {
72
+						return "error : ".$e->getMessage();
73
+				}
74 74
                 
75
-        	$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
76
-                 try {
77
-                        $sth = $this->db->prepare($query);
78
-                        $sth->execute(array(':filter_name' => $filter_name));
79
-                } catch(PDOException $e) {
80
-                        return "error : ".$e->getMessage();
81
-                }
82
-        }
75
+			$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
76
+				 try {
77
+						$sth = $this->db->prepare($query);
78
+						$sth->execute(array(':filter_name' => $filter_name));
79
+				} catch(PDOException $e) {
80
+						return "error : ".$e->getMessage();
81
+				}
82
+		}
83 83
 	public function getAllAirlineNames($filter_name = '') {
84 84
 		if ($filter_name == '') $filter_name = $this->filter_name;
85
-                $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86
-                 try {
87
-                        $sth = $this->db->prepare($query);
88
-                        $sth->execute(array(':filter_name' => $filter_name));
89
-                } catch(PDOException $e) {
90
-                        echo "error : ".$e->getMessage();
91
-                }
92
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
93
-                return $all;
94
-        }
85
+				$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86
+				 try {
87
+						$sth = $this->db->prepare($query);
88
+						$sth->execute(array(':filter_name' => $filter_name));
89
+				} catch(PDOException $e) {
90
+						echo "error : ".$e->getMessage();
91
+				}
92
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
93
+				return $all;
94
+		}
95 95
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96 96
 		if ($filter_name == '') $filter_name = $this->filter_name;
97
-                $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98
-                 try {
99
-                        $sth = $this->db->prepare($query);
100
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101
-                } catch(PDOException $e) {
102
-                        echo "error : ".$e->getMessage();
103
-                }
104
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
105
-                return $all;
106
-        }
97
+				$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98
+				 try {
99
+						$sth = $this->db->prepare($query);
100
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101
+				} catch(PDOException $e) {
102
+						echo "error : ".$e->getMessage();
103
+				}
104
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
105
+				return $all;
106
+		}
107 107
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108 108
 		if ($filter_name == '') $filter_name = $this->filter_name;
109
-                $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110
-                 try {
111
-                        $sth = $this->db->prepare($query);
112
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113
-                } catch(PDOException $e) {
114
-                        echo "error : ".$e->getMessage();
115
-                }
116
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
-                return $all;
118
-        }
109
+				$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110
+				 try {
111
+						$sth = $this->db->prepare($query);
112
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113
+				} catch(PDOException $e) {
114
+						echo "error : ".$e->getMessage();
115
+				}
116
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
+				return $all;
118
+		}
119 119
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120 120
 		if ($filter_name == '') $filter_name = $this->filter_name;
121
-                $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122
-                 try {
123
-                        $sth = $this->db->prepare($query);
124
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125
-                } catch(PDOException $e) {
126
-                        echo "error : ".$e->getMessage();
127
-                }
128
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
129
-                return $all;
130
-        }
121
+				$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122
+				 try {
123
+						$sth = $this->db->prepare($query);
124
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125
+				} catch(PDOException $e) {
126
+						echo "error : ".$e->getMessage();
127
+				}
128
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
129
+				return $all;
130
+		}
131 131
 
132 132
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133 133
 		if ($filter_name == '') $filter_name = $this->filter_name;
134
-                $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135
-                 try {
136
-                        $sth = $this->db->prepare($query);
137
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138
-                } catch(PDOException $e) {
139
-                        echo "error : ".$e->getMessage();
140
-                }
141
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
142
-                return $all;
143
-        }
134
+				$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135
+				 try {
136
+						$sth = $this->db->prepare($query);
137
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138
+				} catch(PDOException $e) {
139
+						echo "error : ".$e->getMessage();
140
+				}
141
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
142
+				return $all;
143
+		}
144 144
 
145 145
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146 146
 		if ($filter_name == '') $filter_name = $this->filter_name;
147
-                $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148
-                 try {
149
-                        $sth = $this->db->prepare($query);
150
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151
-                } catch(PDOException $e) {
152
-                        echo "error : ".$e->getMessage();
153
-                }
154
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
155
-                return $all;
156
-        }
147
+				$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148
+				 try {
149
+						$sth = $this->db->prepare($query);
150
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151
+				} catch(PDOException $e) {
152
+						echo "error : ".$e->getMessage();
153
+				}
154
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
155
+				return $all;
156
+		}
157 157
 
158 158
 
159 159
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 			}
171 171
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172 172
 		} else $all = array();
173
-                if (empty($all)) {
174
-            	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175
-            	    if ($filter_name != '') {
176
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177
-            	    }
178
-            	    $Spotter = new Spotter($this->db);
179
-            	    //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181
-                }
182
-                return $all;
173
+				if (empty($all)) {
174
+					$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175
+					if ($filter_name != '') {
176
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177
+					}
178
+					$Spotter = new Spotter($this->db);
179
+					//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180
+					$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181
+				}
182
+				return $all;
183 183
 	}
184 184
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 185
 		global $globalStatsFilters;
@@ -195,17 +195,17 @@  discard block
 block discarded – undo
195 195
 			}
196 196
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197 197
 		} else $all = array();
198
-                if (empty($all)) {
199
-            		$Spotter = new Spotter($this->db);
200
-            		$filters = array();
201
-            		$filters = array('year' => $year,'month' => $month);
202
-            		if ($filter_name != '') {
203
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204
-			}
205
-            		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
207
-                }
208
-                return $all;
198
+				if (empty($all)) {
199
+					$Spotter = new Spotter($this->db);
200
+					$filters = array();
201
+					$filters = array('year' => $year,'month' => $month);
202
+					if ($filter_name != '') {
203
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204
+			}
205
+					//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
207
+				}
208
+				return $all;
209 209
 	}
210 210
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 211
 		global $globalStatsFilters;
@@ -247,39 +247,39 @@  discard block
 block discarded – undo
247 247
 			}
248 248
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249 249
 		} else $all = array();
250
-                if (empty($all)) {
250
+				if (empty($all)) {
251 251
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 252
 			if ($filter_name != '') {
253
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
253
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
254 254
 			}
255 255
 			$Spotter = new Spotter($this->db);
256 256
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
257 257
 			$all = $Spotter->countAllArrivalCountries($limit,$filters);
258
-                }
259
-                return $all;
258
+				}
259
+				return $all;
260 260
 	}
261 261
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 262
 		global $globalStatsFilters;
263 263
 		if ($filter_name == '') $filter_name = $this->filter_name;
264 264
 		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
265 265
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
266
-                 try {
267
-                        $sth = $this->db->prepare($query);
268
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
-                } catch(PDOException $e) {
270
-                        echo "error : ".$e->getMessage();
271
-                }
272
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
-                if (empty($all)) {
266
+				 try {
267
+						$sth = $this->db->prepare($query);
268
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
+				} catch(PDOException $e) {
270
+						echo "error : ".$e->getMessage();
271
+				}
272
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
+				if (empty($all)) {
274 274
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
275 275
 			if ($filter_name != '') {
276
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
276
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
277 277
 			}
278 278
 			$Spotter = new Spotter($this->db);
279 279
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
280 280
 			$all = $Spotter->countAllDepartureCountries($filters);
281
-                }
282
-                return $all;
281
+				}
282
+				return $all;
283 283
 	}
284 284
 
285 285
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
@@ -305,17 +305,17 @@  discard block
 block discarded – undo
305 305
 			}
306 306
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307 307
 		} else $all = array();
308
-                if (empty($all)) {
309
-	                $Spotter = new Spotter($this->db);
310
-            		$filters = array();
308
+				if (empty($all)) {
309
+					$Spotter = new Spotter($this->db);
310
+					$filters = array();
311 311
 			$filters = array('year' => $year,'month' => $month);
312
-            		if ($filter_name != '') {
313
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
312
+					if ($filter_name != '') {
313
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
314 314
 			}
315 315
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
316
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
317
-                }
318
-                return $all;
316
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
317
+				}
318
+				return $all;
319 319
 	}
320 320
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 321
 		global $globalStatsFilters;
@@ -331,16 +331,16 @@  discard block
 block discarded – undo
331 331
 			}
332 332
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333 333
 		} else $all = array();
334
-                if (empty($all)) {
334
+				if (empty($all)) {
335 335
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 336
 			if ($filter_name != '') {
337 337
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
338 338
 			}
339
-	                $Spotter = new Spotter($this->db);
340
-    		        //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342
-                }
343
-                return $all;
339
+					$Spotter = new Spotter($this->db);
340
+					//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341
+					$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342
+				}
343
+				return $all;
344 344
 	}
345 345
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 346
 		global $globalStatsFilters;
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 					echo "error : ".$e->getMessage();
382 382
 				}
383 383
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
384
-                /*
384
+				/*
385 385
                 if (empty($all)) {
386 386
 	                $Spotter = new Spotter($this->db);
387 387
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -433,16 +433,16 @@  discard block
 block discarded – undo
433 433
 			}
434 434
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435 435
 		} else $all = array();
436
-                if (empty($all)) {
436
+				if (empty($all)) {
437 437
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 438
 			if ($filter_name != '') {
439 439
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
440 440
 			}
441
-            		$Spotter = new Spotter($this->db);
442
-            		//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
444
-                }
445
-                return $all;
441
+					$Spotter = new Spotter($this->db);
442
+					//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443
+					$all = $Spotter->countAllOwners($limit,0,'',$filters);
444
+				}
445
+				return $all;
446 446
 	}
447 447
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 448
 		global $globalStatsFilters;
@@ -458,35 +458,35 @@  discard block
 block discarded – undo
458 458
 			}
459 459
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460 460
 		} else $all = array();
461
-                if (empty($all)) {
461
+				if (empty($all)) {
462 462
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463
-            		if ($filter_name != '') {
464
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
463
+					if ($filter_name != '') {
464
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
465 465
 			}
466
-            		$Spotter = new Spotter($this->db);
466
+					$Spotter = new Spotter($this->db);
467 467
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
468 468
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
469
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471
-        		$all = array();
472
-        		foreach ($pall as $value) {
473
-        			$icao = $value['airport_departure_icao'];
474
-        			$all[$icao] = $value;
475
-        		}
469
+					$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471
+				$all = array();
472
+				foreach ($pall as $value) {
473
+					$icao = $value['airport_departure_icao'];
474
+					$all[$icao] = $value;
475
+				}
476 476
         		
477
-        		foreach ($dall as $value) {
478
-        			$icao = $value['airport_departure_icao'];
479
-        			if (isset($all[$icao])) {
480
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
-        			} else $all[$icao] = $value;
482
-        		}
483
-        		$count = array();
484
-        		foreach ($all as $key => $row) {
485
-        			$count[$key] = $row['airport_departure_icao_count'];
486
-        		}
487
-        		array_multisort($count,SORT_DESC,$all);
488
-                }
489
-                return $all;
477
+				foreach ($dall as $value) {
478
+					$icao = $value['airport_departure_icao'];
479
+					if (isset($all[$icao])) {
480
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
+					} else $all[$icao] = $value;
482
+				}
483
+				$count = array();
484
+				foreach ($all as $key => $row) {
485
+					$count[$key] = $row['airport_departure_icao_count'];
486
+				}
487
+				array_multisort($count,SORT_DESC,$all);
488
+				}
489
+				return $all;
490 490
 	}
491 491
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 492
 		global $globalStatsFilters;
@@ -512,26 +512,26 @@  discard block
 block discarded – undo
512 512
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
513 513
 			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
514 514
 			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
515
-        		$all = array();
516
-        		foreach ($pall as $value) {
517
-        			$icao = $value['airport_arrival_icao'];
518
-        			$all[$icao] = $value;
519
-        		}
515
+				$all = array();
516
+				foreach ($pall as $value) {
517
+					$icao = $value['airport_arrival_icao'];
518
+					$all[$icao] = $value;
519
+				}
520 520
         		
521
-        		foreach ($dall as $value) {
522
-        			$icao = $value['airport_arrival_icao'];
523
-        			if (isset($all[$icao])) {
524
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
-        			} else $all[$icao] = $value;
526
-        		}
527
-        		$count = array();
528
-        		foreach ($all as $key => $row) {
529
-        			$count[$key] = $row['airport_arrival_icao_count'];
530
-        		}
531
-        		array_multisort($count,SORT_DESC,$all);
532
-                }
521
+				foreach ($dall as $value) {
522
+					$icao = $value['airport_arrival_icao'];
523
+					if (isset($all[$icao])) {
524
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
+					} else $all[$icao] = $value;
526
+				}
527
+				$count = array();
528
+				foreach ($all as $key => $row) {
529
+					$count[$key] = $row['airport_arrival_icao_count'];
530
+				}
531
+				array_multisort($count,SORT_DESC,$all);
532
+				}
533 533
  
534
-                return $all;
534
+				return $all;
535 535
 	}
536 536
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 537
 		global $globalDBdriver, $globalStatsFilters;
@@ -544,23 +544,23 @@  discard block
 block discarded – undo
544 544
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
545 545
 		}
546 546
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547
-                 try {
548
-                        $sth = $this->db->prepare($query);
549
-                        $sth->execute($query_data);
550
-                } catch(PDOException $e) {
551
-                        echo "error : ".$e->getMessage();
552
-                }
553
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
554
-                if (empty($all)) {
547
+				 try {
548
+						$sth = $this->db->prepare($query);
549
+						$sth->execute($query_data);
550
+				} catch(PDOException $e) {
551
+						echo "error : ".$e->getMessage();
552
+				}
553
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554
+				if (empty($all)) {
555 555
 			$filters = array('airlines' => array($stats_airline));
556 556
 			if ($filter_name != '') {
557 557
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
558 558
 			}
559
-            		$Spotter = new Spotter($this->db);
560
-            		$all = $Spotter->countAllMonthsLastYear($filters);
561
-                }
559
+					$Spotter = new Spotter($this->db);
560
+					$all = $Spotter->countAllMonthsLastYear($filters);
561
+				}
562 562
                 
563
-                return $all;
563
+				return $all;
564 564
 	}
565 565
 	
566 566
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
@@ -568,22 +568,22 @@  discard block
 block discarded – undo
568 568
 		if ($filter_name == '') $filter_name = $this->filter_name;
569 569
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
570 570
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571
-                 try {
572
-                        $sth = $this->db->prepare($query);
573
-                        $sth->execute($query_data);
574
-                } catch(PDOException $e) {
575
-                        echo "error : ".$e->getMessage();
576
-                }
577
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
-                if (empty($all)) {
571
+				 try {
572
+						$sth = $this->db->prepare($query);
573
+						$sth->execute($query_data);
574
+				} catch(PDOException $e) {
575
+						echo "error : ".$e->getMessage();
576
+				}
577
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
+				if (empty($all)) {
579 579
 			$filters = array('airlines' => array($stats_airline));
580 580
 			if ($filter_name != '') {
581 581
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582 582
 			}
583
-            		$Spotter = new Spotter($this->db);
584
-            		$all = $Spotter->countAllDatesLastMonth($filters);
585
-                }
586
-                return $all;
583
+					$Spotter = new Spotter($this->db);
584
+					$all = $Spotter->countAllDatesLastMonth($filters);
585
+				}
586
+				return $all;
587 587
 	}
588 588
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 589
 		global $globalDBdriver, $globalStatsFilters;
@@ -594,66 +594,66 @@  discard block
 block discarded – undo
594 594
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
595 595
 		}
596 596
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
597
-                 try {
598
-                        $sth = $this->db->prepare($query);
599
-                        $sth->execute($query_data);
600
-                } catch(PDOException $e) {
601
-                        echo "error : ".$e->getMessage();
602
-                }
603
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
604
-                if (empty($all)) {
597
+				 try {
598
+						$sth = $this->db->prepare($query);
599
+						$sth->execute($query_data);
600
+				} catch(PDOException $e) {
601
+						echo "error : ".$e->getMessage();
602
+				}
603
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
604
+				if (empty($all)) {
605 605
 			$filters = array('airlines' => array($stats_airline));
606 606
 			if ($filter_name != '') {
607 607
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
608 608
 			}
609
-            		$Spotter = new Spotter($this->db);
610
-            		$all = $Spotter->countAllDatesLast7Days($filters);
611
-                }
612
-                return $all;
609
+					$Spotter = new Spotter($this->db);
610
+					$all = $Spotter->countAllDatesLast7Days($filters);
611
+				}
612
+				return $all;
613 613
 	}
614 614
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 615
 		global $globalStatsFilters;
616 616
 		if ($filter_name == '') $filter_name = $this->filter_name;
617 617
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
618 618
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619
-                 try {
620
-                        $sth = $this->db->prepare($query);
621
-                        $sth->execute($query_data);
622
-                } catch(PDOException $e) {
623
-                        echo "error : ".$e->getMessage();
624
-                }
625
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
-                if (empty($all)) {
619
+				 try {
620
+						$sth = $this->db->prepare($query);
621
+						$sth->execute($query_data);
622
+				} catch(PDOException $e) {
623
+						echo "error : ".$e->getMessage();
624
+				}
625
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
+				if (empty($all)) {
627 627
 			$filters = array('airlines' => array($stats_airline));
628 628
 			if ($filter_name != '') {
629
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
629
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
630 630
 			}
631
-            		$Spotter = new Spotter($this->db);
632
-            		$all = $Spotter->countAllDates($filters);
633
-                }
634
-                return $all;
631
+					$Spotter = new Spotter($this->db);
632
+					$all = $Spotter->countAllDates($filters);
633
+				}
634
+				return $all;
635 635
 	}
636 636
 	public function countAllDatesByAirlines($filter_name = '') {
637 637
 		global $globalStatsFilters;
638 638
 		if ($filter_name == '') $filter_name = $this->filter_name;
639 639
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 640
 		$query_data = array('filter_name' => $filter_name);
641
-                 try {
642
-                        $sth = $this->db->prepare($query);
643
-                        $sth->execute($query_data);
644
-                } catch(PDOException $e) {
645
-                        echo "error : ".$e->getMessage();
646
-                }
647
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
-                if (empty($all)) {
649
-            		$filters = array();
650
-            		if ($filter_name != '') {
651
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641
+				 try {
642
+						$sth = $this->db->prepare($query);
643
+						$sth->execute($query_data);
644
+				} catch(PDOException $e) {
645
+						echo "error : ".$e->getMessage();
646
+				}
647
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
+				if (empty($all)) {
649
+					$filters = array();
650
+					if ($filter_name != '') {
651
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
652 652
 			}
653
-            		$Spotter = new Spotter($this->db);
654
-            		$all = $Spotter->countAllDatesByAirlines($filters);
655
-                }
656
-                return $all;
653
+					$Spotter = new Spotter($this->db);
654
+					$all = $Spotter->countAllDatesByAirlines($filters);
655
+				}
656
+				return $all;
657 657
 	}
658 658
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 659
 		global $globalStatsFilters, $globalDBdriver;
@@ -663,24 +663,24 @@  discard block
 block discarded – undo
663 663
 		} else {
664 664
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
665 665
 		}
666
-                 try {
667
-                        $sth = $this->db->prepare($query);
668
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
-                } catch(PDOException $e) {
670
-                        echo "error : ".$e->getMessage();
671
-                }
672
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
666
+				 try {
667
+						$sth = $this->db->prepare($query);
668
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
+				} catch(PDOException $e) {
670
+						echo "error : ".$e->getMessage();
671
+				}
672
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
673 673
                 
674
-                if (empty($all)) {
674
+				if (empty($all)) {
675 675
 			$filters = array('airlines' => array($stats_airline));
676 676
 			if ($filter_name != '') {
677 677
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
678 678
 			}
679
-            		$Spotter = new Spotter($this->db);
680
-            		$all = $Spotter->countAllMonths($filters);
681
-                }
679
+					$Spotter = new Spotter($this->db);
680
+					$all = $Spotter->countAllMonths($filters);
681
+				}
682 682
                 
683
-                return $all;
683
+				return $all;
684 684
 	}
685 685
 	public function countFatalitiesLast12Months() {
686 686
 		global $globalStatsFilters, $globalDBdriver;
@@ -689,19 +689,19 @@  discard block
 block discarded – undo
689 689
 		} else {
690 690
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date";
691 691
 		}
692
-                 try {
693
-                        $sth = $this->db->prepare($query);
694
-                        $sth->execute();
695
-                } catch(PDOException $e) {
696
-                        echo "error : ".$e->getMessage();
697
-                }
698
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
692
+				 try {
693
+						$sth = $this->db->prepare($query);
694
+						$sth->execute();
695
+				} catch(PDOException $e) {
696
+						echo "error : ".$e->getMessage();
697
+				}
698
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
699 699
                 
700
-                if (empty($all)) {
701
-            		$Accident = new Accident($this->db);
702
-            		$all = $Accident->countFatalitiesLast12Months();
703
-                }
704
-                return $all;
700
+				if (empty($all)) {
701
+					$Accident = new Accident($this->db);
702
+					$all = $Accident->countFatalitiesLast12Months();
703
+				}
704
+				return $all;
705 705
 	}
706 706
 	public function countFatalitiesByYear() {
707 707
 		global $globalStatsFilters, $globalDBdriver;
@@ -710,40 +710,40 @@  discard block
 block discarded – undo
710 710
 		} else {
711 711
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date";
712 712
 		}
713
-                 try {
714
-                        $sth = $this->db->prepare($query);
715
-                        $sth->execute();
716
-                } catch(PDOException $e) {
717
-                        echo "error : ".$e->getMessage();
718
-                }
719
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
713
+				 try {
714
+						$sth = $this->db->prepare($query);
715
+						$sth->execute();
716
+				} catch(PDOException $e) {
717
+						echo "error : ".$e->getMessage();
718
+				}
719
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
720 720
                 
721
-                if (empty($all)) {
722
-            		$Accident = new Accident($this->db);
723
-            		$all = $Accident->countFatalitiesByYear();
724
-                }
725
-                return $all;
721
+				if (empty($all)) {
722
+					$Accident = new Accident($this->db);
723
+					$all = $Accident->countFatalitiesByYear();
724
+				}
725
+				return $all;
726 726
 	}
727 727
 	public function countAllMilitaryMonths($filter_name = '') {
728 728
 		global $globalStatsFilters;
729 729
 		if ($filter_name == '') $filter_name = $this->filter_name;
730
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731
-                 try {
732
-                        $sth = $this->db->prepare($query);
733
-                        $sth->execute(array(':filter_name' => $filter_name));
734
-                } catch(PDOException $e) {
735
-                        echo "error : ".$e->getMessage();
736
-                }
737
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
738
-                if (empty($all)) {
739
-            		$filters = array();
740
-            		if ($filter_name != '') {
741
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
730
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731
+				 try {
732
+						$sth = $this->db->prepare($query);
733
+						$sth->execute(array(':filter_name' => $filter_name));
734
+				} catch(PDOException $e) {
735
+						echo "error : ".$e->getMessage();
736
+				}
737
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
738
+				if (empty($all)) {
739
+					$filters = array();
740
+					if ($filter_name != '') {
741
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
742 742
 			}
743
-            		$Spotter = new Spotter($this->db);
744
-            		$all = $Spotter->countAllMilitaryMonths($filters);
745
-                }
746
-                return $all;
743
+					$Spotter = new Spotter($this->db);
744
+					$all = $Spotter->countAllMilitaryMonths($filters);
745
+				}
746
+				return $all;
747 747
 	}
748 748
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 749
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
@@ -759,22 +759,22 @@  discard block
 block discarded – undo
759 759
 			}
760 760
 		}
761 761
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
762
-                 try {
763
-                        $sth = $this->db->prepare($query);
764
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765
-                } catch(PDOException $e) {
766
-                        echo "error : ".$e->getMessage();
767
-                }
768
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
769
-                if (empty($all)) {
762
+				 try {
763
+						$sth = $this->db->prepare($query);
764
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765
+				} catch(PDOException $e) {
766
+						echo "error : ".$e->getMessage();
767
+				}
768
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
769
+				if (empty($all)) {
770 770
 			$filters = array('airlines' => array($stats_airline));
771 771
 			if ($filter_name != '') {
772
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
772
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
773 773
 			}
774
-            		$Spotter = new Spotter($this->db);
775
-            		$all = $Spotter->countAllHours($orderby,$filters);
776
-                }
777
-                return $all;
774
+					$Spotter = new Spotter($this->db);
775
+					$all = $Spotter->countAllHours($orderby,$filters);
776
+				}
777
+				return $all;
778 778
 	}
779 779
 	
780 780
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
@@ -799,10 +799,10 @@  discard block
 block discarded – undo
799 799
 		if ($year == '') $year = date('Y');
800 800
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 801
 		if (empty($all)) {
802
-		        $filters = array();
802
+				$filters = array();
803 803
 			$filters = array('year' => $year,'month' => $month);
804
-            		if ($filter_name != '') {
805
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
804
+					if ($filter_name != '') {
805
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
806 806
 			}
807 807
 			$Spotter = new Spotter($this->db);
808 808
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -866,10 +866,10 @@  discard block
 block discarded – undo
866 866
 			$all = $result[0]['nb_airline'];
867 867
 		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
868 868
 		if (empty($all)) {
869
-            		$filters = array();
869
+					$filters = array();
870 870
 			$filters = array('year' => $year,'month' => $month);
871
-            		if ($filter_name != '') {
872
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
871
+					if ($filter_name != '') {
872
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
873 873
 			}
874 874
 			$Spotter = new Spotter($this->db);
875 875
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -939,44 +939,44 @@  discard block
 block discarded – undo
939 939
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
941 941
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942
-                 try {
943
-                        $sth = $this->db->prepare($query);
944
-                        $sth->execute($query_values);
945
-                } catch(PDOException $e) {
946
-                        echo "error : ".$e->getMessage();
947
-                }
948
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
949
-                return $all;
942
+				 try {
943
+						$sth = $this->db->prepare($query);
944
+						$sth->execute($query_values);
945
+				} catch(PDOException $e) {
946
+						echo "error : ".$e->getMessage();
947
+				}
948
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
949
+				return $all;
950 950
 	}
951 951
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952 952
 		if ($filter_name == '') $filter_name = $this->filter_name;
953
-                $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955
-                 try {
956
-                        $sth = $this->db->prepare($query);
957
-                        $sth->execute($query_values);
958
-                } catch(PDOException $e) {
959
-                        echo "error : ".$e->getMessage();
960
-                }
961
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
962
-                return $all;
963
-        }
953
+				$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955
+				 try {
956
+						$sth = $this->db->prepare($query);
957
+						$sth->execute($query_values);
958
+				} catch(PDOException $e) {
959
+						echo "error : ".$e->getMessage();
960
+				}
961
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
962
+				return $all;
963
+		}
964 964
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965 965
 		if ($filter_name == '') $filter_name = $this->filter_name;
966
-                $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968
-                 try {
969
-                        $sth = $this->db->prepare($query);
970
-                        $sth->execute($query_values);
971
-                } catch(PDOException $e) {
972
-                        echo "error : ".$e->getMessage();
973
-                }
974
-        }
966
+				$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968
+				 try {
969
+						$sth = $this->db->prepare($query);
970
+						$sth->execute($query_values);
971
+				} catch(PDOException $e) {
972
+						echo "error : ".$e->getMessage();
973
+				}
974
+		}
975 975
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
976 976
 		if ($filter_name == '') $filter_name = $this->filter_name;
977
-    		global $globalArchiveMonths, $globalDBdriver;
978
-    		if ($globalDBdriver == 'mysql') {
979
-    			if ($month == '') {
977
+			global $globalArchiveMonths, $globalDBdriver;
978
+			if ($globalDBdriver == 'mysql') {
979
+				if ($month == '') {
980 980
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
981 981
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
982 982
 			} else {
@@ -991,165 +991,165 @@  discard block
 block discarded – undo
991 991
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
992 992
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
993 993
 			}
994
-                }
995
-                 try {
996
-                        $sth = $this->db->prepare($query);
997
-                        $sth->execute($query_values);
998
-                } catch(PDOException $e) {
999
-                        echo "error : ".$e->getMessage();
1000
-                }
1001
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002
-                return $all[0]['total'];
1003
-        }
994
+				}
995
+				 try {
996
+						$sth = $this->db->prepare($query);
997
+						$sth->execute($query_values);
998
+				} catch(PDOException $e) {
999
+						echo "error : ".$e->getMessage();
1000
+				}
1001
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002
+				return $all[0]['total'];
1003
+		}
1004 1004
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1005
-    		global $globalArchiveMonths, $globalDBdriver;
1005
+			global $globalArchiveMonths, $globalDBdriver;
1006 1006
 		if ($filter_name == '') $filter_name = $this->filter_name;
1007
-    		if ($globalDBdriver == 'mysql') {
1007
+			if ($globalDBdriver == 'mysql') {
1008 1008
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1009 1009
 		} else {
1010 1010
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1011
-                }
1012
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013
-                 try {
1014
-                        $sth = $this->db->prepare($query);
1015
-                        $sth->execute($query_values);
1016
-                } catch(PDOException $e) {
1017
-                        echo "error : ".$e->getMessage();
1018
-                }
1019
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020
-                return $all[0]['total'];
1021
-        }
1011
+				}
1012
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013
+				 try {
1014
+						$sth = $this->db->prepare($query);
1015
+						$sth->execute($query_values);
1016
+				} catch(PDOException $e) {
1017
+						echo "error : ".$e->getMessage();
1018
+				}
1019
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020
+				return $all[0]['total'];
1021
+		}
1022 1022
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1023
-    		global $globalArchiveMonths, $globalDBdriver;
1023
+			global $globalArchiveMonths, $globalDBdriver;
1024 1024
 		if ($filter_name == '') $filter_name = $this->filter_name;
1025
-    		if ($globalDBdriver == 'mysql') {
1025
+			if ($globalDBdriver == 'mysql') {
1026 1026
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1027
-                } else {
1027
+				} else {
1028 1028
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1029
-                }
1030
-                 try {
1031
-                        $sth = $this->db->prepare($query);
1032
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033
-                } catch(PDOException $e) {
1034
-                        echo "error : ".$e->getMessage();
1035
-                }
1036
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037
-                return $all[0]['total'];
1038
-        }
1029
+				}
1030
+				 try {
1031
+						$sth = $this->db->prepare($query);
1032
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033
+				} catch(PDOException $e) {
1034
+						echo "error : ".$e->getMessage();
1035
+				}
1036
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037
+				return $all[0]['total'];
1038
+		}
1039 1039
 	public function getStatsAirlineTotal($filter_name = '') {
1040
-    		global $globalArchiveMonths, $globalDBdriver;
1040
+			global $globalArchiveMonths, $globalDBdriver;
1041 1041
 		if ($filter_name == '') $filter_name = $this->filter_name;
1042
-    		if ($globalDBdriver == 'mysql') {
1042
+			if ($globalDBdriver == 'mysql') {
1043 1043
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1044
-                } else {
1044
+				} else {
1045 1045
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1046
-                }
1047
-                 try {
1048
-                        $sth = $this->db->prepare($query);
1049
-                        $sth->execute(array(':filter_name' => $filter_name));
1050
-                } catch(PDOException $e) {
1051
-                        echo "error : ".$e->getMessage();
1052
-                }
1053
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054
-                return $all[0]['total'];
1055
-        }
1046
+				}
1047
+				 try {
1048
+						$sth = $this->db->prepare($query);
1049
+						$sth->execute(array(':filter_name' => $filter_name));
1050
+				} catch(PDOException $e) {
1051
+						echo "error : ".$e->getMessage();
1052
+				}
1053
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054
+				return $all[0]['total'];
1055
+		}
1056 1056
 	public function getStatsOwnerTotal($filter_name = '') {
1057
-    		global $globalArchiveMonths, $globalDBdriver;
1057
+			global $globalArchiveMonths, $globalDBdriver;
1058 1058
 		if ($filter_name == '') $filter_name = $this->filter_name;
1059
-    		if ($globalDBdriver == 'mysql') {
1059
+			if ($globalDBdriver == 'mysql') {
1060 1060
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1061 1061
 		} else {
1062 1062
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1063
-                }
1064
-                 try {
1065
-                        $sth = $this->db->prepare($query);
1066
-                        $sth->execute(array(':filter_name' => $filter_name));
1067
-                } catch(PDOException $e) {
1068
-                        echo "error : ".$e->getMessage();
1069
-                }
1070
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071
-                return $all[0]['total'];
1072
-        }
1063
+				}
1064
+				 try {
1065
+						$sth = $this->db->prepare($query);
1066
+						$sth->execute(array(':filter_name' => $filter_name));
1067
+				} catch(PDOException $e) {
1068
+						echo "error : ".$e->getMessage();
1069
+				}
1070
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071
+				return $all[0]['total'];
1072
+		}
1073 1073
 	public function getStatsOwner($owner_name,$filter_name = '') {
1074
-    		global $globalArchiveMonths, $globalDBdriver;
1074
+			global $globalArchiveMonths, $globalDBdriver;
1075 1075
 		if ($filter_name == '') $filter_name = $this->filter_name;
1076 1076
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077
-                 try {
1078
-                        $sth = $this->db->prepare($query);
1079
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080
-                } catch(PDOException $e) {
1081
-                        echo "error : ".$e->getMessage();
1082
-                }
1083
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085
-                else return 0;
1086
-        }
1077
+				 try {
1078
+						$sth = $this->db->prepare($query);
1079
+						$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080
+				} catch(PDOException $e) {
1081
+						echo "error : ".$e->getMessage();
1082
+				}
1083
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085
+				else return 0;
1086
+		}
1087 1087
 	public function getStatsPilotTotal($filter_name = '') {
1088
-    		global $globalArchiveMonths, $globalDBdriver;
1088
+			global $globalArchiveMonths, $globalDBdriver;
1089 1089
 		if ($filter_name == '') $filter_name = $this->filter_name;
1090
-    		if ($globalDBdriver == 'mysql') {
1091
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092
-            	} else {
1093
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
-            	}
1095
-                 try {
1096
-                        $sth = $this->db->prepare($query);
1097
-                        $sth->execute(array(':filter_name' => $filter_name));
1098
-                } catch(PDOException $e) {
1099
-                        echo "error : ".$e->getMessage();
1100
-                }
1101
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102
-                return $all[0]['total'];
1103
-        }
1090
+			if ($globalDBdriver == 'mysql') {
1091
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092
+				} else {
1093
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
+				}
1095
+				 try {
1096
+						$sth = $this->db->prepare($query);
1097
+						$sth->execute(array(':filter_name' => $filter_name));
1098
+				} catch(PDOException $e) {
1099
+						echo "error : ".$e->getMessage();
1100
+				}
1101
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102
+				return $all[0]['total'];
1103
+		}
1104 1104
 	public function getStatsPilot($pilot,$filter_name = '') {
1105
-    		global $globalArchiveMonths, $globalDBdriver;
1105
+			global $globalArchiveMonths, $globalDBdriver;
1106 1106
 		if ($filter_name == '') $filter_name = $this->filter_name;
1107 1107
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108
-                 try {
1109
-                        $sth = $this->db->prepare($query);
1110
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111
-                } catch(PDOException $e) {
1112
-                        echo "error : ".$e->getMessage();
1113
-                }
1114
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116
-                else return 0;
1117
-        }
1108
+				 try {
1109
+						$sth = $this->db->prepare($query);
1110
+						$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111
+				} catch(PDOException $e) {
1112
+						echo "error : ".$e->getMessage();
1113
+				}
1114
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116
+				else return 0;
1117
+		}
1118 1118
 
1119 1119
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1120 1120
 		global $globalDBdriver;
1121 1121
 		if ($filter_name == '') $filter_name = $this->filter_name;
1122 1122
 		if ($globalDBdriver == 'mysql') {
1123 1123
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1124
-                } else {
1124
+				} else {
1125 1125
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1126 1126
 		}
1127
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128
-                 try {
1129
-                        $sth = $this->db->prepare($query);
1130
-                        $sth->execute($query_values);
1131
-                } catch(PDOException $e) {
1132
-                        return "error : ".$e->getMessage();
1133
-                }
1134
-        }
1127
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128
+				 try {
1129
+						$sth = $this->db->prepare($query);
1130
+						$sth->execute($query_values);
1131
+				} catch(PDOException $e) {
1132
+						return "error : ".$e->getMessage();
1133
+				}
1134
+		}
1135 1135
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1136 1136
 		global $globalDBdriver;
1137 1137
 		if ($filter_name == '') $filter_name = $this->filter_name;
1138 1138
 		if ($globalDBdriver == 'mysql') {
1139 1139
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1140 1140
 		} else {
1141
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1141
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1142
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1143
-                }
1144
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145
-                 try {
1146
-                        $sth = $this->db->prepare($query);
1147
-                        $sth->execute($query_values);
1148
-                } catch(PDOException $e) {
1149
-                        return "error : ".$e->getMessage();
1150
-                }
1151
-        }
1152
-        /*
1143
+				}
1144
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145
+				 try {
1146
+						$sth = $this->db->prepare($query);
1147
+						$sth->execute($query_values);
1148
+				} catch(PDOException $e) {
1149
+						return "error : ".$e->getMessage();
1150
+				}
1151
+		}
1152
+		/*
1153 1153
 	public function getStatsSource($date,$stats_type = '') {
1154 1154
 		if ($stats_type == '') {
1155 1155
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -1218,25 +1218,25 @@  discard block
 block discarded – undo
1218 1218
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1219 1219
 		} else {
1220 1220
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1221
-                }
1222
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223
-                 try {
1224
-                        $sth = $this->db->prepare($query);
1225
-                        $sth->execute($query_values);
1226
-                } catch(PDOException $e) {
1227
-                        return "error : ".$e->getMessage();
1228
-                }
1229
-        }
1230
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233
-                 try {
1234
-                        $sth = $this->db->prepare($query);
1235
-                        $sth->execute($query_values);
1236
-                } catch(PDOException $e) {
1237
-                        return "error : ".$e->getMessage();
1238
-                }
1239
-        }
1221
+				}
1222
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223
+				 try {
1224
+						$sth = $this->db->prepare($query);
1225
+						$sth->execute($query_values);
1226
+				} catch(PDOException $e) {
1227
+						return "error : ".$e->getMessage();
1228
+				}
1229
+		}
1230
+	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233
+				 try {
1234
+						$sth = $this->db->prepare($query);
1235
+						$sth->execute($query_values);
1236
+				} catch(PDOException $e) {
1237
+						return "error : ".$e->getMessage();
1238
+				}
1239
+		}
1240 1240
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1241 1241
 		global $globalDBdriver;
1242 1242
 		if ($globalDBdriver == 'mysql') {
@@ -1252,14 +1252,14 @@  discard block
 block discarded – undo
1252 1252
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1253 1253
 			}
1254 1254
 		}
1255
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256
-                 try {
1257
-                        $sth = $this->db->prepare($query);
1258
-                        $sth->execute($query_values);
1259
-                } catch(PDOException $e) {
1260
-                        return "error : ".$e->getMessage();
1261
-                }
1262
-        }
1255
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256
+				 try {
1257
+						$sth = $this->db->prepare($query);
1258
+						$sth->execute($query_values);
1259
+				} catch(PDOException $e) {
1260
+						return "error : ".$e->getMessage();
1261
+				}
1262
+		}
1263 1263
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1264 1264
 		global $globalDBdriver;
1265 1265
 		if ($globalDBdriver == 'mysql') {
@@ -1275,14 +1275,14 @@  discard block
 block discarded – undo
1275 1275
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1276 1276
 			}
1277 1277
 		}
1278
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279
-                 try {
1280
-                        $sth = $this->db->prepare($query);
1281
-                        $sth->execute($query_values);
1282
-                } catch(PDOException $e) {
1283
-                        return "error : ".$e->getMessage();
1284
-                }
1285
-        }
1278
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279
+				 try {
1280
+						$sth = $this->db->prepare($query);
1281
+						$sth->execute($query_values);
1282
+				} catch(PDOException $e) {
1283
+						return "error : ".$e->getMessage();
1284
+				}
1285
+		}
1286 1286
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1287 1287
 		global $globalDBdriver;
1288 1288
 		if ($globalDBdriver == 'mysql') {
@@ -1298,14 +1298,14 @@  discard block
 block discarded – undo
1298 1298
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1299 1299
 			}
1300 1300
 		}
1301
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302
-                 try {
1303
-                        $sth = $this->db->prepare($query);
1304
-                        $sth->execute($query_values);
1305
-                } catch(PDOException $e) {
1306
-                        return "error : ".$e->getMessage();
1307
-                }
1308
-        }
1301
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302
+				 try {
1303
+						$sth = $this->db->prepare($query);
1304
+						$sth->execute($query_values);
1305
+				} catch(PDOException $e) {
1306
+						return "error : ".$e->getMessage();
1307
+				}
1308
+		}
1309 1309
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1310 1310
 		global $globalDBdriver;
1311 1311
 		if ($globalDBdriver == 'mysql') {
@@ -1321,14 +1321,14 @@  discard block
 block discarded – undo
1321 1321
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1322 1322
 			}
1323 1323
 		}
1324
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1325
-                 try {
1326
-                        $sth = $this->db->prepare($query);
1327
-                        $sth->execute($query_values);
1328
-                } catch(PDOException $e) {
1329
-                        return "error : ".$e->getMessage();
1330
-                }
1331
-        }
1324
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1325
+				 try {
1326
+						$sth = $this->db->prepare($query);
1327
+						$sth->execute($query_values);
1328
+				} catch(PDOException $e) {
1329
+						return "error : ".$e->getMessage();
1330
+				}
1331
+		}
1332 1332
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1333 1333
 		global $globalDBdriver;
1334 1334
 		if ($globalDBdriver == 'mysql') {
@@ -1344,14 +1344,14 @@  discard block
 block discarded – undo
1344 1344
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1345 1345
 			}
1346 1346
 		}
1347
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348
-                 try {
1349
-                        $sth = $this->db->prepare($query);
1350
-                        $sth->execute($query_values);
1351
-                } catch(PDOException $e) {
1352
-                        return "error : ".$e->getMessage();
1353
-                }
1354
-        }
1347
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348
+				 try {
1349
+						$sth = $this->db->prepare($query);
1350
+						$sth->execute($query_values);
1351
+				} catch(PDOException $e) {
1352
+						return "error : ".$e->getMessage();
1353
+				}
1354
+		}
1355 1355
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1356 1356
 		global $globalDBdriver;
1357 1357
 		if ($globalDBdriver == 'mysql') {
@@ -1367,14 +1367,14 @@  discard block
 block discarded – undo
1367 1367
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1368 1368
 			}
1369 1369
 		}
1370
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371
-                 try {
1372
-                        $sth = $this->db->prepare($query);
1373
-                        $sth->execute($query_values);
1374
-                } catch(PDOException $e) {
1375
-                        return "error : ".$e->getMessage();
1376
-                }
1377
-        }
1370
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371
+				 try {
1372
+						$sth = $this->db->prepare($query);
1373
+						$sth->execute($query_values);
1374
+				} catch(PDOException $e) {
1375
+						return "error : ".$e->getMessage();
1376
+				}
1377
+		}
1378 1378
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1379 1379
 		global $globalDBdriver;
1380 1380
 		if ($globalDBdriver == 'mysql') {
@@ -1390,14 +1390,14 @@  discard block
 block discarded – undo
1390 1390
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1391 1391
 			}
1392 1392
 		}
1393
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1394
-                 try {
1395
-                        $sth = $this->db->prepare($query);
1396
-                        $sth->execute($query_values);
1397
-                } catch(PDOException $e) {
1398
-                        return "error : ".$e->getMessage();
1399
-                }
1400
-        }
1393
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1394
+				 try {
1395
+						$sth = $this->db->prepare($query);
1396
+						$sth->execute($query_values);
1397
+				} catch(PDOException $e) {
1398
+						return "error : ".$e->getMessage();
1399
+				}
1400
+		}
1401 1401
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1402 1402
 		global $globalDBdriver;
1403 1403
 		if ($airport_icao != '') {
@@ -1421,8 +1421,8 @@  discard block
 block discarded – undo
1421 1421
 			} catch(PDOException $e) {
1422 1422
 				return "error : ".$e->getMessage();
1423 1423
 			}
1424
-                }
1425
-        }
1424
+				}
1425
+		}
1426 1426
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1427 1427
 		global $globalDBdriver;
1428 1428
 		if ($airport_icao != '') {
@@ -1438,8 +1438,8 @@  discard block
 block discarded – undo
1438 1438
 			} catch(PDOException $e) {
1439 1439
 				return "error : ".$e->getMessage();
1440 1440
 			}
1441
-                }
1442
-        }
1441
+				}
1442
+		}
1443 1443
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1444 1444
 		global $globalDBdriver;
1445 1445
 		if ($airport_icao != '') {
@@ -1456,15 +1456,15 @@  discard block
 block discarded – undo
1456 1456
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1457 1457
 				}
1458 1458
 			}
1459
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1459
+					$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1460 1460
 			 try {
1461
-                    		$sth = $this->db->prepare($query);
1462
-	                        $sth->execute($query_values);
1463
-    		        } catch(PDOException $e) {
1464
-            		        return "error : ".$e->getMessage();
1465
-	                }
1466
-	        }
1467
-        }
1461
+							$sth = $this->db->prepare($query);
1462
+							$sth->execute($query_values);
1463
+					} catch(PDOException $e) {
1464
+							return "error : ".$e->getMessage();
1465
+					}
1466
+			}
1467
+		}
1468 1468
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1469 1469
 		global $globalDBdriver;
1470 1470
 		if ($airport_icao != '') {
@@ -1480,46 +1480,46 @@  discard block
 block discarded – undo
1480 1480
 			} catch(PDOException $e) {
1481 1481
 				return "error : ".$e->getMessage();
1482 1482
 			}
1483
-                }
1484
-        }
1483
+				}
1484
+		}
1485 1485
 
1486 1486
 	public function deleteStat($id) {
1487
-                $query = "DELETE FROM stats WHERE stats_id = :id";
1488
-                $query_values = array(':id' => $id);
1489
-                 try {
1490
-                        $sth = $this->db->prepare($query);
1491
-                        $sth->execute($query_values);
1492
-                } catch(PDOException $e) {
1493
-                        return "error : ".$e->getMessage();
1494
-                }
1495
-        }
1487
+				$query = "DELETE FROM stats WHERE stats_id = :id";
1488
+				$query_values = array(':id' => $id);
1489
+				 try {
1490
+						$sth = $this->db->prepare($query);
1491
+						$sth->execute($query_values);
1492
+				} catch(PDOException $e) {
1493
+						return "error : ".$e->getMessage();
1494
+				}
1495
+		}
1496 1496
 	public function deleteStatFlight($type) {
1497
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498
-                $query_values = array(':type' => $type);
1499
-                 try {
1500
-                        $sth = $this->db->prepare($query);
1501
-                        $sth->execute($query_values);
1502
-                } catch(PDOException $e) {
1503
-                        return "error : ".$e->getMessage();
1504
-                }
1505
-        }
1497
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498
+				$query_values = array(':type' => $type);
1499
+				 try {
1500
+						$sth = $this->db->prepare($query);
1501
+						$sth->execute($query_values);
1502
+				} catch(PDOException $e) {
1503
+						return "error : ".$e->getMessage();
1504
+				}
1505
+		}
1506 1506
 	public function deleteStatAirport($type) {
1507
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508
-                $query_values = array(':type' => $type);
1509
-                 try {
1510
-                        $sth = $this->db->prepare($query);
1511
-                        $sth->execute($query_values);
1512
-                } catch(PDOException $e) {
1513
-                        return "error : ".$e->getMessage();
1514
-                }
1515
-        }
1507
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508
+				$query_values = array(':type' => $type);
1509
+				 try {
1510
+						$sth = $this->db->prepare($query);
1511
+						$sth->execute($query_values);
1512
+				} catch(PDOException $e) {
1513
+						return "error : ".$e->getMessage();
1514
+				}
1515
+		}
1516 1516
         
1517
-        public function addOldStats() {
1518
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1519
-    		$Common = new Common();
1520
-    		$Connection = new Connection();
1521
-    		date_default_timezone_set('UTC');
1522
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
1517
+		public function addOldStats() {
1518
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1519
+			$Common = new Common();
1520
+			$Connection = new Connection();
1521
+			date_default_timezone_set('UTC');
1522
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
1523 1523
 			if ($globalDebug) echo 'Update stats !'."\n";
1524 1524
 			if (isset($last_update[0]['value'])) {
1525 1525
 				$last_update_day = $last_update[0]['value'];
@@ -1566,24 +1566,24 @@  discard block
 block discarded – undo
1566 1566
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1567 1567
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1568 1568
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1569
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1569
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570 1570
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1571
-	        	$alldata = array();
1571
+				$alldata = array();
1572 1572
 	        	
1573
-    			foreach ($pall as $value) {
1574
-	        		$icao = $value['airport_departure_icao'];
1575
-    				$alldata[$icao] = $value;
1576
-	        	}
1577
-	        	foreach ($dall as $value) {
1578
-    				$icao = $value['airport_departure_icao'];
1579
-        			if (isset($alldata[$icao])) {
1580
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581
-        			} else $alldata[$icao] = $value;
1582
-			}
1583
-    			$count = array();
1584
-    			foreach ($alldata as $key => $row) {
1585
-    				$count[$key] = $row['airport_departure_icao_count'];
1586
-        		}
1573
+				foreach ($pall as $value) {
1574
+					$icao = $value['airport_departure_icao'];
1575
+					$alldata[$icao] = $value;
1576
+				}
1577
+				foreach ($dall as $value) {
1578
+					$icao = $value['airport_departure_icao'];
1579
+					if (isset($alldata[$icao])) {
1580
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581
+					} else $alldata[$icao] = $value;
1582
+			}
1583
+				$count = array();
1584
+				foreach ($alldata as $key => $row) {
1585
+					$count[$key] = $row['airport_departure_icao_count'];
1586
+				}
1587 1587
 			array_multisort($count,SORT_DESC,$alldata);
1588 1588
 			foreach ($alldata as $number) {
1589 1589
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
@@ -1591,25 +1591,25 @@  discard block
 block discarded – undo
1591 1591
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1592 1592
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1593 1593
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1594
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1594
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595 1595
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1596
-	        	$alldata = array();
1597
-    			foreach ($pall as $value) {
1598
-	        		$icao = $value['airport_arrival_icao'];
1599
-    				$alldata[$icao] = $value;
1600
-	        	}
1601
-	        	foreach ($dall as $value) {
1602
-    				$icao = $value['airport_arrival_icao'];
1603
-        			if (isset($alldata[$icao])) {
1604
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605
-	        		} else $alldata[$icao] = $value;
1606
-    			}
1607
-        		$count = array();
1608
-        		foreach ($alldata as $key => $row) {
1609
-        			$count[$key] = $row['airport_arrival_icao_count'];
1610
-	        	}
1611
-    			array_multisort($count,SORT_DESC,$alldata);
1612
-                        foreach ($alldata as $number) {
1596
+				$alldata = array();
1597
+				foreach ($pall as $value) {
1598
+					$icao = $value['airport_arrival_icao'];
1599
+					$alldata[$icao] = $value;
1600
+				}
1601
+				foreach ($dall as $value) {
1602
+					$icao = $value['airport_arrival_icao'];
1603
+					if (isset($alldata[$icao])) {
1604
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605
+					} else $alldata[$icao] = $value;
1606
+				}
1607
+				$count = array();
1608
+				foreach ($alldata as $key => $row) {
1609
+					$count[$key] = $row['airport_arrival_icao_count'];
1610
+				}
1611
+				array_multisort($count,SORT_DESC,$alldata);
1612
+						foreach ($alldata as $number) {
1613 1613
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1614 1614
 			}
1615 1615
 			if ($Connection->tableExists('countries')) {
@@ -1684,8 +1684,8 @@  discard block
 block discarded – undo
1684 1684
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 1685
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1686 1686
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
1687
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1688
-        		/*
1687
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1688
+				/*
1689 1689
 	        	$alldata = array();
1690 1690
     			foreach ($pall as $value) {
1691 1691
 	        		$icao = $value['departure_airport_icao'];
@@ -1704,29 +1704,29 @@  discard block
 block discarded – undo
1704 1704
 	        	}
1705 1705
     			array_multisort($count,SORT_DESC,$alldata);
1706 1706
     			*/
1707
-    			foreach ($dall as $value) {
1708
-    				$icao = $value['departure_airport_icao'];
1709
-    				$ddate = $value['date'];
1710
-    				$find = false;
1711
-    				foreach ($pall as $pvalue) {
1712
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1713
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1714
-    						$find = true;
1715
-    						break;
1716
-    					}
1717
-    				}
1718
-    				if ($find === false) {
1719
-    					$pall[] = $value;
1720
-    				}
1721
-    			}
1722
-    			$alldata = $pall;
1707
+				foreach ($dall as $value) {
1708
+					$icao = $value['departure_airport_icao'];
1709
+					$ddate = $value['date'];
1710
+					$find = false;
1711
+					foreach ($pall as $pvalue) {
1712
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1713
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1714
+							$find = true;
1715
+							break;
1716
+						}
1717
+					}
1718
+					if ($find === false) {
1719
+						$pall[] = $value;
1720
+					}
1721
+				}
1722
+				$alldata = $pall;
1723 1723
 			foreach ($alldata as $number) {
1724 1724
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1725 1725
 			}
1726 1726
 			echo '...Arrival'."\n";
1727 1727
 			$pall = $Spotter->getLast7DaysAirportsArrival();
1728
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1729
-        		/*
1728
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1729
+				/*
1730 1730
 	        	$alldata = array();
1731 1731
     			foreach ($pall as $value) {
1732 1732
 	        		$icao = $value['arrival_airport_icao'];
@@ -1746,22 +1746,22 @@  discard block
 block discarded – undo
1746 1746
     			*/
1747 1747
 
1748 1748
 
1749
-    			foreach ($dall as $value) {
1750
-    				$icao = $value['arrival_airport_icao'];
1751
-    				$ddate = $value['date'];
1752
-    				$find = false;
1753
-    				foreach ($pall as $pvalue) {
1754
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1755
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1756
-    						$find = true;
1757
-    						break;
1758
-    					}
1759
-    				}
1760
-    				if ($find === false) {
1761
-    					$pall[] = $value;
1762
-    				}
1763
-    			}
1764
-    			$alldata = $pall;
1749
+				foreach ($dall as $value) {
1750
+					$icao = $value['arrival_airport_icao'];
1751
+					$ddate = $value['date'];
1752
+					$find = false;
1753
+					foreach ($pall as $pvalue) {
1754
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1755
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1756
+							$find = true;
1757
+							break;
1758
+						}
1759
+					}
1760
+					if ($find === false) {
1761
+						$pall[] = $value;
1762
+					}
1763
+				}
1764
+				$alldata = $pall;
1765 1765
 			foreach ($alldata as $number) {
1766 1766
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1767 1767
 			}
@@ -1838,51 +1838,51 @@  discard block
 block discarded – undo
1838 1838
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1839 1839
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1840 1840
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1841
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1841
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1842 1842
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1843
-	        	//$alldata = array();
1844
-    			foreach ($dall as $value) {
1845
-    				$icao = $value['airport_departure_icao'];
1846
-    				$dicao = $value['airline_icao'];
1847
-    				$find = false;
1848
-    				foreach ($pall as $pvalue) {
1849
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1850
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1851
-    						$find = true;
1852
-    						break;
1853
-    					}
1854
-    				}
1855
-    				if ($find === false) {
1856
-    					$pall[] = $value;
1857
-    				}
1858
-    			}
1859
-    			$alldata = $pall;
1843
+				//$alldata = array();
1844
+				foreach ($dall as $value) {
1845
+					$icao = $value['airport_departure_icao'];
1846
+					$dicao = $value['airline_icao'];
1847
+					$find = false;
1848
+					foreach ($pall as $pvalue) {
1849
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1850
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1851
+							$find = true;
1852
+							break;
1853
+						}
1854
+					}
1855
+					if ($find === false) {
1856
+						$pall[] = $value;
1857
+					}
1858
+				}
1859
+				$alldata = $pall;
1860 1860
 			foreach ($alldata as $number) {
1861 1861
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
1862 1862
 			}
1863 1863
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1864 1864
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1865 1865
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1866
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1866
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1867 1867
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1868
-	        	//$alldata = array();
1869
-    			foreach ($dall as $value) {
1870
-    				$icao = $value['airport_arrival_icao'];
1871
-    				$dicao = $value['airline_icao'];
1872
-    				$find = false;
1873
-    				foreach ($pall as $pvalue) {
1874
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1875
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1876
-    						$find = true;
1877
-    						break;
1878
-    					}
1879
-    				}
1880
-    				if ($find === false) {
1881
-    					$pall[] = $value;
1882
-    				}
1883
-    			}
1884
-    			$alldata = $pall;
1885
-                        foreach ($alldata as $number) {
1868
+				//$alldata = array();
1869
+				foreach ($dall as $value) {
1870
+					$icao = $value['airport_arrival_icao'];
1871
+					$dicao = $value['airline_icao'];
1872
+					$find = false;
1873
+					foreach ($pall as $pvalue) {
1874
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1875
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1876
+							$find = true;
1877
+							break;
1878
+						}
1879
+					}
1880
+					if ($find === false) {
1881
+						$pall[] = $value;
1882
+					}
1883
+				}
1884
+				$alldata = $pall;
1885
+						foreach ($alldata as $number) {
1886 1886
 				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
1887 1887
 			}
1888 1888
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -1915,47 +1915,47 @@  discard block
 block discarded – undo
1915 1915
 			}
1916 1916
 			if ($globalDebug) echo '...Departure'."\n";
1917 1917
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1918
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1919
-    			foreach ($dall as $value) {
1920
-    				$icao = $value['departure_airport_icao'];
1921
-    				$airline = $value['airline_icao'];
1922
-    				$ddate = $value['date'];
1923
-    				$find = false;
1924
-    				foreach ($pall as $pvalue) {
1925
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1926
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1927
-    						$find = true;
1928
-    						break;
1929
-    					}
1930
-    				}
1931
-    				if ($find === false) {
1932
-    					$pall[] = $value;
1933
-    				}
1934
-    			}
1935
-    			$alldata = $pall;
1918
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1919
+				foreach ($dall as $value) {
1920
+					$icao = $value['departure_airport_icao'];
1921
+					$airline = $value['airline_icao'];
1922
+					$ddate = $value['date'];
1923
+					$find = false;
1924
+					foreach ($pall as $pvalue) {
1925
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1926
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1927
+							$find = true;
1928
+							break;
1929
+						}
1930
+					}
1931
+					if ($find === false) {
1932
+						$pall[] = $value;
1933
+					}
1934
+				}
1935
+				$alldata = $pall;
1936 1936
 			foreach ($alldata as $number) {
1937 1937
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
1938 1938
 			}
1939 1939
 			if ($globalDebug) echo '...Arrival'."\n";
1940 1940
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1941
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1942
-    			foreach ($dall as $value) {
1943
-    				$icao = $value['arrival_airport_icao'];
1944
-    				$airline = $value['airline_icao'];
1945
-    				$ddate = $value['date'];
1946
-    				$find = false;
1947
-    				foreach ($pall as $pvalue) {
1948
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1949
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1950
-    						$find = true;
1951
-    						break;
1952
-    					}
1953
-    				}
1954
-    				if ($find === false) {
1955
-    					$pall[] = $value;
1956
-    				}
1957
-    			}
1958
-    			$alldata = $pall;
1941
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1942
+				foreach ($dall as $value) {
1943
+					$icao = $value['arrival_airport_icao'];
1944
+					$airline = $value['airline_icao'];
1945
+					$ddate = $value['date'];
1946
+					$find = false;
1947
+					foreach ($pall as $pvalue) {
1948
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1949
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1950
+							$find = true;
1951
+							break;
1952
+						}
1953
+					}
1954
+					if ($find === false) {
1955
+						$pall[] = $value;
1956
+					}
1957
+				}
1958
+				$alldata = $pall;
1959 1959
 			foreach ($alldata as $number) {
1960 1960
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
1961 1961
 			}
@@ -2040,44 +2040,44 @@  discard block
 block discarded – undo
2040 2040
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2041 2041
 				}
2042 2042
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2043
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2044
-		        	$alldata = array();
2045
-	    			foreach ($pall as $value) {
2046
-		        		$icao = $value['airport_departure_icao'];
2047
-    					$alldata[$icao] = $value;
2048
-	    			}
2049
-		        	foreach ($dall as $value) {
2050
-	    				$icao = $value['airport_departure_icao'];
2051
-        				if (isset($alldata[$icao])) {
2052
-    						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2053
-        				} else $alldata[$icao] = $value;
2054
-				}
2055
-	    			$count = array();
2056
-    				foreach ($alldata as $key => $row) {
2057
-    					$count[$key] = $row['airport_departure_icao_count'];
2058
-    				}
2043
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2044
+					$alldata = array();
2045
+					foreach ($pall as $value) {
2046
+						$icao = $value['airport_departure_icao'];
2047
+						$alldata[$icao] = $value;
2048
+					}
2049
+					foreach ($dall as $value) {
2050
+						$icao = $value['airport_departure_icao'];
2051
+						if (isset($alldata[$icao])) {
2052
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2053
+						} else $alldata[$icao] = $value;
2054
+				}
2055
+					$count = array();
2056
+					foreach ($alldata as $key => $row) {
2057
+						$count[$key] = $row['airport_departure_icao_count'];
2058
+					}
2059 2059
 				array_multisort($count,SORT_DESC,$alldata);
2060 2060
 				foreach ($alldata as $number) {
2061
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2061
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2062 2062
 				}
2063 2063
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2064
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2064
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2065 2065
 				$alldata = array();
2066
-    				foreach ($pall as $value) {
2067
-		        		$icao = $value['airport_arrival_icao'];
2068
-    					$alldata[$icao] = $value;
2069
-	    			}
2070
-		        	foreach ($dall as $value) {
2071
-	    				$icao = $value['airport_arrival_icao'];
2072
-        				if (isset($alldata[$icao])) {
2073
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2074
-		        		} else $alldata[$icao] = $value;
2075
-	    			}
2076
-        			$count = array();
2077
-        			foreach ($alldata as $key => $row) {
2078
-    					$count[$key] = $row['airport_arrival_icao_count'];
2079
-		        	}
2080
-        			array_multisort($count,SORT_DESC,$alldata);
2066
+					foreach ($pall as $value) {
2067
+						$icao = $value['airport_arrival_icao'];
2068
+						$alldata[$icao] = $value;
2069
+					}
2070
+					foreach ($dall as $value) {
2071
+						$icao = $value['airport_arrival_icao'];
2072
+						if (isset($alldata[$icao])) {
2073
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2074
+						} else $alldata[$icao] = $value;
2075
+					}
2076
+					$count = array();
2077
+					foreach ($alldata as $key => $row) {
2078
+						$count[$key] = $row['airport_arrival_icao_count'];
2079
+					}
2080
+					array_multisort($count,SORT_DESC,$alldata);
2081 2081
 				foreach ($alldata as $number) {
2082 2082
 					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2083 2083
 				}
@@ -2110,45 +2110,45 @@  discard block
 block discarded – undo
2110 2110
 				}
2111 2111
 				echo '...Departure'."\n";
2112 2112
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2113
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2113
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2114 2114
 				foreach ($dall as $value) {
2115
-    					$icao = $value['departure_airport_icao'];
2116
-    					$ddate = $value['date'];
2117
-    					$find = false;
2118
-    					foreach ($pall as $pvalue) {
2119
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2120
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2121
-	    						$find = true;
2122
-    							break;
2123
-    						}
2124
-    					}
2125
-    					if ($find === false) {
2126
-    						$pall[] = $value;
2127
-	    				}
2128
-    				}
2129
-	    			$alldata = $pall;
2115
+						$icao = $value['departure_airport_icao'];
2116
+						$ddate = $value['date'];
2117
+						$find = false;
2118
+						foreach ($pall as $pvalue) {
2119
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2120
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2121
+								$find = true;
2122
+								break;
2123
+							}
2124
+						}
2125
+						if ($find === false) {
2126
+							$pall[] = $value;
2127
+						}
2128
+					}
2129
+					$alldata = $pall;
2130 2130
 				foreach ($alldata as $number) {
2131 2131
 					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
2132 2132
 				}
2133 2133
 				echo '...Arrival'."\n";
2134 2134
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2135
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2135
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2136 2136
 				foreach ($dall as $value) {
2137 2137
 					$icao = $value['arrival_airport_icao'];
2138 2138
 					$ddate = $value['date'];
2139
-    					$find = false;
2139
+						$find = false;
2140 2140
 					foreach ($pall as $pvalue) {
2141
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2142
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2143
-    							$find = true;
2144
-    							break;
2145
-	    					}
2146
-    					}
2147
-    					if ($find === false) {
2148
-    						$pall[] = $value;
2149
-	    				}
2150
-    				}
2151
-    				$alldata = $pall;
2141
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2142
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2143
+								$find = true;
2144
+								break;
2145
+							}
2146
+						}
2147
+						if ($find === false) {
2148
+							$pall[] = $value;
2149
+						}
2150
+					}
2151
+					$alldata = $pall;
2152 2152
 				foreach ($alldata as $number) {
2153 2153
 					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
2154 2154
 				}
Please login to merge, or discard this patch.
Braces   +482 added lines, -167 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	public function __construct($dbc = null) {
15 15
 		global $globalFilterName;
16
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16
+		if (isset($globalFilterName)) {
17
+			$this->filter_name = $globalFilterName;
18
+		}
17 19
 		$Connection = new Connection($dbc);
18 20
 		$this->db = $Connection->db();
19 21
         }
@@ -81,7 +83,9 @@  discard block
 block discarded – undo
81 83
                 }
82 84
         }
83 85
 	public function getAllAirlineNames($filter_name = '') {
84
-		if ($filter_name == '') $filter_name = $this->filter_name;
86
+		if ($filter_name == '') {
87
+			$filter_name = $this->filter_name;
88
+		}
85 89
                 $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86 90
                  try {
87 91
                         $sth = $this->db->prepare($query);
@@ -93,7 +97,9 @@  discard block
 block discarded – undo
93 97
                 return $all;
94 98
         }
95 99
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96
-		if ($filter_name == '') $filter_name = $this->filter_name;
100
+		if ($filter_name == '') {
101
+			$filter_name = $this->filter_name;
102
+		}
97 103
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 104
                  try {
99 105
                         $sth = $this->db->prepare($query);
@@ -105,7 +111,9 @@  discard block
 block discarded – undo
105 111
                 return $all;
106 112
         }
107 113
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108
-		if ($filter_name == '') $filter_name = $this->filter_name;
114
+		if ($filter_name == '') {
115
+			$filter_name = $this->filter_name;
116
+		}
109 117
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110 118
                  try {
111 119
                         $sth = $this->db->prepare($query);
@@ -117,7 +125,9 @@  discard block
 block discarded – undo
117 125
                 return $all;
118 126
         }
119 127
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120
-		if ($filter_name == '') $filter_name = $this->filter_name;
128
+		if ($filter_name == '') {
129
+			$filter_name = $this->filter_name;
130
+		}
121 131
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122 132
                  try {
123 133
                         $sth = $this->db->prepare($query);
@@ -130,7 +140,9 @@  discard block
 block discarded – undo
130 140
         }
131 141
 
132 142
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133
-		if ($filter_name == '') $filter_name = $this->filter_name;
143
+		if ($filter_name == '') {
144
+			$filter_name = $this->filter_name;
145
+		}
134 146
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 147
                  try {
136 148
                         $sth = $this->db->prepare($query);
@@ -143,7 +155,9 @@  discard block
 block discarded – undo
143 155
         }
144 156
 
145 157
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146
-		if ($filter_name == '') $filter_name = $this->filter_name;
158
+		if ($filter_name == '') {
159
+			$filter_name = $this->filter_name;
160
+		}
147 161
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 162
                  try {
149 163
                         $sth = $this->db->prepare($query);
@@ -158,10 +172,15 @@  discard block
 block discarded – undo
158 172
 
159 173
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
160 174
 		global $globalStatsFilters;
161
-		if ($filter_name == '') $filter_name = $this->filter_name;
175
+		if ($filter_name == '') {
176
+			$filter_name = $this->filter_name;
177
+		}
162 178
 		if ($year == '' && $month == '') {
163
-			if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
164
-			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
179
+			if ($limit) {
180
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
181
+			} else {
182
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183
+			}
165 184
 			try {
166 185
 				$sth = $this->db->prepare($query);
167 186
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -169,7 +188,9 @@  discard block
 block discarded – undo
169 188
 				echo "error : ".$e->getMessage();
170 189
 			}
171 190
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172
-		} else $all = array();
191
+		} else {
192
+			$all = array();
193
+		}
173 194
                 if (empty($all)) {
174 195
             	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175 196
             	    if ($filter_name != '') {
@@ -183,10 +204,15 @@  discard block
 block discarded – undo
183 204
 	}
184 205
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 206
 		global $globalStatsFilters;
186
-		if ($filter_name == '') $filter_name = $this->filter_name;
207
+		if ($filter_name == '') {
208
+			$filter_name = $this->filter_name;
209
+		}
187 210
 		if ($year == '' && $month == '') {
188
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
189
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
211
+			if ($limit) {
212
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
213
+			} else {
214
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
215
+			}
190 216
 			try {
191 217
 				$sth = $this->db->prepare($query);
192 218
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -194,7 +220,9 @@  discard block
 block discarded – undo
194 220
 				echo "error : ".$e->getMessage();
195 221
 			}
196 222
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197
-		} else $all = array();
223
+		} else {
224
+			$all = array();
225
+		}
198 226
                 if (empty($all)) {
199 227
             		$Spotter = new Spotter($this->db);
200 228
             		$filters = array();
@@ -209,10 +237,15 @@  discard block
 block discarded – undo
209 237
 	}
210 238
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 239
 		global $globalStatsFilters;
212
-		if ($filter_name == '') $filter_name = $this->filter_name;
240
+		if ($filter_name == '') {
241
+			$filter_name = $this->filter_name;
242
+		}
213 243
 		if ($year == '' && $month == '') {
214
-			if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
215
-			else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
244
+			if ($limit) {
245
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
246
+			} else {
247
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
248
+			}
216 249
 			try {
217 250
 				$sth = $this->db->prepare($query);
218 251
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -220,7 +253,9 @@  discard block
 block discarded – undo
220 253
 				echo "error : ".$e->getMessage();
221 254
 			}
222 255
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
223
-		} else $all = array();
256
+		} else {
257
+			$all = array();
258
+		}
224 259
 		if (empty($all)) {
225 260
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
226 261
 			if ($filter_name != '') {
@@ -235,10 +270,15 @@  discard block
 block discarded – undo
235 270
 
236 271
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
237 272
 		global $globalStatsFilters;
238
-		if ($filter_name == '') $filter_name = $this->filter_name;
273
+		if ($filter_name == '') {
274
+			$filter_name = $this->filter_name;
275
+		}
239 276
 		if ($year == '' && $month == '') {
240
-			if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
241
-			else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
277
+			if ($limit) {
278
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
279
+			} else {
280
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
281
+			}
242 282
 			try {
243 283
 				$sth = $this->db->prepare($query);
244 284
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -246,7 +286,9 @@  discard block
 block discarded – undo
246 286
 				echo "error : ".$e->getMessage();
247 287
 			}
248 288
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249
-		} else $all = array();
289
+		} else {
290
+			$all = array();
291
+		}
250 292
                 if (empty($all)) {
251 293
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 294
 			if ($filter_name != '') {
@@ -260,9 +302,14 @@  discard block
 block discarded – undo
260 302
 	}
261 303
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 304
 		global $globalStatsFilters;
263
-		if ($filter_name == '') $filter_name = $this->filter_name;
264
-		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
265
-		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
305
+		if ($filter_name == '') {
306
+			$filter_name = $this->filter_name;
307
+		}
308
+		if ($limit) {
309
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
310
+		} else {
311
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
312
+		}
266 313
                  try {
267 314
                         $sth = $this->db->prepare($query);
268 315
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -284,17 +331,29 @@  discard block
 block discarded – undo
284 331
 
285 332
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
286 333
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
287
-		if ($filter_name == '') $filter_name = $this->filter_name;
334
+		if ($filter_name == '') {
335
+			$filter_name = $this->filter_name;
336
+		}
288 337
 		if ($year == '' && $month == '') {
289
-			if ($globalVATSIM) $forsource = 'vatsim';
290
-			if ($globalIVAO) $forsource = 'ivao';
338
+			if ($globalVATSIM) {
339
+				$forsource = 'vatsim';
340
+			}
341
+			if ($globalIVAO) {
342
+				$forsource = 'ivao';
343
+			}
291 344
 			if (isset($forsource)) {
292
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
293
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
345
+				if ($limit) {
346
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
347
+				} else {
348
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
349
+				}
294 350
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
295 351
 			} else {
296
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
297
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
352
+				if ($limit) {
353
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
354
+				} else {
355
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
356
+				}
298 357
 				$query_values = array(':filter_name' => $filter_name);
299 358
 			}
300 359
 			try {
@@ -304,7 +363,9 @@  discard block
 block discarded – undo
304 363
 				echo "error : ".$e->getMessage();
305 364
 			}
306 365
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307
-		} else $all = array();
366
+		} else {
367
+			$all = array();
368
+		}
308 369
                 if (empty($all)) {
309 370
 	                $Spotter = new Spotter($this->db);
310 371
             		$filters = array();
@@ -319,10 +380,15 @@  discard block
 block discarded – undo
319 380
 	}
320 381
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 382
 		global $globalStatsFilters;
322
-		if ($filter_name == '') $filter_name = $this->filter_name;
383
+		if ($filter_name == '') {
384
+			$filter_name = $this->filter_name;
385
+		}
323 386
 		if ($year == '' && $month == '') {
324
-			if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
325
-			else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
387
+			if ($limit) {
388
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
389
+			} else {
390
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
391
+			}
326 392
 			try {
327 393
 				$sth = $this->db->prepare($query);
328 394
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -330,7 +396,9 @@  discard block
 block discarded – undo
330 396
 				echo "error : ".$e->getMessage();
331 397
 			}
332 398
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333
-		} else $all = array();
399
+		} else {
400
+			$all = array();
401
+		}
334 402
                 if (empty($all)) {
335 403
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 404
 			if ($filter_name != '') {
@@ -344,10 +412,15 @@  discard block
 block discarded – undo
344 412
 	}
345 413
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 414
 		global $globalStatsFilters;
347
-		if ($filter_name == '') $filter_name = $this->filter_name;
415
+		if ($filter_name == '') {
416
+			$filter_name = $this->filter_name;
417
+		}
348 418
 		if ($year == '' && $month == '') {
349
-			if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
350
-			else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
419
+			if ($limit) {
420
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
421
+			} else {
422
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
423
+			}
351 424
 			 try {
352 425
 				$sth = $this->db->prepare($query);
353 426
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -355,7 +428,9 @@  discard block
 block discarded – undo
355 428
 				echo "error : ".$e->getMessage();
356 429
 			}
357 430
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
358
-		} else $all = array();
431
+		} else {
432
+			$all = array();
433
+		}
359 434
 		if (empty($all)) {
360 435
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
361 436
 			if ($filter_name != '') {
@@ -369,11 +444,16 @@  discard block
 block discarded – undo
369 444
 	}
370 445
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
371 446
 		$Connection = new Connection();
372
-		if ($filter_name == '') $filter_name = $this->filter_name;
447
+		if ($filter_name == '') {
448
+			$filter_name = $this->filter_name;
449
+		}
373 450
 		if ($Connection->tableExists('countries')) {
374 451
 			if ($year == '' && $month == '') {
375
-				if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
376
-				else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
452
+				if ($limit) {
453
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
454
+				} else {
455
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
456
+				}
377 457
 				 try {
378 458
 					$sth = $this->db->prepare($query);
379 459
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -388,17 +468,24 @@  discard block
 block discarded – undo
388 468
                 }
389 469
                 */
390 470
 				return $all;
391
-			} else return array();
471
+			} else {
472
+				return array();
473
+			}
392 474
 		} else {
393 475
 			return array();
394 476
 		}
395 477
 	}
396 478
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
397 479
 		global $globalStatsFilters;
398
-		if ($filter_name == '') $filter_name = $this->filter_name;
480
+		if ($filter_name == '') {
481
+			$filter_name = $this->filter_name;
482
+		}
399 483
 		if ($year == '' && $month == '') {
400
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
401
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
484
+			if ($limit) {
485
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
486
+			} else {
487
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
488
+			}
402 489
 			try {
403 490
 				$sth = $this->db->prepare($query);
404 491
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -406,7 +493,9 @@  discard block
 block discarded – undo
406 493
 				echo "error : ".$e->getMessage();
407 494
 			}
408 495
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409
-		} else $all = array();
496
+		} else {
497
+			$all = array();
498
+		}
410 499
 		if (empty($all)) {
411 500
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
412 501
 			if ($filter_name != '') {
@@ -421,10 +510,15 @@  discard block
 block discarded – undo
421 510
 
422 511
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
423 512
 		global $globalStatsFilters;
424
-		if ($filter_name == '') $filter_name = $this->filter_name;
513
+		if ($filter_name == '') {
514
+			$filter_name = $this->filter_name;
515
+		}
425 516
 		if ($year == '' && $month == '') {
426
-			if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
427
-			else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
517
+			if ($limit) {
518
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
519
+			} else {
520
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
521
+			}
428 522
 			try {
429 523
 				$sth = $this->db->prepare($query);
430 524
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -432,7 +526,9 @@  discard block
 block discarded – undo
432 526
 				echo "error : ".$e->getMessage();
433 527
 			}
434 528
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435
-		} else $all = array();
529
+		} else {
530
+			$all = array();
531
+		}
436 532
                 if (empty($all)) {
437 533
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 534
 			if ($filter_name != '') {
@@ -446,10 +542,15 @@  discard block
 block discarded – undo
446 542
 	}
447 543
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 544
 		global $globalStatsFilters;
449
-		if ($filter_name == '') $filter_name = $this->filter_name;
545
+		if ($filter_name == '') {
546
+			$filter_name = $this->filter_name;
547
+		}
450 548
 		if ($year == '' && $month == '') {
451
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
452
-			else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
549
+			if ($limit) {
550
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
551
+			} else {
552
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
553
+			}
453 554
 			try {
454 555
 				$sth = $this->db->prepare($query);
455 556
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -457,7 +558,9 @@  discard block
 block discarded – undo
457 558
 				echo "error : ".$e->getMessage();
458 559
 			}
459 560
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460
-		} else $all = array();
561
+		} else {
562
+			$all = array();
563
+		}
461 564
                 if (empty($all)) {
462 565
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463 566
             		if ($filter_name != '') {
@@ -478,7 +581,9 @@  discard block
 block discarded – undo
478 581
         			$icao = $value['airport_departure_icao'];
479 582
         			if (isset($all[$icao])) {
480 583
         				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
-        			} else $all[$icao] = $value;
584
+        			} else {
585
+        				$all[$icao] = $value;
586
+        			}
482 587
         		}
483 588
         		$count = array();
484 589
         		foreach ($all as $key => $row) {
@@ -490,10 +595,15 @@  discard block
 block discarded – undo
490 595
 	}
491 596
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 597
 		global $globalStatsFilters;
493
-		if ($filter_name == '') $filter_name = $this->filter_name;
598
+		if ($filter_name == '') {
599
+			$filter_name = $this->filter_name;
600
+		}
494 601
 		if ($year == '' && $month == '') {
495
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
496
-			else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
602
+			if ($limit) {
603
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
604
+			} else {
605
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
606
+			}
497 607
 			try {
498 608
 				$sth = $this->db->prepare($query);
499 609
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -501,7 +611,9 @@  discard block
 block discarded – undo
501 611
 				echo "error : ".$e->getMessage();
502 612
 			}
503 613
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
504
-		} else $all = array();
614
+		} else {
615
+			$all = array();
616
+		}
505 617
 		if (empty($all)) {
506 618
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507 619
 			if ($filter_name != '') {
@@ -522,7 +634,9 @@  discard block
 block discarded – undo
522 634
         			$icao = $value['airport_arrival_icao'];
523 635
         			if (isset($all[$icao])) {
524 636
         				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
-        			} else $all[$icao] = $value;
637
+        			} else {
638
+        				$all[$icao] = $value;
639
+        			}
526 640
         		}
527 641
         		$count = array();
528 642
         		foreach ($all as $key => $row) {
@@ -535,13 +649,21 @@  discard block
 block discarded – undo
535 649
 	}
536 650
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 651
 		global $globalDBdriver, $globalStatsFilters;
538
-		if ($filter_name == '') $filter_name = $this->filter_name;
652
+		if ($filter_name == '') {
653
+			$filter_name = $this->filter_name;
654
+		}
539 655
 		if ($globalDBdriver == 'mysql') {
540
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
541
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
656
+			if ($limit) {
657
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
658
+			} else {
659
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
660
+			}
542 661
 		} else {
543
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
544
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
662
+			if ($limit) {
663
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
664
+			} else {
665
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
666
+			}
545 667
 		}
546 668
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547 669
                  try {
@@ -565,7 +687,9 @@  discard block
 block discarded – undo
565 687
 	
566 688
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
567 689
 		global $globalStatsFilters;
568
-		if ($filter_name == '') $filter_name = $this->filter_name;
690
+		if ($filter_name == '') {
691
+			$filter_name = $this->filter_name;
692
+		}
569 693
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
570 694
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571 695
                  try {
@@ -587,7 +711,9 @@  discard block
 block discarded – undo
587 711
 	}
588 712
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 713
 		global $globalDBdriver, $globalStatsFilters;
590
-		if ($filter_name == '') $filter_name = $this->filter_name;
714
+		if ($filter_name == '') {
715
+			$filter_name = $this->filter_name;
716
+		}
591 717
 		if ($globalDBdriver == 'mysql') {
592 718
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
593 719
 		} else {
@@ -613,7 +739,9 @@  discard block
 block discarded – undo
613 739
 	}
614 740
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 741
 		global $globalStatsFilters;
616
-		if ($filter_name == '') $filter_name = $this->filter_name;
742
+		if ($filter_name == '') {
743
+			$filter_name = $this->filter_name;
744
+		}
617 745
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
618 746
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619 747
                  try {
@@ -635,7 +763,9 @@  discard block
 block discarded – undo
635 763
 	}
636 764
 	public function countAllDatesByAirlines($filter_name = '') {
637 765
 		global $globalStatsFilters;
638
-		if ($filter_name == '') $filter_name = $this->filter_name;
766
+		if ($filter_name == '') {
767
+			$filter_name = $this->filter_name;
768
+		}
639 769
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 770
 		$query_data = array('filter_name' => $filter_name);
641 771
                  try {
@@ -657,7 +787,9 @@  discard block
 block discarded – undo
657 787
 	}
658 788
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 789
 		global $globalStatsFilters, $globalDBdriver;
660
-		if ($filter_name == '') $filter_name = $this->filter_name;
790
+		if ($filter_name == '') {
791
+			$filter_name = $this->filter_name;
792
+		}
661 793
 		if ($globalDBdriver == 'mysql') {
662 794
 			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
663 795
 		} else {
@@ -726,7 +858,9 @@  discard block
 block discarded – undo
726 858
 	}
727 859
 	public function countAllMilitaryMonths($filter_name = '') {
728 860
 		global $globalStatsFilters;
729
-		if ($filter_name == '') $filter_name = $this->filter_name;
861
+		if ($filter_name == '') {
862
+			$filter_name = $this->filter_name;
863
+		}
730 864
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731 865
                  try {
732 866
                         $sth = $this->db->prepare($query);
@@ -747,9 +881,14 @@  discard block
 block discarded – undo
747 881
 	}
748 882
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 883
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
750
-		if ($filter_name == '') $filter_name = $this->filter_name;
751
-		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
752
-		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
884
+		if ($filter_name == '') {
885
+			$filter_name = $this->filter_name;
886
+		}
887
+		if ($limit) {
888
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
889
+		} else {
890
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
891
+		}
753 892
 		if ($orderby == 'hour') {
754 893
 			if ($globalDBdriver == 'mysql') {
755 894
 				//$query .= " ORDER BY flight_date ASC";
@@ -758,7 +897,9 @@  discard block
 block discarded – undo
758 897
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
759 898
 			}
760 899
 		}
761
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
900
+		if ($orderby == 'count') {
901
+			$query .= " ORDER BY hour_count DESC";
902
+		}
762 903
                  try {
763 904
                         $sth = $this->db->prepare($query);
764 905
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
@@ -779,8 +920,12 @@  discard block
 block discarded – undo
779 920
 	
780 921
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
781 922
 		global $globalStatsFilters;
782
-		if ($filter_name == '') $filter_name = $this->filter_name;
783
-		if ($year == '') $year = date('Y');
923
+		if ($filter_name == '') {
924
+			$filter_name = $this->filter_name;
925
+		}
926
+		if ($year == '') {
927
+			$year = date('Y');
928
+		}
784 929
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
785 930
 		if (empty($all)) {
786 931
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -795,8 +940,12 @@  discard block
 block discarded – undo
795 940
 	}
796 941
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
797 942
 		global $globalStatsFilters;
798
-		if ($filter_name == '') $filter_name = $this->filter_name;
799
-		if ($year == '') $year = date('Y');
943
+		if ($filter_name == '') {
944
+			$filter_name = $this->filter_name;
945
+		}
946
+		if ($year == '') {
947
+			$year = date('Y');
948
+		}
800 949
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 950
 		if (empty($all)) {
802 951
 		        $filters = array();
@@ -812,8 +961,12 @@  discard block
 block discarded – undo
812 961
 	}
813 962
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
814 963
 		global $globalStatsFilters;
815
-		if ($filter_name == '') $filter_name = $this->filter_name;
816
-		if ($year == '') $year = date('Y');
964
+		if ($filter_name == '') {
965
+			$filter_name = $this->filter_name;
966
+		}
967
+		if ($year == '') {
968
+			$year = date('Y');
969
+		}
817 970
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
818 971
 		if (empty($all)) {
819 972
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -828,7 +981,9 @@  discard block
 block discarded – undo
828 981
 	}
829 982
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
830 983
 		global $globalStatsFilters;
831
-		if ($filter_name == '') $filter_name = $this->filter_name;
984
+		if ($filter_name == '') {
985
+			$filter_name = $this->filter_name;
986
+		}
832 987
 		if ($year == '' && $month == '') {
833 988
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
834 989
 			try {
@@ -839,7 +994,9 @@  discard block
 block discarded – undo
839 994
 			}
840 995
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
841 996
 			$all = $result[0]['nb'];
842
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
997
+		} else {
998
+			$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
999
+		}
843 1000
 		if (empty($all)) {
844 1001
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
845 1002
 			if ($filter_name != '') {
@@ -853,7 +1010,9 @@  discard block
 block discarded – undo
853 1010
 	}
854 1011
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
855 1012
 		global $globalStatsFilters;
856
-		if ($filter_name == '') $filter_name = $this->filter_name;
1013
+		if ($filter_name == '') {
1014
+			$filter_name = $this->filter_name;
1015
+		}
857 1016
 		if ($year == '' && $month == '') {
858 1017
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
859 1018
 			try {
@@ -864,7 +1023,9 @@  discard block
 block discarded – undo
864 1023
 			}
865 1024
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
866 1025
 			$all = $result[0]['nb_airline'];
867
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1026
+		} else {
1027
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1028
+		}
868 1029
 		if (empty($all)) {
869 1030
             		$filters = array();
870 1031
 			$filters = array('year' => $year,'month' => $month);
@@ -879,7 +1040,9 @@  discard block
 block discarded – undo
879 1040
 	}
880 1041
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
881 1042
 		global $globalStatsFilters;
882
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043
+		if ($filter_name == '') {
1044
+			$filter_name = $this->filter_name;
1045
+		}
883 1046
 		if ($year == '' && $month == '') {
884 1047
 			$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
885 1048
 			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
@@ -907,7 +1070,9 @@  discard block
 block discarded – undo
907 1070
 	}
908 1071
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
909 1072
 		global $globalStatsFilters;
910
-		if ($filter_name == '') $filter_name = $this->filter_name;
1073
+		if ($filter_name == '') {
1074
+			$filter_name = $this->filter_name;
1075
+		}
911 1076
 		//if ($year == '') $year = date('Y');
912 1077
 		if ($year == '' && $month == '') {
913 1078
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -936,7 +1101,9 @@  discard block
 block discarded – undo
936 1101
 	}
937 1102
 
938 1103
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
939
-		if ($filter_name == '') $filter_name = $this->filter_name;
1104
+		if ($filter_name == '') {
1105
+			$filter_name = $this->filter_name;
1106
+		}
940 1107
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
941 1108
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942 1109
                  try {
@@ -949,7 +1116,9 @@  discard block
 block discarded – undo
949 1116
                 return $all;
950 1117
 	}
951 1118
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952
-		if ($filter_name == '') $filter_name = $this->filter_name;
1119
+		if ($filter_name == '') {
1120
+			$filter_name = $this->filter_name;
1121
+		}
953 1122
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954 1123
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955 1124
                  try {
@@ -962,7 +1131,9 @@  discard block
 block discarded – undo
962 1131
                 return $all;
963 1132
         }
964 1133
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965
-		if ($filter_name == '') $filter_name = $this->filter_name;
1134
+		if ($filter_name == '') {
1135
+			$filter_name = $this->filter_name;
1136
+		}
966 1137
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967 1138
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968 1139
                  try {
@@ -973,7 +1144,9 @@  discard block
 block discarded – undo
973 1144
                 }
974 1145
         }
975 1146
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
976
-		if ($filter_name == '') $filter_name = $this->filter_name;
1147
+		if ($filter_name == '') {
1148
+			$filter_name = $this->filter_name;
1149
+		}
977 1150
     		global $globalArchiveMonths, $globalDBdriver;
978 1151
     		if ($globalDBdriver == 'mysql') {
979 1152
     			if ($month == '') {
@@ -1003,7 +1176,9 @@  discard block
 block discarded – undo
1003 1176
         }
1004 1177
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1005 1178
     		global $globalArchiveMonths, $globalDBdriver;
1006
-		if ($filter_name == '') $filter_name = $this->filter_name;
1179
+		if ($filter_name == '') {
1180
+			$filter_name = $this->filter_name;
1181
+		}
1007 1182
     		if ($globalDBdriver == 'mysql') {
1008 1183
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1009 1184
 		} else {
@@ -1021,7 +1196,9 @@  discard block
 block discarded – undo
1021 1196
         }
1022 1197
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1023 1198
     		global $globalArchiveMonths, $globalDBdriver;
1024
-		if ($filter_name == '') $filter_name = $this->filter_name;
1199
+		if ($filter_name == '') {
1200
+			$filter_name = $this->filter_name;
1201
+		}
1025 1202
     		if ($globalDBdriver == 'mysql') {
1026 1203
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1027 1204
                 } else {
@@ -1038,7 +1215,9 @@  discard block
 block discarded – undo
1038 1215
         }
1039 1216
 	public function getStatsAirlineTotal($filter_name = '') {
1040 1217
     		global $globalArchiveMonths, $globalDBdriver;
1041
-		if ($filter_name == '') $filter_name = $this->filter_name;
1218
+		if ($filter_name == '') {
1219
+			$filter_name = $this->filter_name;
1220
+		}
1042 1221
     		if ($globalDBdriver == 'mysql') {
1043 1222
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1044 1223
                 } else {
@@ -1055,7 +1234,9 @@  discard block
 block discarded – undo
1055 1234
         }
1056 1235
 	public function getStatsOwnerTotal($filter_name = '') {
1057 1236
     		global $globalArchiveMonths, $globalDBdriver;
1058
-		if ($filter_name == '') $filter_name = $this->filter_name;
1237
+		if ($filter_name == '') {
1238
+			$filter_name = $this->filter_name;
1239
+		}
1059 1240
     		if ($globalDBdriver == 'mysql') {
1060 1241
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1061 1242
 		} else {
@@ -1072,7 +1253,9 @@  discard block
 block discarded – undo
1072 1253
         }
1073 1254
 	public function getStatsOwner($owner_name,$filter_name = '') {
1074 1255
     		global $globalArchiveMonths, $globalDBdriver;
1075
-		if ($filter_name == '') $filter_name = $this->filter_name;
1256
+		if ($filter_name == '') {
1257
+			$filter_name = $this->filter_name;
1258
+		}
1076 1259
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077 1260
                  try {
1078 1261
                         $sth = $this->db->prepare($query);
@@ -1081,12 +1264,17 @@  discard block
 block discarded – undo
1081 1264
                         echo "error : ".$e->getMessage();
1082 1265
                 }
1083 1266
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085
-                else return 0;
1267
+                if (isset($all[0]['cnt'])) {
1268
+                	return $all[0]['cnt'];
1269
+                } else {
1270
+                	return 0;
1271
+                }
1086 1272
         }
1087 1273
 	public function getStatsPilotTotal($filter_name = '') {
1088 1274
     		global $globalArchiveMonths, $globalDBdriver;
1089
-		if ($filter_name == '') $filter_name = $this->filter_name;
1275
+		if ($filter_name == '') {
1276
+			$filter_name = $this->filter_name;
1277
+		}
1090 1278
     		if ($globalDBdriver == 'mysql') {
1091 1279
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092 1280
             	} else {
@@ -1103,7 +1291,9 @@  discard block
 block discarded – undo
1103 1291
         }
1104 1292
 	public function getStatsPilot($pilot,$filter_name = '') {
1105 1293
     		global $globalArchiveMonths, $globalDBdriver;
1106
-		if ($filter_name == '') $filter_name = $this->filter_name;
1294
+		if ($filter_name == '') {
1295
+			$filter_name = $this->filter_name;
1296
+		}
1107 1297
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108 1298
                  try {
1109 1299
                         $sth = $this->db->prepare($query);
@@ -1112,13 +1302,18 @@  discard block
 block discarded – undo
1112 1302
                         echo "error : ".$e->getMessage();
1113 1303
                 }
1114 1304
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116
-                else return 0;
1305
+                if (isset($all[0]['cnt'])) {
1306
+                	return $all[0]['cnt'];
1307
+                } else {
1308
+                	return 0;
1309
+                }
1117 1310
         }
1118 1311
 
1119 1312
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1120 1313
 		global $globalDBdriver;
1121
-		if ($filter_name == '') $filter_name = $this->filter_name;
1314
+		if ($filter_name == '') {
1315
+			$filter_name = $this->filter_name;
1316
+		}
1122 1317
 		if ($globalDBdriver == 'mysql') {
1123 1318
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1124 1319
                 } else {
@@ -1134,7 +1329,9 @@  discard block
 block discarded – undo
1134 1329
         }
1135 1330
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1136 1331
 		global $globalDBdriver;
1137
-		if ($filter_name == '') $filter_name = $this->filter_name;
1332
+		if ($filter_name == '') {
1333
+			$filter_name = $this->filter_name;
1334
+		}
1138 1335
 		if ($globalDBdriver == 'mysql') {
1139 1336
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1140 1337
 		} else {
@@ -1520,10 +1717,14 @@  discard block
 block discarded – undo
1520 1717
     		$Connection = new Connection();
1521 1718
     		date_default_timezone_set('UTC');
1522 1719
     		$last_update = $this->getLastStatsUpdate('last_update_stats');
1523
-			if ($globalDebug) echo 'Update stats !'."\n";
1720
+			if ($globalDebug) {
1721
+				echo 'Update stats !'."\n";
1722
+			}
1524 1723
 			if (isset($last_update[0]['value'])) {
1525 1724
 				$last_update_day = $last_update[0]['value'];
1526
-			} else $last_update_day = '2012-12-12 12:12:12';
1725
+			} else {
1726
+				$last_update_day = '2012-12-12 12:12:12';
1727
+			}
1527 1728
 			$reset = false;
1528 1729
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1529 1730
 			if ($globalStatsResetYear) {
@@ -1532,42 +1733,60 @@  discard block
 block discarded – undo
1532 1733
 			}
1533 1734
 			$Spotter = new Spotter($this->db);
1534 1735
 
1535
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1736
+			if ($globalDebug) {
1737
+				echo 'Count all aircraft types...'."\n";
1738
+			}
1536 1739
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1537 1740
 			foreach ($alldata as $number) {
1538 1741
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
1539 1742
 			}
1540
-			if ($globalDebug) echo 'Count all airlines...'."\n";
1743
+			if ($globalDebug) {
1744
+				echo 'Count all airlines...'."\n";
1745
+			}
1541 1746
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1542 1747
 			foreach ($alldata as $number) {
1543 1748
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
1544 1749
 			}
1545
-			if ($globalDebug) echo 'Count all registrations...'."\n";
1750
+			if ($globalDebug) {
1751
+				echo 'Count all registrations...'."\n";
1752
+			}
1546 1753
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1547 1754
 			foreach ($alldata as $number) {
1548 1755
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
1549 1756
 			}
1550
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
1757
+			if ($globalDebug) {
1758
+				echo 'Count all callsigns...'."\n";
1759
+			}
1551 1760
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1552 1761
 			foreach ($alldata as $number) {
1553 1762
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1554 1763
 			}
1555
-			if ($globalDebug) echo 'Count all owners...'."\n";
1764
+			if ($globalDebug) {
1765
+				echo 'Count all owners...'."\n";
1766
+			}
1556 1767
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1557 1768
 			foreach ($alldata as $number) {
1558 1769
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
1559 1770
 			}
1560
-			if ($globalDebug) echo 'Count all pilots...'."\n";
1771
+			if ($globalDebug) {
1772
+				echo 'Count all pilots...'."\n";
1773
+			}
1561 1774
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1562 1775
 			foreach ($alldata as $number) {
1563 1776
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
1564 1777
 			}
1565 1778
 			
1566
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
1779
+			if ($globalDebug) {
1780
+				echo 'Count all departure airports...'."\n";
1781
+			}
1567 1782
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1568
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1783
+			if ($globalDebug) {
1784
+				echo 'Count all detected departure airports...'."\n";
1785
+			}
1569 1786
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570
-			if ($globalDebug) echo 'Order departure airports...'."\n";
1787
+			if ($globalDebug) {
1788
+				echo 'Order departure airports...'."\n";
1789
+			}
1571 1790
 	        	$alldata = array();
1572 1791
 	        	
1573 1792
     			foreach ($pall as $value) {
@@ -1578,7 +1797,9 @@  discard block
 block discarded – undo
1578 1797
     				$icao = $value['airport_departure_icao'];
1579 1798
         			if (isset($alldata[$icao])) {
1580 1799
     					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581
-        			} else $alldata[$icao] = $value;
1800
+        			} else {
1801
+        				$alldata[$icao] = $value;
1802
+        			}
1582 1803
 			}
1583 1804
     			$count = array();
1584 1805
     			foreach ($alldata as $key => $row) {
@@ -1588,11 +1809,17 @@  discard block
 block discarded – undo
1588 1809
 			foreach ($alldata as $number) {
1589 1810
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
1590 1811
 			}
1591
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1812
+			if ($globalDebug) {
1813
+				echo 'Count all arrival airports...'."\n";
1814
+			}
1592 1815
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1593
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1816
+			if ($globalDebug) {
1817
+				echo 'Count all detected arrival airports...'."\n";
1818
+			}
1594 1819
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
1820
+			if ($globalDebug) {
1821
+				echo 'Order arrival airports...'."\n";
1822
+			}
1596 1823
 	        	$alldata = array();
1597 1824
     			foreach ($pall as $value) {
1598 1825
 	        		$icao = $value['airport_arrival_icao'];
@@ -1602,7 +1829,9 @@  discard block
 block discarded – undo
1602 1829
     				$icao = $value['airport_arrival_icao'];
1603 1830
         			if (isset($alldata[$icao])) {
1604 1831
         				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605
-	        		} else $alldata[$icao] = $value;
1832
+	        		} else {
1833
+	        			$alldata[$icao] = $value;
1834
+	        		}
1606 1835
     			}
1607 1836
         		$count = array();
1608 1837
         		foreach ($alldata as $key => $row) {
@@ -1613,7 +1842,9 @@  discard block
 block discarded – undo
1613 1842
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1614 1843
 			}
1615 1844
 			if ($Connection->tableExists('countries')) {
1616
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1845
+				if ($globalDebug) {
1846
+					echo 'Count all flights by countries...'."\n";
1847
+				}
1617 1848
 				//$SpotterArchive = new SpotterArchive();
1618 1849
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1619 1850
 				$Spotter = new Spotter($this->db);
@@ -1623,7 +1854,9 @@  discard block
 block discarded – undo
1623 1854
 				}
1624 1855
 			}
1625 1856
 			
1626
-			if ($globalDebug) echo 'Count fatalities stats...'."\n";
1857
+			if ($globalDebug) {
1858
+				echo 'Count fatalities stats...'."\n";
1859
+			}
1627 1860
 			$Accident = new Accident();
1628 1861
 			$this->deleteStatsByType('fatalities_byyear');
1629 1862
 			$alldata = $Accident->countFatalitiesByYear();
@@ -1640,46 +1873,66 @@  discard block
 block discarded – undo
1640 1873
 			// Add by month using getstat if month finish...
1641 1874
 
1642 1875
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
1643
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
1876
+			if ($globalDebug) {
1877
+				echo 'Count all flights by months...'."\n";
1878
+			}
1644 1879
 			$Spotter = new Spotter($this->db);
1645 1880
 			$alldata = $Spotter->countAllMonths();
1646 1881
 			$lastyear = false;
1647 1882
 			foreach ($alldata as $number) {
1648
-				if ($number['year_name'] != date('Y')) $lastyear = true;
1883
+				if ($number['year_name'] != date('Y')) {
1884
+					$lastyear = true;
1885
+				}
1649 1886
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1650 1887
 			}
1651
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1888
+			if ($globalDebug) {
1889
+				echo 'Count all military flights by months...'."\n";
1890
+			}
1652 1891
 			$alldata = $Spotter->countAllMilitaryMonths();
1653 1892
 			foreach ($alldata as $number) {
1654 1893
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1655 1894
 			}
1656
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
1895
+			if ($globalDebug) {
1896
+				echo 'Count all owners by months...'."\n";
1897
+			}
1657 1898
 			$alldata = $Spotter->countAllMonthsOwners();
1658 1899
 			foreach ($alldata as $number) {
1659 1900
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1660 1901
 			}
1661
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1902
+			if ($globalDebug) {
1903
+				echo 'Count all pilots by months...'."\n";
1904
+			}
1662 1905
 			$alldata = $Spotter->countAllMonthsPilots();
1663 1906
 			foreach ($alldata as $number) {
1664 1907
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1665 1908
 			}
1666
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1909
+			if ($globalDebug) {
1910
+				echo 'Count all airlines by months...'."\n";
1911
+			}
1667 1912
 			$alldata = $Spotter->countAllMonthsAirlines();
1668 1913
 			foreach ($alldata as $number) {
1669 1914
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1670 1915
 			}
1671
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1916
+			if ($globalDebug) {
1917
+				echo 'Count all aircrafts by months...'."\n";
1918
+			}
1672 1919
 			$alldata = $Spotter->countAllMonthsAircrafts();
1673 1920
 			foreach ($alldata as $number) {
1674 1921
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1675 1922
 			}
1676
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1923
+			if ($globalDebug) {
1924
+				echo 'Count all real arrivals by months...'."\n";
1925
+			}
1677 1926
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1678 1927
 			foreach ($alldata as $number) {
1679 1928
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1680 1929
 			}
1681
-			if ($globalDebug) echo 'Airports data...'."\n";
1682
-			if ($globalDebug) echo '...Departure'."\n";
1930
+			if ($globalDebug) {
1931
+				echo 'Airports data...'."\n";
1932
+			}
1933
+			if ($globalDebug) {
1934
+				echo '...Departure'."\n";
1935
+			}
1683 1936
 			$this->deleteStatAirport('daily');
1684 1937
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 1938
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -1800,7 +2053,9 @@  discard block
 block discarded – undo
1800 2053
 			// Count by airlines
1801 2054
 			echo '--- Stats by airlines ---'."\n";
1802 2055
 			if ($Connection->tableExists('countries')) {
1803
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2056
+				if ($globalDebug) {
2057
+					echo 'Count all flights by countries by airlines...'."\n";
2058
+				}
1804 2059
 				//$SpotterArchive = new SpotterArchive();
1805 2060
 				$Spotter = new Spotter($this->db);
1806 2061
 				//$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -1809,37 +2064,53 @@  discard block
 block discarded – undo
1809 2064
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
1810 2065
 				}
1811 2066
 			}
1812
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2067
+			if ($globalDebug) {
2068
+				echo 'Count all aircraft types by airlines...'."\n";
2069
+			}
1813 2070
 			$Spotter = new Spotter($this->db);
1814 2071
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1815 2072
 			foreach ($alldata as $number) {
1816 2073
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
1817 2074
 			}
1818
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2075
+			if ($globalDebug) {
2076
+				echo 'Count all aircraft registrations by airlines...'."\n";
2077
+			}
1819 2078
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1820 2079
 			foreach ($alldata as $number) {
1821 2080
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
1822 2081
 			}
1823
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2082
+			if ($globalDebug) {
2083
+				echo 'Count all callsigns by airlines...'."\n";
2084
+			}
1824 2085
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1825 2086
 			foreach ($alldata as $number) {
1826 2087
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1827 2088
 			}
1828
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2089
+			if ($globalDebug) {
2090
+				echo 'Count all owners by airlines...'."\n";
2091
+			}
1829 2092
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1830 2093
 			foreach ($alldata as $number) {
1831 2094
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
1832 2095
 			}
1833
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2096
+			if ($globalDebug) {
2097
+				echo 'Count all pilots by airlines...'."\n";
2098
+			}
1834 2099
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1835 2100
 			foreach ($alldata as $number) {
1836 2101
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
1837 2102
 			}
1838
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2103
+			if ($globalDebug) {
2104
+				echo 'Count all departure airports by airlines...'."\n";
2105
+			}
1839 2106
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1840
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2107
+			if ($globalDebug) {
2108
+				echo 'Count all detected departure airports by airlines...'."\n";
2109
+			}
1841 2110
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1842
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2111
+			if ($globalDebug) {
2112
+				echo 'Order detected departure airports by airlines...'."\n";
2113
+			}
1843 2114
 	        	//$alldata = array();
1844 2115
     			foreach ($dall as $value) {
1845 2116
     				$icao = $value['airport_departure_icao'];
@@ -1860,11 +2131,17 @@  discard block
 block discarded – undo
1860 2131
 			foreach ($alldata as $number) {
1861 2132
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
1862 2133
 			}
1863
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2134
+			if ($globalDebug) {
2135
+				echo 'Count all arrival airports by airlines...'."\n";
2136
+			}
1864 2137
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1865
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2138
+			if ($globalDebug) {
2139
+				echo 'Count all detected arrival airports by airlines...'."\n";
2140
+			}
1866 2141
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1867
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2142
+			if ($globalDebug) {
2143
+				echo 'Order arrival airports by airlines...'."\n";
2144
+			}
1868 2145
 	        	//$alldata = array();
1869 2146
     			foreach ($dall as $value) {
1870 2147
     				$icao = $value['airport_arrival_icao'];
@@ -1883,37 +2160,53 @@  discard block
 block discarded – undo
1883 2160
     			}
1884 2161
     			$alldata = $pall;
1885 2162
                         foreach ($alldata as $number) {
1886
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2163
+				if ($number['airline_icao'] != '') {
2164
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2165
+				}
2166
+			}
2167
+			if ($globalDebug) {
2168
+				echo 'Count all flights by months by airlines...'."\n";
1887 2169
 			}
1888
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1889 2170
 			$Spotter = new Spotter($this->db);
1890 2171
 			$alldata = $Spotter->countAllMonthsByAirlines();
1891 2172
 			$lastyear = false;
1892 2173
 			foreach ($alldata as $number) {
1893
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2174
+				if ($number['year_name'] != date('Y')) {
2175
+					$lastyear = true;
2176
+				}
1894 2177
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
1895 2178
 			}
1896
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2179
+			if ($globalDebug) {
2180
+				echo 'Count all owners by months by airlines...'."\n";
2181
+			}
1897 2182
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1898 2183
 			foreach ($alldata as $number) {
1899 2184
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
1900 2185
 			}
1901
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2186
+			if ($globalDebug) {
2187
+				echo 'Count all pilots by months by airlines...'."\n";
2188
+			}
1902 2189
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1903 2190
 			foreach ($alldata as $number) {
1904 2191
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
1905 2192
 			}
1906
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2193
+			if ($globalDebug) {
2194
+				echo 'Count all aircrafts by months by airlines...'."\n";
2195
+			}
1907 2196
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1908 2197
 			foreach ($alldata as $number) {
1909 2198
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
1910 2199
 			}
1911
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2200
+			if ($globalDebug) {
2201
+				echo 'Count all real arrivals by months by airlines...'."\n";
2202
+			}
1912 2203
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1913 2204
 			foreach ($alldata as $number) {
1914 2205
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
1915 2206
 			}
1916
-			if ($globalDebug) echo '...Departure'."\n";
2207
+			if ($globalDebug) {
2208
+				echo '...Departure'."\n";
2209
+			}
1917 2210
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1918 2211
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1919 2212
     			foreach ($dall as $value) {
@@ -1936,7 +2229,9 @@  discard block
 block discarded – undo
1936 2229
 			foreach ($alldata as $number) {
1937 2230
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
1938 2231
 			}
1939
-			if ($globalDebug) echo '...Arrival'."\n";
2232
+			if ($globalDebug) {
2233
+				echo '...Arrival'."\n";
2234
+			}
1940 2235
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1941 2236
         		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1942 2237
     			foreach ($dall as $value) {
@@ -1960,13 +2255,19 @@  discard block
 block discarded – undo
1960 2255
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
1961 2256
 			}
1962 2257
 
1963
-			if ($globalDebug) echo 'Flights data...'."\n";
1964
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2258
+			if ($globalDebug) {
2259
+				echo 'Flights data...'."\n";
2260
+			}
2261
+			if ($globalDebug) {
2262
+				echo '-> countAllDatesLastMonth...'."\n";
2263
+			}
1965 2264
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1966 2265
 			foreach ($alldata as $number) {
1967 2266
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1968 2267
 			}
1969
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2268
+			if ($globalDebug) {
2269
+				echo '-> countAllDates...'."\n";
2270
+			}
1970 2271
 			//$previousdata = $this->countAllDatesByAirlines();
1971 2272
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1972 2273
 			$values = array();
@@ -1979,7 +2280,9 @@  discard block
 block discarded – undo
1979 2280
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1980 2281
 			}
1981 2282
 			
1982
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2283
+			if ($globalDebug) {
2284
+				echo '-> countAllHours...'."\n";
2285
+			}
1983 2286
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1984 2287
 			foreach ($alldata as $number) {
1985 2288
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
@@ -1987,14 +2290,18 @@  discard block
 block discarded – undo
1987 2290
 			
1988 2291
 
1989 2292
 			// Stats by filters
1990
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2293
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2294
+				$globalStatsFilters = array();
2295
+			}
1991 2296
 			foreach ($globalStatsFilters as $name => $filter) {
1992 2297
 				//$filter_name = $filter['name'];
1993 2298
 				$filter_name = $name;
1994 2299
 				$reset = false;
1995 2300
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
1996 2301
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
1997
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2302
+					if ($globalDebug) {
2303
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2304
+					}
1998 2305
 					$this->deleteOldStats($filter_name);
1999 2306
 					unset($last_update);
2000 2307
 				}
@@ -2013,7 +2320,9 @@  discard block
 block discarded – undo
2013 2320
 				
2014 2321
 
2015 2322
 				// Count by filter
2016
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2323
+				if ($globalDebug) {
2324
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
2325
+				}
2017 2326
 				$Spotter = new Spotter($this->db);
2018 2327
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2019 2328
 				foreach ($alldata as $number) {
@@ -2050,7 +2359,9 @@  discard block
 block discarded – undo
2050 2359
 	    				$icao = $value['airport_departure_icao'];
2051 2360
         				if (isset($alldata[$icao])) {
2052 2361
     						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2053
-        				} else $alldata[$icao] = $value;
2362
+        				} else {
2363
+        					$alldata[$icao] = $value;
2364
+        				}
2054 2365
 				}
2055 2366
 	    			$count = array();
2056 2367
     				foreach ($alldata as $key => $row) {
@@ -2071,7 +2382,9 @@  discard block
 block discarded – undo
2071 2382
 	    				$icao = $value['airport_arrival_icao'];
2072 2383
         				if (isset($alldata[$icao])) {
2073 2384
         					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2074
-		        		} else $alldata[$icao] = $value;
2385
+		        		} else {
2386
+		        			$alldata[$icao] = $value;
2387
+		        		}
2075 2388
 	    			}
2076 2389
         			$count = array();
2077 2390
         			foreach ($alldata as $key => $row) {
@@ -2085,7 +2398,9 @@  discard block
 block discarded – undo
2085 2398
 				$alldata = $Spotter->countAllMonths($filter);
2086 2399
 				$lastyear = false;
2087 2400
 				foreach ($alldata as $number) {
2088
-					if ($number['year_name'] != date('Y')) $lastyear = true;
2401
+					if ($number['year_name'] != date('Y')) {
2402
+						$lastyear = true;
2403
+					}
2089 2404
 					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2090 2405
 				}
2091 2406
 				$alldata = $Spotter->countAllMonthsOwners($filter);
Please login to merge, or discard this patch.
statistics.php 2 patches
Spacing   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 ?>
@@ -76,30 +76,30 @@  discard block
 block discarded – undo
76 76
 <?php
77 77
 	if ($type == 'aircraft') {
78 78
 ?>
79
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
80
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
81
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
82
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
79
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
80
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
81
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
82
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
83 83
 	<?php
84
-	    if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
84
+	    if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
85 85
 	?>
86
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
87
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
86
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
87
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
88 88
         <?php
89 89
     	    } else {
90 90
     	?>
91
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
92
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
91
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
92
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
93 93
     	<?php
94 94
     	    }
95 95
     	?>
96
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
97
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
96
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
97
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
98 98
         <?php
99 99
     		if ($airline_icao == '') {
100 100
     	?>
101
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
102
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
101
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
102
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
103 103
 	<?php
104 104
 		}
105 105
 	?>
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 		if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) {
108 108
 			if ($airline_icao == '' || $airline_icao == 'all') {
109 109
 	?>
110
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
111
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
110
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
111
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
112 112
 	<?php
113 113
 			}
114 114
 		}
@@ -116,18 +116,18 @@  discard block
 block discarded – undo
116 116
 <?php
117 117
 	} elseif ($type == 'marine') {
118 118
 ?>
119
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarine($filter_name,$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
120
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
119
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarine($filter_name, $year, $month)); ?></span> <?php echo _("Vessels"); ?></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($filter_name,$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
125
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
124
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker($filter_name, $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
125
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
126 126
 <?php
127 127
 	}
128 128
 ?>
129 129
     </p>
130
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
130
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
131 131
     <div class="specific-stats">
132 132
 <?php
133 133
 	if ($type == 'aircraft') {
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
             <div class="col-md-6">
137 137
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
138 138
                  <?php
139
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
139
+                  $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
140 140
 		    if (count($aircraft_array) == 0) print _("No data available");
141 141
 		    else {
142 142
                     print '<div id="chart1" class="chart" width="100%"></div><script>';
143 143
                     $aircraft_data = '';
144
-                    foreach($aircraft_array as $aircraft_item)
144
+                    foreach ($aircraft_array as $aircraft_item)
145 145
                     {
146 146
                         $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
147 147
                     }
@@ -170,17 +170,17 @@  discard block
 block discarded – undo
170 170
             	    ?>
171 171
                 </div>
172 172
             </div>
173
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
173
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
174 174
 <?php
175 175
 //    echo $airline_icao;
176 176
 		if ($airline_icao == '' || $airline_icao == 'all') {
177
-			$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
177
+			$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
178 178
 			if (count($airline_array) > 0) {
179 179
 				print '<div class="col-md-6">';
180 180
 				print '<h2>'._("Top 10 Most Common Airline").'</h2>';
181 181
 				print '<div id="chart2" class="chart" width="100%"></div><script>';
182 182
 				$airline_data = '';
183
-				foreach($airline_array as $airline_item)
183
+				foreach ($airline_array as $airline_item)
184 184
 				{
185 185
 					$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
186 186
 				}
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 			}
207 207
 ?>
208 208
         </div>
209
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
209
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
210 210
 <?php
211 211
 		}
212 212
 ?>
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		    else {
226 226
                     print '<div id="chart1" class="chart" width="100%"></div><script>';
227 227
                     $marine_data = '';
228
-                    foreach($marine_array as $marine_item)
228
+                    foreach ($marine_array as $marine_item)
229 229
                     {
230 230
                         $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
231 231
                     }
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
             	    ?>
257 257
                 </div>
258 258
             </div>
259
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
259
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
260 260
 	</div>
261 261
 <?php
262 262
 	}
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 ?>
267 267
         <div class="row column">
268 268
 <?php
269
-		$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
270
-		if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
269
+		$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
270
+		if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
271 271
 			if (empty($flightover_array)) {
272 272
 				print '<div class="col-md-12">';
273 273
 			} else {
@@ -276,12 +276,12 @@  discard block
 block discarded – undo
276 276
 ?>
277 277
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
278 278
 <?php
279
-			$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
279
+			$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
280 280
 			if (count($pilot_array) == 0) print _("No data available");
281 281
 			else {
282 282
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
283 283
 				$pilot_data = '';
284
-				foreach($pilot_array as $pilot_item)
284
+				foreach ($pilot_array as $pilot_item)
285 285
 				{
286 286
 					$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
287 287
 				}
@@ -303,19 +303,19 @@  discard block
 block discarded – undo
303 303
 ?>
304 304
             </div>
305 305
         
306
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
306
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
307 307
 <?php
308 308
 		} else {
309 309
 ?>
310 310
             <div class="col-md-6">
311 311
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
312 312
 <?php
313
-			$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
313
+			$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
314 314
 			if (count($owner_array) == 0) print _("No data available");
315 315
 			else {
316 316
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
317 317
 				$owner_data = '';
318
-				foreach($owner_array as $owner_item)
318
+				foreach ($owner_array as $owner_item)
319 319
 				{
320 320
 					$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
321 321
 				}
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
                 </div>
336 336
             </div>
337 337
         
338
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
338
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
339 339
 <?php
340 340
 		}
341 341
 		if (!empty($flightover_array)) {
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 				print '<div id="chart10" class="chart" width="100%"></div><script>';
350 350
 				print 'var series = [';
351 351
 				$flightover_data = '';
352
-				foreach($flightover_array as $flightover_item)
352
+				foreach ($flightover_array as $flightover_item)
353 353
 				{
354 354
 					$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
355 355
 				}
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 		}
396 396
 ?>
397 397
         </div>
398
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
398
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
399 399
 
400 400
     	
401 401
         </div>
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
416 416
 			print 'var series = [';
417 417
 			$flightover_data = '';
418
-			foreach($flightover_array as $flightover_item)
418
+			foreach ($flightover_array as $flightover_item)
419 419
 			{
420 420
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
421 421
 			}
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
476 476
 			print 'var series = [';
477 477
 			$flightover_data = '';
478
-			foreach($flightover_array as $flightover_item)
478
+			foreach ($flightover_array as $flightover_item)
479 479
 			{
480 480
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
481 481
 			}
@@ -528,14 +528,14 @@  discard block
 block discarded – undo
528 528
         <div class="row column">
529 529
             <div class="col-md-6">
530 530
 <?php
531
-		$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
531
+		$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
532 532
 		if (count($airport_airport_array) > 0) {
533 533
 			print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
534 534
 			print '<div id="chart3" class="chart" width="100%"></div><script>';
535 535
 			print "\n";
536 536
 			print 'var series = [';
537 537
 			$airport_data = '';
538
-			foreach($airport_airport_array as $airport_item)
538
+			foreach ($airport_airport_array as $airport_item)
539 539
 			{
540 540
 				$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
541 541
 			}
@@ -586,18 +586,18 @@  discard block
 block discarded – undo
586 586
 		}
587 587
 ?>
588 588
             </div>
589
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
589
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
590 590
 
591 591
             <div class="col-md-6">
592 592
 <?php
593
-		$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
593
+		$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
594 594
 		if (count($airport_airport_array2) > 0) {
595 595
 			print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
596 596
 			print '<div id="chart4" class="chart" width="100%"></div><script>';
597 597
 			print "\n";
598 598
 			print 'var series = [';
599 599
 			$airport_data = '';
600
-			foreach($airport_airport_array2 as $airport_item)
600
+			foreach ($airport_airport_array2 as $airport_item)
601 601
 			{
602 602
 				$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
603 603
 			}
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
 ?>
650 650
             </div>
651 651
         </div>
652
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
652
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
653 653
 <?php 
654 654
 	}
655 655
 ?>
@@ -663,19 +663,19 @@  discard block
 block discarded – undo
663 663
             <div class="col-md-6">
664 664
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
665 665
 <?php
666
-			$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
666
+			$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
667 667
 			if (count($year_array) == 0) print _("No data available");
668 668
 			else {
669 669
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
670 670
 				$year_data = '';
671 671
 				$year_cnt = '';
672
-				foreach($year_array as $year_item)
672
+				foreach ($year_array as $year_item)
673 673
 				{
674 674
 					$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
675 675
 					$year_cnt .= $year_item['date_count'].',';
676 676
 				}
677 677
 				$year_data = "['x',".substr($year_data, 0, -1)."]";
678
-				$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
678
+				$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
679 679
 				print 'c3.generate({
680 680
 				    bindto: "#chart8",
681 681
 				    data: { x: "x",
@@ -688,23 +688,23 @@  discard block
 block discarded – undo
688 688
                     <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>
689 689
                 </div>
690 690
             </div>
691
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
691
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
692 692
             <div class="col-md-6">
693 693
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
694 694
 <?php
695
-			$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
695
+			$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
696 696
 			if (count($month_array) == 0) print _("No data available");
697 697
 			else {
698 698
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
699 699
 				$month_data = '';
700 700
 				$month_cnt = '';
701
-				foreach($month_array as $month_item)
701
+				foreach ($month_array as $month_item)
702 702
 				{
703 703
 					$month_data .= '"'.$month_item['date_name'].'",';
704 704
 					$month_cnt .= $month_item['date_count'].',';
705 705
 				}
706 706
 				$month_data = "['x',".substr($month_data, 0, -1)."]";
707
-				$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
707
+				$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
708 708
 				print 'c3.generate({
709 709
 				    bindto: "#chart9",
710 710
 				    data: { x: "x",
@@ -717,24 +717,24 @@  discard block
 block discarded – undo
717 717
                     <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>
718 718
                 </div>
719 719
             </div>
720
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
720
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
721 721
 
722 722
             <div class="col-md-6">
723 723
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
724 724
 <?php
725
-			$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
725
+			$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
726 726
 			if (empty($date_array)) print _("No data available");
727 727
 			else {
728 728
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
729 729
 				$date_data = '';
730 730
 				$date_cnt = '';
731
-				foreach($date_array as $date_item)
731
+				foreach ($date_array as $date_item)
732 732
 				{
733 733
 					$date_data .= '"'.$date_item['date_name'].'",';
734 734
 					$date_cnt .= $date_item['date_count'].',';
735 735
 				}
736 736
 				$date_data = "['x',".substr($date_data, 0, -1)."]";
737
-				$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
737
+				$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
738 738
 				print 'c3.generate({
739 739
 				    bindto: "#chart5",
740 740
 				    data: { x: "x",
@@ -747,23 +747,23 @@  discard block
 block discarded – undo
747 747
                     <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>
748 748
                 </div>
749 749
             </div>
750
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
750
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
751 751
             <div class="col-md-6">
752 752
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
753 753
 <?php
754
-			$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
754
+			$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
755 755
 			if (empty($hour_array)) print _("No data available");
756 756
 			else {
757 757
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
758 758
 				$hour_data = '';
759 759
 				$hour_cnt = '';
760
-				foreach($hour_array as $hour_item)
760
+				foreach ($hour_array as $hour_item)
761 761
 				{
762 762
 					$hour_data .= '"'.$hour_item['hour_name'].':00",';
763 763
 					$hour_cnt .= $hour_item['hour_count'].',';
764 764
 				}
765 765
 				$hour_data = "[".substr($hour_data, 0, -1)."]";
766
-				$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
766
+				$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
767 767
 				print 'c3.generate({
768 768
 				    bindto: "#chart6",
769 769
 				    data: {
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
                     <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>
777 777
                 </div>
778 778
             </div>
779
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
779
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
780 780
         </div>
781 781
 <?php
782 782
 		}
@@ -794,19 +794,19 @@  discard block
 block discarded – undo
794 794
             <div class="col-md-6">
795 795
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
796 796
 <?php
797
-			$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
797
+			$year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name);
798 798
 			if (count($year_array) == 0) print _("No data available");
799 799
 			else {
800 800
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
801 801
 				$year_data = '';
802 802
 				$year_cnt = '';
803
-				foreach($year_array as $year_item)
803
+				foreach ($year_array as $year_item)
804 804
 				{
805 805
 					$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
806 806
 					$year_cnt .= $year_item['date_count'].',';
807 807
 				}
808 808
 				$year_data = "['x',".substr($year_data, 0, -1)."]";
809
-				$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
809
+				$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
810 810
 				print 'c3.generate({
811 811
 				    bindto: "#chart8",
812 812
 				    data: { x: "x",
@@ -820,23 +820,23 @@  discard block
 block discarded – undo
820 820
                 </div>
821 821
             </div>
822 822
             
823
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
823
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
824 824
             <div class="col-md-6">
825 825
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
826 826
 <?php
827
-			$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
827
+			$month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name);
828 828
 			if (count($month_array) == 0) print _("No data available");
829 829
 			else {
830 830
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
831 831
 				$month_data = '';
832 832
 				$month_cnt = '';
833
-				foreach($month_array as $month_item)
833
+				foreach ($month_array as $month_item)
834 834
 				{
835 835
 					$month_data .= '"'.$month_item['date_name'].'",';
836 836
 					$month_cnt .= $month_item['date_count'].',';
837 837
 				}
838 838
 				$month_data = "['x',".substr($month_data, 0, -1)."]";
839
-				$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
839
+				$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
840 840
 				print 'c3.generate({
841 841
 				    bindto: "#chart9",
842 842
 				    data: { x: "x",
@@ -849,24 +849,24 @@  discard block
 block discarded – undo
849 849
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
850 850
                 </div>
851 851
             </div>
852
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
852
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
853 853
 
854 854
             <div class="col-md-6">
855 855
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
856 856
 <?php
857
-			$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
857
+			$date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name);
858 858
 			if (empty($date_array)) print _("No data available");
859 859
 			else {
860 860
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
861 861
 				$date_data = '';
862 862
 				$date_cnt = '';
863
-				foreach($date_array as $date_item)
863
+				foreach ($date_array as $date_item)
864 864
 				{
865 865
 					$date_data .= '"'.$date_item['date_name'].'",';
866 866
 					$date_cnt .= $date_item['date_count'].',';
867 867
 				}
868 868
 				$date_data = "['x',".substr($date_data, 0, -1)."]";
869
-				$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
869
+				$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
870 870
 				print 'c3.generate({
871 871
 				    bindto: "#chart5",
872 872
 				    data: { x: "x",
@@ -879,23 +879,23 @@  discard block
 block discarded – undo
879 879
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
880 880
                 </div>
881 881
             </div>
882
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
882
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
883 883
             <div class="col-md-6">
884 884
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
885 885
 <?php
886
-			$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
886
+			$hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name);
887 887
 			if (empty($hour_array)) print _("No data available");
888 888
 			else {
889 889
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
890 890
 				$hour_data = '';
891 891
 				$hour_cnt = '';
892
-				foreach($hour_array as $hour_item)
892
+				foreach ($hour_array as $hour_item)
893 893
 				{
894 894
 					$hour_data .= '"'.$hour_item['hour_name'].':00",';
895 895
 					$hour_cnt .= $hour_item['hour_count'].',';
896 896
 				}
897 897
 				$hour_data = "[".substr($hour_data, 0, -1)."]";
898
-				$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
898
+				$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
899 899
 				print 'c3.generate({
900 900
 				    bindto: "#chart6",
901 901
 				    data: {
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
909 909
                 </div>
910 910
             </div>
911
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
911
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
912 912
         </div>
913 913
 <?php
914 914
 		}
@@ -932,13 +932,13 @@  discard block
 block discarded – undo
932 932
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
933 933
 				$year_data = '';
934 934
 				$year_cnt = '';
935
-				foreach($year_array as $year_item)
935
+				foreach ($year_array as $year_item)
936 936
 				{
937 937
 					$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
938 938
 					$year_cnt .= $year_item['date_count'].',';
939 939
 				}
940 940
 				$year_data = "['x',".substr($year_data, 0, -1)."]";
941
-				$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
941
+				$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
942 942
 				print 'c3.generate({
943 943
 				    bindto: "#chart8",
944 944
 				    data: { x: "x",
@@ -952,7 +952,7 @@  discard block
 block discarded – undo
952 952
                 </div>
953 953
             </div>
954 954
             
955
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
955
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
956 956
             <div class="col-md-6">
957 957
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
958 958
 <?php
@@ -962,13 +962,13 @@  discard block
 block discarded – undo
962 962
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
963 963
 				$month_data = '';
964 964
 				$month_cnt = '';
965
-				foreach($month_array as $month_item)
965
+				foreach ($month_array as $month_item)
966 966
 				{
967 967
 					$month_data .= '"'.$month_item['date_name'].'",';
968 968
 					$month_cnt .= $month_item['date_count'].',';
969 969
 				}
970 970
 				$month_data = "['x',".substr($month_data, 0, -1)."]";
971
-				$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
971
+				$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
972 972
 				print 'c3.generate({
973 973
 				    bindto: "#chart9",
974 974
 				    data: { x: "x",
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
982 982
                 </div>
983 983
             </div>
984
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
984
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
985 985
 
986 986
             <div class="col-md-6">
987 987
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -992,13 +992,13 @@  discard block
 block discarded – undo
992 992
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
993 993
 				$date_data = '';
994 994
 				$date_cnt = '';
995
-				foreach($date_array as $date_item)
995
+				foreach ($date_array as $date_item)
996 996
 				{
997 997
 					$date_data .= '"'.$date_item['date_name'].'",';
998 998
 					$date_cnt .= $date_item['date_count'].',';
999 999
 				}
1000 1000
 				$date_data = "['x',".substr($date_data, 0, -1)."]";
1001
-				$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
1001
+				$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
1002 1002
 				print 'c3.generate({
1003 1003
 				    bindto: "#chart5",
1004 1004
 				    data: { x: "x",
@@ -1011,23 +1011,23 @@  discard block
 block discarded – undo
1011 1011
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1012 1012
                 </div>
1013 1013
             </div>
1014
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1014
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1015 1015
             <div class="col-md-6">
1016 1016
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1017 1017
 <?php
1018
-			$hour_array = $Tracker->countAllHours('hour',true);
1018
+			$hour_array = $Tracker->countAllHours('hour', true);
1019 1019
 			if (empty($hour_array)) print _("No data available");
1020 1020
 			else {
1021 1021
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
1022 1022
 				$hour_data = '';
1023 1023
 				$hour_cnt = '';
1024
-				foreach($hour_array as $hour_item)
1024
+				foreach ($hour_array as $hour_item)
1025 1025
 				{
1026 1026
 					$hour_data .= '"'.$hour_item['hour_name'].':00",';
1027 1027
 					$hour_cnt .= $hour_item['hour_count'].',';
1028 1028
 				}
1029 1029
 				$hour_data = "[".substr($hour_data, 0, -1)."]";
1030
-				$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
1030
+				$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
1031 1031
 				print 'c3.generate({
1032 1032
 				    bindto: "#chart6",
1033 1033
 				    data: {
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1041 1041
                 </div>
1042 1042
             </div>
1043
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1043
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1044 1044
         </div>
1045 1045
 <?php
1046 1046
 		}
@@ -1064,13 +1064,13 @@  discard block
 block discarded – undo
1064 1064
 				print '<div id="chart32" class="chart" width="100%"></div><script>';
1065 1065
 				$year_data = '';
1066 1066
 				$year_cnt = '';
1067
-				foreach($year_array as $year_item)
1067
+				foreach ($year_array as $year_item)
1068 1068
 				{
1069 1069
 					$year_data .= '"'.$year_item['year'].'-01-01",';
1070 1070
 					$year_cnt .= $year_item['count'].',';
1071 1071
 				}
1072 1072
 				$year_data = "['x',".substr($year_data, 0, -1)."]";
1073
-				$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
1073
+				$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
1074 1074
 				print 'c3.generate({
1075 1075
 				    bindto: "#chart32",
1076 1076
 				    data: { x: "x",
@@ -1083,7 +1083,7 @@  discard block
 block discarded – undo
1083 1083
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1084 1084
                 </div>
1085 1085
             </div>
1086
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1086
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1087 1087
 
1088 1088
         <div class="row column">
1089 1089
             <div class="col-md-6">
@@ -1095,13 +1095,13 @@  discard block
 block discarded – undo
1095 1095
 				print '<div id="chart33" class="chart" width="100%"></div><script>';
1096 1096
 				$year_data = '';
1097 1097
 				$year_cnt = '';
1098
-				foreach($year_array as $year_item)
1098
+				foreach ($year_array as $year_item)
1099 1099
 				{
1100 1100
 					$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
1101 1101
 					$year_cnt .= $year_item['count'].',';
1102 1102
 				}
1103 1103
 				$year_data = "['x',".substr($year_data, 0, -1)."]";
1104
-				$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
1104
+				$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
1105 1105
 				print 'c3.generate({
1106 1106
 				    bindto: "#chart33",
1107 1107
 				    data: { x: "x",
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1115 1115
                 </div>
1116 1116
             </div>
1117
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1117
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1118 1118
 <br/>
1119 1119
 <?php
1120 1120
 		}
@@ -1132,9 +1132,9 @@  discard block
 block discarded – undo
1132 1132
 <?php
1133 1133
 			//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
1134 1134
 			if ($year == '' && $month == '') {
1135
-				$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
1135
+				$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
1136 1136
 			} else {
1137
-				$polar = $Stats->getStatsSource('polar',$year,$month);
1137
+				$polar = $Stats->getStatsSource('polar', $year, $month);
1138 1138
 			}
1139 1139
 			if (!empty($polar)) {
1140 1140
 				print '<h2>'._("Coverage pattern").'</h2>';
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
 					unset($polar_data);
1143 1143
 					$Spotter = new Spotter();
1144 1144
 					$data = json_decode($eachpolar['source_data']);
1145
-					foreach($data as $value => $key) {
1145
+					foreach ($data as $value => $key) {
1146 1146
 						$direction = $Spotter->parseDirection(($value*22.5));
1147 1147
 						$distance = $key;
1148 1148
 						$unit = 'km';
@@ -1162,7 +1162,7 @@  discard block
 block discarded – undo
1162 1162
 ?>
1163 1163
             <div class="col-md-6">
1164 1164
                 <h4><?php print $eachpolar['source_name']; ?></h4>
1165
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
1165
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
1166 1166
         	<script>
1167 1167
         	    (function() {
1168 1168
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
1186 1186
 		      color: color,
1187 1187
 		      unit: '<?php echo $unit; ?>'
1188 1188
 		    };
1189
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
1189
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
1190 1190
 		    })();
1191 1191
 		</script>
1192 1192
             </div>
@@ -1200,22 +1200,22 @@  discard block
 block discarded – undo
1200 1200
 <?php
1201 1201
 			//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
1202 1202
 			if ($year == '' && $month == '') {
1203
-				$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
1203
+				$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
1204 1204
 			} else {
1205
-				$msg = $Stats->getStatsSource('msg',$year,$month);
1205
+				$msg = $Stats->getStatsSource('msg', $year, $month);
1206 1206
 			}
1207 1207
 			if (!empty($msg)) {
1208 1208
 				print '<h2>'._("Messages received").'</h2>';
1209 1209
 				foreach ($msg as $eachmsg) {
1210 1210
 					//$eachmsg = $msg[0];
1211 1211
 					$data = $eachmsg['source_data'];
1212
-					if ($data > 500) $max = (round(($data+100)/100))*100;
1212
+					if ($data > 500) $max = (round(($data + 100)/100))*100;
1213 1213
 					else $max = 500;
1214 1214
 ?>
1215
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1215
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1216 1216
         	<script>
1217 1217
 		      var g = new JustGage({
1218
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
1218
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
1219 1219
 			    value: <?php echo $data; ?>,
1220 1220
 			    min: 0,
1221 1221
 			    max: <?php print $max; ?>,
@@ -1236,9 +1236,9 @@  discard block
 block discarded – undo
1236 1236
 <?php
1237 1237
 		//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
1238 1238
 			if ($year == '' && $month == '') {
1239
-				$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
1239
+				$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
1240 1240
 			} else {
1241
-				$hist = $Stats->getStatsSource('hist',$year,$month);
1241
+				$hist = $Stats->getStatsSource('hist', $year, $month);
1242 1242
 			}
1243 1243
 			foreach ($hist as $hists) {
1244 1244
 				//$hist_data = '';
@@ -1247,7 +1247,7 @@  discard block
 block discarded – undo
1247 1247
 				$source = $hists['source_name'];
1248 1248
 				$hist_array = json_decode($hists['source_data']);
1249 1249
 				$unit = 'km';
1250
-				foreach($hist_array as $distance => $nb)
1250
+				foreach ($hist_array as $distance => $nb)
1251 1251
 				{
1252 1252
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
1253 1253
 						$distance = round($distance*0.539957);
@@ -1268,18 +1268,18 @@  discard block
 block discarded – undo
1268 1268
 				$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
1269 1269
 ?>
1270 1270
             <div class="col-md-6">
1271
-                <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
1271
+                <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2>
1272 1272
 <?php
1273
-				print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
1273
+				print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
1274 1274
 				print 'c3.generate({
1275
-				    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
1275
+				    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
1276 1276
 				    data: { x: "x",
1277 1277
 				    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
1278 1278
 				    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
1279 1279
 				print '</script>';
1280 1280
 ?>
1281 1281
     	    </div>
1282
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1282
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1283 1283
 <?php
1284 1284
 			}
1285 1285
 ?>
Please login to merge, or discard this patch.
Braces   +137 added lines, -65 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>';
@@ -221,8 +243,9 @@  discard block
 block discarded – undo
221 243
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
222 244
                  <?php
223 245
                   $marine_array = $Marine->countAllMarineTypes();
224
-		    if (count($marine_array) == 0) print _("No data available");
225
-		    else {
246
+		    if (count($marine_array) == 0) {
247
+		    	print _("No data available");
248
+		    } else {
226 249
                     print '<div id="chart1" class="chart" width="100%"></div><script>';
227 250
                     $marine_data = '';
228 251
                     foreach($marine_array as $marine_item)
@@ -277,8 +300,9 @@  discard block
 block discarded – undo
277 300
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
278 301
 <?php
279 302
 			$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
280
-			if (count($pilot_array) == 0) print _("No data available");
281
-			else {
303
+			if (count($pilot_array) == 0) {
304
+				print _("No data available");
305
+			} else {
282 306
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
283 307
 				$pilot_data = '';
284 308
 				foreach($pilot_array as $pilot_item)
@@ -297,7 +321,9 @@  discard block
 block discarded – undo
297 321
 			}
298 322
 			print '<div class="more">';
299 323
 			print '<a href="'.$globalURL.'/statistics/pilot'; 
300
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
324
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
325
+				echo '/'.$airline_icao;
326
+			}
301 327
 			print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
302 328
 			print '</div>';
303 329
 ?>
@@ -311,8 +337,9 @@  discard block
 block discarded – undo
311 337
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
312 338
 <?php
313 339
 			$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
314
-			if (count($owner_array) == 0) print _("No data available");
315
-			else {
340
+			if (count($owner_array) == 0) {
341
+				print _("No data available");
342
+			} else {
316 343
 				print '<div id="chart7" class="chart" width="100%"></div><script>';
317 344
 				$owner_data = '';
318 345
 				foreach($owner_array as $owner_item)
@@ -331,7 +358,10 @@  discard block
 block discarded – undo
331 358
 			}
332 359
 ?>
333 360
                 <div class="more">
334
-                    <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>
361
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
362
+	echo '/'.$airline_icao;
363
+}
364
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
335 365
                 </div>
336 366
             </div>
337 367
         
@@ -344,8 +374,9 @@  discard block
 block discarded – undo
344 374
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
345 375
 <?php
346 376
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
347
-			if (count($flightover_array) == 0) print _("No data available");
348
-			else {
377
+			if (count($flightover_array) == 0) {
378
+				print _("No data available");
379
+			} else {
349 380
 				print '<div id="chart10" class="chart" width="100%"></div><script>';
350 381
 				print 'var series = [';
351 382
 				$flightover_data = '';
@@ -388,7 +419,10 @@  discard block
 block discarded – undo
388 419
 			}
389 420
 ?>
390 421
                 <div class="more">
391
-                    <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>
422
+                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
423
+	echo '/'.$airline_icao;
424
+}
425
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
392 426
                 </div>
393 427
             </div>
394 428
 <?php
@@ -410,8 +444,9 @@  discard block
 block discarded – undo
410 444
 	<div class="col-md-6">
411 445
             <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2>
412 446
 <?php
413
-		if (count($flightover_array) == 0) print _("No data available");
414
-		else {
447
+		if (count($flightover_array) == 0) {
448
+			print _("No data available");
449
+		} else {
415 450
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
416 451
 			print 'var series = [';
417 452
 			$flightover_data = '';
@@ -470,8 +505,9 @@  discard block
 block discarded – undo
470 505
 	<div class="col-md-6">
471 506
             <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2>
472 507
 <?php
473
-		if (count($flightover_array) == 0) print _("No data available");
474
-		else {
508
+		if (count($flightover_array) == 0) {
509
+			print _("No data available");
510
+		} else {
475 511
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
476 512
 			print 'var series = [';
477 513
 			$flightover_data = '';
@@ -581,7 +617,9 @@  discard block
 block discarded – undo
581 617
 			});";
582 618
 			print '</script>';
583 619
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
584
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
620
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
621
+				echo '/'.$airline_icao;
622
+			}
585 623
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
586 624
 		}
587 625
 ?>
@@ -643,7 +681,9 @@  discard block
 block discarded – undo
643 681
 			});";
644 682
 			print '</script>';
645 683
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
646
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
684
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
685
+				echo '/'.$airline_icao;
686
+			}
647 687
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
648 688
 		}
649 689
 ?>
@@ -664,8 +704,9 @@  discard block
 block discarded – undo
664 704
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
665 705
 <?php
666 706
 			$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
667
-			if (count($year_array) == 0) print _("No data available");
668
-			else {
707
+			if (count($year_array) == 0) {
708
+				print _("No data available");
709
+			} else {
669 710
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
670 711
 				$year_data = '';
671 712
 				$year_cnt = '';
@@ -685,7 +726,10 @@  discard block
 block discarded – undo
685 726
 			}
686 727
 ?>
687 728
                 <div class="more">
688
-                    <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>
729
+                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
730
+	echo '/'.$airline_icao;
731
+}
732
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
689 733
                 </div>
690 734
             </div>
691 735
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -693,8 +737,9 @@  discard block
 block discarded – undo
693 737
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
694 738
 <?php
695 739
 			$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
696
-			if (count($month_array) == 0) print _("No data available");
697
-			else {
740
+			if (count($month_array) == 0) {
741
+				print _("No data available");
742
+			} else {
698 743
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
699 744
 				$month_data = '';
700 745
 				$month_cnt = '';
@@ -714,7 +759,10 @@  discard block
 block discarded – undo
714 759
 			}
715 760
 ?>
716 761
                 <div class="more">
717
-                    <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>
762
+                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
763
+	echo '/'.$airline_icao;
764
+}
765
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
718 766
                 </div>
719 767
             </div>
720 768
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -723,8 +771,9 @@  discard block
 block discarded – undo
723 771
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
724 772
 <?php
725 773
 			$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
726
-			if (empty($date_array)) print _("No data available");
727
-			else {
774
+			if (empty($date_array)) {
775
+				print _("No data available");
776
+			} else {
728 777
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
729 778
 				$date_data = '';
730 779
 				$date_cnt = '';
@@ -744,7 +793,10 @@  discard block
 block discarded – undo
744 793
 			}
745 794
 ?>
746 795
                 <div class="more">
747
-                    <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>
796
+                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
797
+	echo '/'.$airline_icao;
798
+}
799
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
748 800
                 </div>
749 801
             </div>
750 802
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -752,8 +804,9 @@  discard block
 block discarded – undo
752 804
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
753 805
 <?php
754 806
 			$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
755
-			if (empty($hour_array)) print _("No data available");
756
-			else {
807
+			if (empty($hour_array)) {
808
+				print _("No data available");
809
+			} else {
757 810
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
758 811
 				$hour_data = '';
759 812
 				$hour_cnt = '';
@@ -773,7 +826,10 @@  discard block
 block discarded – undo
773 826
 			}
774 827
 ?>
775 828
                 <div class="more">
776
-                    <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>
829
+                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
830
+	echo '/'.$airline_icao;
831
+}
832
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
777 833
                 </div>
778 834
             </div>
779 835
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -795,8 +851,9 @@  discard block
 block discarded – undo
795 851
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
796 852
 <?php
797 853
 			$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
798
-			if (count($year_array) == 0) print _("No data available");
799
-			else {
854
+			if (count($year_array) == 0) {
855
+				print _("No data available");
856
+			} else {
800 857
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
801 858
 				$year_data = '';
802 859
 				$year_cnt = '';
@@ -825,8 +882,9 @@  discard block
 block discarded – undo
825 882
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
826 883
 <?php
827 884
 			$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
828
-			if (count($month_array) == 0) print _("No data available");
829
-			else {
885
+			if (count($month_array) == 0) {
886
+				print _("No data available");
887
+			} else {
830 888
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
831 889
 				$month_data = '';
832 890
 				$month_cnt = '';
@@ -855,8 +913,9 @@  discard block
 block discarded – undo
855 913
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
856 914
 <?php
857 915
 			$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
858
-			if (empty($date_array)) print _("No data available");
859
-			else {
916
+			if (empty($date_array)) {
917
+				print _("No data available");
918
+			} else {
860 919
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
861 920
 				$date_data = '';
862 921
 				$date_cnt = '';
@@ -884,8 +943,9 @@  discard block
 block discarded – undo
884 943
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
885 944
 <?php
886 945
 			$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
887
-			if (empty($hour_array)) print _("No data available");
888
-			else {
946
+			if (empty($hour_array)) {
947
+				print _("No data available");
948
+			} else {
889 949
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
890 950
 				$hour_data = '';
891 951
 				$hour_cnt = '';
@@ -927,8 +987,9 @@  discard block
 block discarded – undo
927 987
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
928 988
 <?php
929 989
 			$year_array = $Tracker->countAllMonthsLastYear(true);
930
-			if (count($year_array) == 0) print _("No data available");
931
-			else {
990
+			if (count($year_array) == 0) {
991
+				print _("No data available");
992
+			} else {
932 993
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
933 994
 				$year_data = '';
934 995
 				$year_cnt = '';
@@ -957,8 +1018,9 @@  discard block
 block discarded – undo
957 1018
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
958 1019
 <?php
959 1020
 			$month_array = $Tracker->countAllDatesLastMonth();
960
-			if (count($month_array) == 0) print _("No data available");
961
-			else {
1021
+			if (count($month_array) == 0) {
1022
+				print _("No data available");
1023
+			} else {
962 1024
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
963 1025
 				$month_data = '';
964 1026
 				$month_cnt = '';
@@ -987,8 +1049,9 @@  discard block
 block discarded – undo
987 1049
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
988 1050
 <?php
989 1051
 			$date_array = $Tracker->countAllDatesLast7Days();
990
-			if (empty($date_array)) print _("No data available");
991
-			else {
1052
+			if (empty($date_array)) {
1053
+				print _("No data available");
1054
+			} else {
992 1055
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
993 1056
 				$date_data = '';
994 1057
 				$date_cnt = '';
@@ -1016,8 +1079,9 @@  discard block
 block discarded – undo
1016 1079
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1017 1080
 <?php
1018 1081
 			$hour_array = $Tracker->countAllHours('hour',true);
1019
-			if (empty($hour_array)) print _("No data available");
1020
-			else {
1082
+			if (empty($hour_array)) {
1083
+				print _("No data available");
1084
+			} else {
1021 1085
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
1022 1086
 				$hour_data = '';
1023 1087
 				$hour_cnt = '';
@@ -1059,8 +1123,9 @@  discard block
 block discarded – undo
1059 1123
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
1060 1124
 <?php
1061 1125
 			$year_array = $Stats->countFatalitiesByYear();
1062
-			if (count($year_array) == 0) print _("No data available");
1063
-			else {
1126
+			if (count($year_array) == 0) {
1127
+				print _("No data available");
1128
+			} else {
1064 1129
 				print '<div id="chart32" class="chart" width="100%"></div><script>';
1065 1130
 				$year_data = '';
1066 1131
 				$year_cnt = '';
@@ -1090,8 +1155,9 @@  discard block
 block discarded – undo
1090 1155
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
1091 1156
 <?php
1092 1157
 			$year_array = $Stats->countFatalitiesLast12Months();
1093
-			if (count($year_array) == 0) print _("No data available");
1094
-			else {
1158
+			if (count($year_array) == 0) {
1159
+				print _("No data available");
1160
+			} else {
1095 1161
 				print '<div id="chart33" class="chart" width="100%"></div><script>';
1096 1162
 				$year_data = '';
1097 1163
 				$year_cnt = '';
@@ -1156,8 +1222,11 @@  discard block
 block discarded – undo
1156 1222
 							$distance = $distance;
1157 1223
 							$unit = 'km';
1158 1224
 						}
1159
-						if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1160
-						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1225
+						if (!isset($polar_data)) {
1226
+							$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1227
+						} else {
1228
+							$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1229
+						}
1161 1230
 					}
1162 1231
 ?>
1163 1232
             <div class="col-md-6">
@@ -1209,9 +1278,12 @@  discard block
 block discarded – undo
1209 1278
 				foreach ($msg as $eachmsg) {
1210 1279
 					//$eachmsg = $msg[0];
1211 1280
 					$data = $eachmsg['source_data'];
1212
-					if ($data > 500) $max = (round(($data+100)/100))*100;
1213
-					else $max = 500;
1214
-?>
1281
+					if ($data > 500) {
1282
+						$max = (round(($data+100)/100))*100;
1283
+					} else {
1284
+						$max = 500;
1285
+					}
1286
+					?>
1215 1287
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1216 1288
         	<script>
1217 1289
 		      var g = new JustGage({
Please login to merge, or discard this patch.