Inspection of "Add an option to not display location, reset to NO..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( e37ce2...f4833e )

by Yannick

created 2017-05-24 20:25 UTC

Status

Spacing +37 added lines, -37 removed lines patch added patch discarded remove patch

@@ -48,11 +48,11 @@  discard block
 block discarded – undo
     $s3 = sin($bank/2);
     $c1c2 = $c1*$c2;
     $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+    $w = $c1c2*$c3 - $s1s2*$s3;
+    $x = $c1c2*$s3 + $s1s2*$c3;
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
@@ -73,16 +73,16 @@  discard block
 block discarded – undo
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
 	$begindate = $_COOKIE['archive_begin'];
 	$enddate = $_COOKIE['archive_end'];
 
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
 //	echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($tracker) {
 	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($filter);
 } elseif ($marine) {
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
 //print_r($spotter_array);
 if (!empty($spotter_array)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} elseif ($tracker) {
 		$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
 	} elseif ($marine) {
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 $minitime = time();
 $maxitime = 0;
 
 
 $modelsdb = array();
 if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb[$model] = $row[1];
 			}
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
 			$output .= '"cartographicDegrees": [';
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'];
 			$prevlong = $spotter_item['longitude'];
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
@@ -593,9 +593,9 @@  discard block
 block discarded – undo
 }
 $output .= ']';
 if (isset($globalArchive) && $globalArchive === TRUE) {
-		if (time()-$globalLiveInterval < $minitime) $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
-		else $output = str_replace('%minitime%',date("c",$minitime),$output);
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
+		if (time() - $globalLiveInterval < $minitime) $output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
+		else $output = str_replace('%minitime%', date("c", $minitime), $output);
+} else $output = str_replace('%minitime%', date("c", $minitime), $output);
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
 print $output;
 ?>

Please login to merge, or discard this patch.

location-geojson.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 if (!isset($globalDemo)) {
 	if (isset($_GET['coord'])) 
 	{
-		$coords = explode(',',$_GET['coord']);
+		$coords = explode(',', $_GET['coord']);
 //		$spotter_array = Source::getAllLocationInfobyCoord($coords);
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array) && count($spotter_array) > 0)
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 		    $output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 

Please login to merge, or discard this patch.

		@@ -48,11 +48,11 @@ discard block
		block discarded – undo
48	48	$s3 = sin($bank/2);
49	49	$c1c2 = $c1*$c2;
50	50	$s1s2 = $s1*$s2;
51		- $w =$c1c2$c3 - $s1s2$s3;
52		- $x =$c1c2$s3 + $s1s2$c3;
53		- $y =$s1$c2$c3 + $c1$s2$s3;
54		- $z =$c1$s2$c3 - $s1$c2$s3;
55		- return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
	51	+ $w = $c1c2$c3 - $s1s2$s3;
	52	+ $x = $c1c2$s3 + $s1s2$c3;
	53	+ $y = $s1$c2$c3 + $c1$s2$s3;
	54	+ $z = $c1$s2$c3 - $s1$c2$s3;
	55	+ return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
56	56	// return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
57	57
58	58	}
		@@ -73,16 +73,16 @@ discard block
		block discarded – undo
73	73	$min = false;
74	74	$allhistory = false;
75	75	$filter['source'] = array();
76		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
77		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
78		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
79		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
80		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
81		-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
82		-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
83		-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
84		-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
85		-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
	76	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
	77	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
	78	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
	79	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
	80	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
	81	+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
	82	+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
	83	+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
	84	+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
	85	+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
86	86	/*
87	87	if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
88	88	$min = true;
		@@ -129,12 +129,12 @@ discard block
		block discarded – undo
129	129	$from_archive = true;
130	130	// $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
131	131	// $enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
132		- $begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
133		- $enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
134		- $archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
135		- $begindate = date('Y-m-d H:i:s',$begindate);
136		- $enddate = date('Y-m-d H:i:s',$enddate);
137		- $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
	132	+ $begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
	133	+ $enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
	134	+ $archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
	135	+ $begindate = date('Y-m-d H:i:s', $begindate);
	136	+ $enddate = date('Y-m-d H:i:s', $enddate);
	137	+ $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
138	138	} elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
139	139	$from_archive = true;
140	140	// $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
		@@ -144,11 +144,11 @@ discard block
		block discarded – undo
144	144	$begindate = $_COOKIE['archive_begin'];
145	145	$enddate = $_COOKIE['archive_end'];
146	146
147		- $archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
148		- $begindate = date('Y-m-d H:i:s',$begindate);
149		- $enddate = date('Y-m-d H:i:s',$enddate);
	147	+ $archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
	148	+ $begindate = date('Y-m-d H:i:s', $begindate);
	149	+ $enddate = date('Y-m-d H:i:s', $enddate);
150	150	// echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
151		- $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
	151	+ $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
152	152	} elseif ($tracker) {
153	153	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($filter);
154	154	} elseif ($marine) {
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	//print_r($spotter_array);
160	160	if (!empty($spotter_array)) {
161	161	if (isset($_GET['archive'])) {
162		- $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
	162	+ $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
163	163	} elseif ($tracker) {
164	164	$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
165	165	} elseif ($marine) {
		@@ -170,16 +170,16 @@ discard block
		block discarded – undo
170	170	if ($flightcnt == '') $flightcnt = 0;
171	171	} else $flightcnt = 0;
172	172
173		-$sqltime = round(microtime(true)-$begintime,2);
	173	+$sqltime = round(microtime(true) - $begintime, 2);
174	174	$minitime = time();
175	175	$maxitime = 0;
176	176
177	177
178	178	$modelsdb = array();
179	179	if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
180		- if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
181		- while (($row = fgetcsv($handle,1000)) !== FALSE) {
182		- if (isset($row[1]) ){
	180	+ if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
	181	+ while (($row = fgetcsv($handle, 1000)) !== FALSE) {
	182	+ if (isset($row[1])) {
183	183	$model = $row[0];
184	184	$modelsdb[$model] = $row[1];
185	185	}
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	$output .= '},';
216	216	if (!empty($spotter_array) && is_array($spotter_array))
217	217	{
218		- foreach($spotter_array as $spotter_item)
	218	+ foreach ($spotter_array as $spotter_item)
219	219	{
220	220	$j++;
221	221	if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
		@@ -540,7 +540,7 @@ discard block
		block discarded – undo
540	540	$output .= '"cartographicDegrees": [';
541	541	if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
542	542	if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
543		- $output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
	543	+ $output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
544	544	$output .= $spotter_item['longitude'].', ';
545	545	$output .= $spotter_item['latitude'];
546	546	$prevlong = $spotter_item['longitude'];
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
560	560	//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
561	561	} else {
562		- $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
	562	+ $output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
563	563	if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
564	564	if ($spotter_item['ground_speed'] == 0) {
565	565	$output .= $prevlong.', ';
		@@ -593,9 +593,9 @@ discard block
		block discarded – undo
593	593	}
594	594	$output .= ']';
595	595	if (isset($globalArchive) && $globalArchive === TRUE) {
596		- if (time()-$globalLiveInterval < $minitime) $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
597		- else $output = str_replace('%minitime%',date("c",$minitime),$output);
598		-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
599		-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
	596	+ if (time() - $globalLiveInterval < $minitime) $output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
	597	+ else $output = str_replace('%minitime%', date("c", $minitime), $output);
	598	+} else $output = str_replace('%minitime%', date("c", $minitime), $output);
	599	+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
600	600	print $output;
601	601	?>

		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13	if (!isset($globalDemo)) {
14	14	if (isset($_GET['coord']))
15	15	{
16		- $coords = explode(',',$_GET['coord']);
	16	+ $coords = explode(',', $_GET['coord']);
17	17	// $spotter_array = Source::getAllLocationInfobyCoord($coords);
18	18	if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true')
19	19	\|\| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) \|\| $globalMapGroundStation === TRUE))) {
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	$output = '{"type": "FeatureCollection","features": [';
35	35	if (!empty($spotter_array) && count($spotter_array) > 0)
36	36	{
37		- foreach($spotter_array as $spotter_item)
	37	+ foreach ($spotter_array as $spotter_item)
38	38	{
39	39	date_default_timezone_set('UTC');
40	40	//waypoint plotting
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	$output .= '}';
63	63	$output .= '},';
64	64	}
65		- $output = substr($output, 0, -1);
	65	+ $output = substr($output, 0, -1);
66	66	}
67	67	$output .= ']}';
68	68

Ysurac / FlightAirMap

Push — master ( e37ce2...f4833e )

Status

Category

Spacing +37 added lines, -37 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch