Completed
Push — master ( d2633e...078d82 )
by Yannick
06:44
created
statistics-pilot.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Pilots");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php');
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	</div>
28 28
 	<p>'._("Below are the <strong>Top 10</strong> most common pilot.").'</p>';
29 29
 	  
30
-	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
30
+	$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name);
31 31
 	print '<div id="chart" class="chart" width="100%"></div>
32 32
       	<script> 
33 33
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             var data = google.visualization.arrayToDataTable([
37 37
             	["'._("Pilot").'", "'._("# of times").'"], ';
38 38
             	$pilot_data = '';
39
-		foreach($pilot_array as $pilot_item)
39
+		foreach ($pilot_array as $pilot_item)
40 40
 		{
41 41
 			$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
42 42
 		}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	print '</thead>';
70 70
 	print '<tbody>';
71 71
 	$i = 1;
72
-	foreach($pilot_array as $pilot_item)
72
+	foreach ($pilot_array as $pilot_item)
73 73
 	{
74 74
 		print '<tr>';
75 75
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-manufacturer.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Aircraft Manufacturer");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		 </div>
28 28
     	<p>'._("Below are the <strong>Top 10</strong> most common aircraft manufacturers.").'</p>';
29 29
  
30
-$manufacturers_array = $Stats->countAllAircraftManufacturers(true,$airline_icao,$filter_name);
30
+$manufacturers_array = $Stats->countAllAircraftManufacturers(true, $airline_icao, $filter_name);
31 31
 print '<div id="chart" class="chart" width="100%"></div>
32 32
       	<script> 
33 33
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             var data = google.visualization.arrayToDataTable([
37 37
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
38 38
 $manufacturer_data = '';
39
-foreach($manufacturers_array as $manufacturer_item)
39
+foreach ($manufacturers_array as $manufacturer_item)
40 40
 {
41 41
 	$manufacturer_data .= '[ "'.$manufacturer_item['aircraft_manufacturer'].'",'.$manufacturer_item['aircraft_manufacturer_count'].'],';
42 42
 }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	print '</thead>';
70 70
 	print '<tbody>';
71 71
 	$i = 1;
72
-	foreach($manufacturers_array as $manufacturer_item)
72
+	foreach ($manufacturers_array as $manufacturer_item)
73 73
 	{
74 74
 		print '<tr>';
75 75
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-country.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Country a flight was over");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	  </div>
28 28
 	<p>'._("Below are the <strong>Top 10</strong> most common country a flight was over.").'</p>';
29 29
 
30
-$flightover_array = $Stats->countAllFlightOverCountries(true,$airline_icao,$filter_name);
30
+$flightover_array = $Stats->countAllFlightOverCountries(true, $airline_icao, $filter_name);
31 31
 print '<div id="chart" class="chart" width="100%"></div>
32 32
       	<script> 
33 33
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             var data = google.visualization.arrayToDataTable([
37 37
             	["'._("Country").'", "'._("# of times").'"], ';
38 38
 $flightover_data = '';
39
-foreach($flightover_array as $flightover_item)
39
+foreach ($flightover_array as $flightover_item)
40 40
 {
41 41
 	$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
42 42
 }
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	print '</thead>';
72 72
 	print '<tbody>';
73 73
 	$i = 1;
74
-	foreach($flightover_array as $flightover_item)
74
+	foreach ($flightover_array as $flightover_item)
75 75
 	{
76 76
 		print '<tr>';
77 77
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-registration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Aircraft Registrations");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	</div>
28 28
     	<p>'._("Below are the <strong>Top 10</strong> most common aircraft registrations.").'</p>';
29 29
   
30
-$registration_array = $Stats->countAllAircraftRegistrations(true,$airline_icao,$filter_name);
30
+$registration_array = $Stats->countAllAircraftRegistrations(true, $airline_icao, $filter_name);
31 31
 print '<div id="chart" class="chart" width="100%"></div>
32 32
       	    <script> 
33 33
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             var data = google.visualization.arrayToDataTable([
37 37
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
38 38
             	$registration_data = '';
39
-foreach($registration_array as $registration_item)
39
+foreach ($registration_array as $registration_item)
40 40
 {
41 41
 	$registration_data .= '[ "'.$registration_item['registration'].' - '.$registration_item['aircraft_name'].' ('.$registration_item['aircraft_icao'].')",'.$registration_item['aircraft_registration_count'].'],';
42 42
 }
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	print '</thead>';
72 72
 	print '<tbody>';
73 73
 	$i = 1;
74
-	foreach($registration_array as $registration_item)
74
+	foreach ($registration_array as $registration_item)
75 75
 	{
76 76
 		print '<tr>';
77 77
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-owner.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common owners");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php');
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	</div>
27 27
 	<p>'._("Below are the <strong>Top 10</strong> most common owner.").'</p>';
28 28
  
29
-	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
29
+	$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name);
30 30
 	print '<div id="chart" class="chart" width="100%"></div>
31 31
       	<script> 
32 32
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             var data = google.visualization.arrayToDataTable([
36 36
             	["'._("Owner").'", "'._("# of times").'"], ';
37 37
             	$owner_data = '';
38
-		foreach($owner_array as $owner_item)
38
+		foreach ($owner_array as $owner_item)
39 39
 		{
40 40
 			$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
41 41
 		}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	print '</thead>';
69 69
 	print '<tbody>';
70 70
 	$i = 1;
71
-	foreach($owner_array as $owner_item)
71
+	foreach ($owner_array as $owner_item)
72 72
 	{
73 73
 		print '<tr>';
74 74
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-airport-departure.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Departure Airport");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	  </div>
28 28
     	<p>'._("Below are the <strong>Top 10</strong> most common departure airports.").'</p>';
29 29
 
30
-$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
30
+$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name);
31 31
 print '<script>
32 32
     	google.load("visualization", "1", {packages:["geochart"]});
33 33
     	google.setOnLoadCallback(drawCharts);
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         	["'._("Airport").'", "'._("# of times").'"],';
41 41
 
42 42
 $airport_data = '';
43
-foreach($airport_airport_array as $airport_item)
43
+foreach ($airport_airport_array as $airport_item)
44 44
 {
45 45
 	$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
46 46
 	$name = str_replace("'", "", $name);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 print '</thead>';
79 79
 print '<tbody>';
80 80
 $i = 1;
81
-foreach($airport_airport_array as $airport_item)
81
+foreach ($airport_airport_array as $airport_item)
82 82
 {
83 83
 	print '<tr>';
84 84
 	print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-airport-arrival.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Arrival Airport");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	  </div>
28 28
     	 <p>'._("Below are the <strong>Top 10</strong> most common arrival airports.").'</p>';
29 29
 
30
-$airport_airport_array = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
30
+$airport_airport_array = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name);
31 31
 print '<script>
32 32
     	google.load("visualization", "1", {packages:["geochart"]});
33 33
     	google.setOnLoadCallback(drawCharts);
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         	["'._("Airport").'", "'._("# of times").'"],';
41 41
 
42 42
 $airport_data = '';
43
-foreach($airport_airport_array as $airport_item)
43
+foreach ($airport_airport_array as $airport_item)
44 44
 {
45 45
 	$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
46 46
 	$name = str_replace("'", "", $name);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 print '</thead>';
81 81
 print '<tbody>';
82 82
 $i = 1;
83
-foreach($airport_airport_array as $airport_item)
83
+foreach ($airport_airport_array as $airport_item)
84 84
 {
85 85
 	print '<tr>';
86 86
 	print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
statistics-callsign.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@  discard block
 block discarded – undo
6 6
 $title = _("Statistics").' - '._("Most common Callsign");
7 7
 
8 8
 if (!isset($filter_name)) $filter_name = '';
9
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
9
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10 10
 if ($airline_icao == 'all') {
11 11
     unset($_COOKIE['stats_airline_icao']);
12
-    setcookie('stats_airline_icao', '', time()-3600);
12
+    setcookie('stats_airline_icao', '', time() - 3600);
13 13
     $airline_icao = '';
14 14
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
15 15
     $airline_icao = $_COOKIE['stats_airline_icao'];
16 16
 } elseif ($airline_icao == '' && isset($globalFilter)) {
17 17
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
18 18
 }
19
-setcookie('stats_airline_icao',$airline_icao);
19
+setcookie('stats_airline_icao', $airline_icao);
20 20
 
21 21
 require_once('header.php');
22 22
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	  </div>
28 28
     	<p>'._("Below are the <strong>Top 10</strong> most common ident/callsigns of all airlines.").'</p>';
29 29
 
30
-$callsign_array = $Stats->countAllCallsigns(true,$airline_icao,$filter_name);
30
+$callsign_array = $Stats->countAllCallsigns(true, $airline_icao, $filter_name);
31 31
 print '<div id="chart" class="chart" width="100%"></div>
32 32
       	<script> 
33 33
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             var data = google.visualization.arrayToDataTable([
37 37
             	["'._("Aircraft").'", "'._("# of times").'"], ';
38 38
 $callsign_data = '';
39
-foreach($callsign_array as $callsign_item)
39
+foreach ($callsign_array as $callsign_item)
40 40
 {
41 41
 	$callsign_data .= '[ "'.$callsign_item['callsign_icao'].' ('.$callsign_item['airline_name'].')",'.$callsign_item['callsign_icao_count'].'],';
42 42
 }
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	print '</thead>';
71 71
 	print '<tbody>';
72 72
 	$i = 1;
73
-	foreach($callsign_array as $callsign_item)
73
+	foreach ($callsign_array as $callsign_item)
74 74
 	{
75 75
 		print '<tr>';
76 76
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
live-czml.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -22,11 +22,11 @@  discard block
 block discarded – undo
22 22
     $s3 = sin($bank/2);
23 23
     $c1c2 = $c1*$c2;
24 24
     $s1s2 = $s1*$s2;
25
-    $w =$c1c2*$c3 - $s1s2*$s3;
26
-    $x =$c1c2*$s3 + $s1s2*$c3;
27
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
28
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
29
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
25
+    $w = $c1c2*$c3 - $s1s2*$s3;
26
+    $x = $c1c2*$s3 + $s1s2*$c3;
27
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
28
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
29
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
30 30
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
31 31
 
32 32
 }
@@ -47,15 +47,15 @@  discard block
 block discarded – undo
47 47
 $min = false;
48 48
 $allhistory = false;
49 49
 $filter['source'] = array();
50
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
51
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
52
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
53
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
54
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
55
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
56
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
57
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
58
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
50
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
51
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
52
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
53
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
54
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
55
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
56
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
57
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
58
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
59 59
 /*
60 60
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
61 61
 	$min = true;
@@ -102,12 +102,12 @@  discard block
 block discarded – undo
102 102
 	$from_archive = true;
103 103
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
104 104
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
105
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
106
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
107
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
108
-	$begindate = date('Y-m-d H:i:s',$begindate);
109
-	$enddate = date('Y-m-d H:i:s',$enddate);
110
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
105
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
106
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
107
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
108
+	$begindate = date('Y-m-d H:i:s', $begindate);
109
+	$enddate = date('Y-m-d H:i:s', $enddate);
110
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
111 111
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
112 112
 	$from_archive = true;
113 113
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
@@ -117,34 +117,34 @@  discard block
 block discarded – undo
117 117
 	$begindate = $_COOKIE['archive_begin'];
118 118
 	$enddate = $_COOKIE['archive_end'];
119 119
 
120
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
121
-	$begindate = date('Y-m-d H:i:s',$begindate);
122
-	$enddate = date('Y-m-d H:i:s',$enddate);
120
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
121
+	$begindate = date('Y-m-d H:i:s', $begindate);
122
+	$enddate = date('Y-m-d H:i:s', $enddate);
123 123
 //	echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
124
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
124
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
125 125
 } else {
126 126
 	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($filter);
127 127
 }
128 128
 
129 129
 if (!empty($spotter_array)) {
130 130
 	if (isset($_GET['archive'])) {
131
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
131
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
132 132
 	} else {
133 133
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
134 134
 	}
135 135
 	if ($flightcnt == '') $flightcnt = 0;
136 136
 } else $flightcnt = 0;
137 137
 
138
-$sqltime = round(microtime(true)-$begintime,2);
138
+$sqltime = round(microtime(true) - $begintime, 2);
139 139
 $minitime = time();
140 140
 $maxitime = 0;
141 141
 
142 142
 
143 143
 $modelsdb = array();
144 144
 if (file_exists('models/modelsdb')) {
145
-	if (($handle = fopen('models/modelsdb','r')) !== FALSE) {
146
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
147
-			if (isset($row[1]) ){
145
+	if (($handle = fopen('models/modelsdb', 'r')) !== FALSE) {
146
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
147
+			if (isset($row[1])) {
148 148
 				$model = $row[0];
149 149
 				$modelsdb[$model] = $row[1];
150 150
 			}
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 $output .= '},';
173 173
 if (!empty($spotter_array) && is_array($spotter_array))
174 174
 {
175
-	foreach($spotter_array as $spotter_item)
175
+	foreach ($spotter_array as $spotter_item)
176 176
 	{
177 177
 		$j++;
178 178
 		date_default_timezone_set('UTC');
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 			$output .= '"cartographicDegrees": [';
311 311
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
312 312
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
313
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
313
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
314 314
 			$output .= $spotter_item['longitude'].', ';
315 315
 			$output .= $spotter_item['latitude'].', ';
316 316
 			$prevlong = $spotter_item['longitude'];
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
323 323
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
324 324
 		} else {
325
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
325
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
326 326
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
327 327
 			if ($spotter_item['ground_speed'] == 0) {
328 328
 				$output .= $prevlong.', ';
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 	$output  = substr($output, 0, -1);
352 352
 }
353 353
 $output .= ']';
354
-$output = str_replace('%minitime%',date("c",$minitime),$output);
355
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
354
+$output = str_replace('%minitime%', date("c", $minitime), $output);
355
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
356 356
 print $output;
357 357
 ?>
Please login to merge, or discard this patch.