Ysurac / FlightAirMap

require/class.SBS.php

Spacing +59 added lines, -59 removed lines

@@ -6,83 +6,83 @@ 
 	// Not yet finished, no CRC checks
 	//echo $buffer."\n";
 	$data = array();
-	$typehex = substr($buffer,0,1);
-	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-	else $hex = substr($buffer,1,-1);
-	$bin = gmp_strval( gmp_init($hex,16), 2);
+	$typehex = substr($buffer, 0, 1);
+	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1, -1);
+	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -13);
+	else $hex = substr($buffer, 1, -1);
+	$bin = gmp_strval(gmp_init($hex, 16), 2);
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 	if (strlen($hex) == 28) {
-	    $df = intval(substr($bin,0,5),2);
+	    $df = intval(substr($bin, 0, 5), 2);
 	    //$ca = intval(substr($bin,5,3),2);
 	    // Only support DF17 for now
 	    //if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
-	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
-		$icao = substr($hex,2,6);
+	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex, $bin) || $typehex == '@')) {
+		$icao = substr($hex, 2, 6);
 		$data['hex'] = $icao;
-		$tc = intval(substr($bin,32,5),2);
+		$tc = intval(substr($bin, 32, 5), 2);
 		if ($tc >= 1 && $tc <= 4) {
 		    //callsign
-		    $csbin = substr($bin,40,56);
+		    $csbin = substr($bin, 40, 56);
 		    $charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
 		    $cs = '';
-		    $cs .= $charset[intval(substr($csbin,0,6),2)];
-		    $cs .= $charset[intval(substr($csbin,6,6),2)];
-		    $cs .= $charset[intval(substr($csbin,12,6),2)];
-		    $cs .= $charset[intval(substr($csbin,18,6),2)];
-		    $cs .= $charset[intval(substr($csbin,24,6),2)];
-		    $cs .= $charset[intval(substr($csbin,30,6),2)];
-		    $cs .= $charset[intval(substr($csbin,36,6),2)];
-		    $cs .= $charset[intval(substr($csbin,42,6),2)];
-		    $cs = str_replace('_','',$cs);
-		    $cs = str_replace('#','',$cs);
+		    $cs .= $charset[intval(substr($csbin, 0, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 6, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 12, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 18, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 24, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 30, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 36, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 42, 6), 2)];
+		    $cs = str_replace('_', '', $cs);
+		    $cs = str_replace('#', '', $cs);
 		    $callsign = $cs;
 		    $data['ident'] = $callsign;
 		} elseif ($tc >= 9 && $tc <= 18) {
 		    // Check Q-bit
-		    $q = substr($bin,47,1);
+		    $q = substr($bin, 47, 1);
 		    if ($q) {
-			$n = intval(substr($bin,40,7).substr($bin,48,4),2);
-			$alt = $n*25-1000;
+			$n = intval(substr($bin, 40, 7).substr($bin, 48, 4), 2);
+			$alt = $n*25 - 1000;
 			$data['altitude'] = $alt;
 		    }
 		    // Check odd/even flag
-		    $oe = substr($bin,53,1);
+		    $oe = substr($bin, 53, 1);
 		    //if ($oe) => odd else even
 		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
-		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
-		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+		    $cprlat = intval(substr($bin, 54, 17), 2)/131072.0;
+		    $cprlon = intval(substr($bin, 71, 17), 2)/131072.0;
+		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat, 'longitude' => $cprlon, 'created' => time());
 		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
 			$cprlon_even = $this::$latlon[$icao]['longitude'];
 		    
-			$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
-			$lat_even = (360.0/60)*($j%60+$cprlat_even);
-			$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
+			$j = 59*$cprlat_even - 60*$cprlat_odd + 0.5;
+			$lat_even = (360.0/60)*($j%60 + $cprlat_even);
+			$lat_odd = (360.0/59)*($j%59 + $cprlat_odd);
 			if ($lat_even >= 270) $lat_even = $lat_even - 360;
 			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
 			// check latitude zone
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 			    if ($this::$latlon[$icao]['created'] > time()) {
-				$ni = $this->cprN($lat_even,0);
-				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
+				$ni = $this->cprN($lat_even, 0);
+				$m = floor($cprlon_even*($this->cprNL($lat_even) - 1) - $cprlon_odd*$this->cprNL($lat_even) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_even);
 				$lat = $lat_even;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 				    $data['latitude'] = $lat;
 				    $data['longitude'] = $lon;
 				}
 			    } else {
-				$ni = $this->cprN($lat_odd,1);
-				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
+				$ni = $this->cprN($lat_odd, 1);
+				$m = floor($cprlon_even*($this->cprNL($lat_odd) - 1) - $cprlon_odd*$this->cprNL($lat_odd) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_odd);
 				$lat = $lat_odd;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 				    $data['latitude'] = $lat;
@@ -94,15 +94,15 @@ 
 		    }
 		} elseif ($tc == 19) {
 		    // speed & heading
-		    $v_ew_dir = intval(substr($bin,45,1));
-		    $v_ew = intval(substr($bin,46,10),2);
-		    $v_ns_dir = intval(substr($bin,56,1));
-		    $v_ns = intval(substr($bin,57,10),2);
+		    $v_ew_dir = intval(substr($bin, 45, 1));
+		    $v_ew = intval(substr($bin, 46, 10), 2);
+		    $v_ns_dir = intval(substr($bin, 56, 1));
+		    $v_ns = intval(substr($bin, 57, 10), 2);
 		    if ($v_ew_dir) $v_ew = -1*$v_ew;
 		    if ($v_ns_dir) $v_ns = -1*$v_ns;
-		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
-		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-		    if ($heading <0) $heading = $heading+360;
+		    $speed = sqrt($v_ns*$v_ns + $v_ew*$v_ew);
+		    $heading = atan2($v_ew, $v_ns)*360.0/(2*pi());
+		    if ($heading < 0) $heading = $heading + 360;
 		    $data['speed'] = $speed;
 		    $data['heading'] = $heading;
 		}
@@ -117,7 +117,7 @@ 
 
 	public function cprNL($lat) {
 	//Lookup table to convert the latitude to index.
-	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
+	if ($lat < 0) $lat = -$lat; // Table is simmetric about the equator.
 	if ($lat < 10.47047130) return 59;
 	if ($lat < 14.82817437) return 58;
 	if ($lat < 18.18626357) return 57;
@@ -179,7 +179,7 @@ 
 	return 1;
     }
     
-    public function cprN($lat,$isodd) {
+    public function cprN($lat, $isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
 	if ($nl > 1) return $nl;
 	else return 1;
@@ -205,10 +205,10 @@ 
 );
 
 	$crc = 0;
-	$checksum = intval(substr($msg,22,6),16);
+	$checksum = intval(substr($msg, 22, 6), 16);
 
 	for ($j = 0; $j < strlen($bin); $j++) {
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j], 0);
 	}
 	if ($crc == $checksum) return true;
 	else {
@@ -227,10 +227,10 @@ 
 	    $msg['aircraftid'] = hexdec($data['address']);
 	    $msg['hex'] = $data['address'];
 	    $msg['flightid'] = hexdec($data['address']);
-	    $msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-	    $msg['date_log'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+	    $msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+	    $msg['date_log'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 	    $msg['callsign'] = $data['ident'];
 	    $msg['altitude'] = '';
 	    $msg['speed'] = '';
@@ -243,7 +243,7 @@ 
 	    $msg['emergency'] = '';
 	    $msg['SPI'] = '';
 	    $msg['ground'] = '';
-    	    $result[] = implode(',',$msg);
+    	    $result[] = implode(',', $msg);
     	}
     	if (isset($data['latitude']) && $data['latitude'] != 0) {
 	    $msg = array();
@@ -253,10 +253,10 @@ 
 	    $msg['aircraftid'] = hexdec($data['address']);
 	    $msg['hex'] = $data['address'];
 	    $msg['flightid'] = hexdec($data['address']);
-	    $msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-	    $msg['date_log'] = date('Y/m/d',$data['timestamp']);
-	    $msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+	    $msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+	    $msg['date_log'] = date('Y/m/d', $data['timestamp']);
+	    $msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 	    $msg['callsign'] = '';
 	    if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
 	    else $msg['altitude'] = '';
@@ -274,7 +274,7 @@ 
 	    $msg['SPI'] = 0;
 	    if (isset($data['ground'])) $msg['ground'] = 1;
 	    else $msg['ground'] = 0;
-    	    $result[] = implode(',',$msg);
+    	    $result[] = implode(',', $msg);
         }
         return $result;
     }

statistics-month.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 	$Tracker = new Tracker();
 }
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -32,20 +32,20 @@ 
 	  </div>
       <p>'._("Below is a chart that plots the busiest day during the <strong>last month</strong>.").'</p>';
 
-if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+if ($type == 'aircraft') $date_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 elseif ($type == 'marine') $date_array = $Marine->countAllDatesLastMonth();
 elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLastMonth();
 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $month_data = '';
 $month_cnt = '';
-foreach($date_array as $month_item)
+foreach ($date_array as $month_item)
 {
 	$month_data .= '"'.$month_item['date_name'].'",';
 	$month_cnt .= $month_item['date_count'].',';
 }
 $month_data = "['x',".substr($month_data, 0, -1)."]";
-$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 print 'c3.generate({
     bindto: "#chart",
     data: { x: "x",
@@ -56,11 +56,11 @@ 
 //$date_array = $Stats->countAllDates();
 if (!empty($date_array))
 {
-	foreach($date_array as $key => $row) {
+	foreach ($date_array as $key => $row) {
 		$years[$key] = $row['date_name'];
 		$counts[$key] = $row['date_count'];
 	}
-	array_multisort($counts,SORT_DESC,$date_array);
+	array_multisort($counts, SORT_DESC, $date_array);
 	print '<div class="table-responsive">';
 	print '<table class="common-date table-striped">';
 	print '<thead>';
@@ -70,13 +70,13 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
 		print '<td>';
-		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>';
-		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>';
+		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>';
+		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>';
 		print '</td>';
 		print '<td>';
 		print $date_item['date_count'];

statistics-year.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -33,19 +33,19 @@ 
 	</div>
       <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>';
 
-if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true);
 elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true);
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $year_data = '';
 $year_cnt = '';
-foreach($date_array as $year_item)
+foreach ($date_array as $year_item)
 {
 	$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 	$year_cnt .= $year_item['date_count'].',';
 }
 $year_data = "['x',".substr($year_data, 0, -1)."]";
-$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 print 'c3.generate({
     bindto: "#chart",
     data: { x: "x",
@@ -68,7 +68,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-date.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
 }
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -33,7 +33,7 @@ 
 	  </div>
       <p>'._("Below is a chart that plots the busiest day during the <strong>last 7 days</strong>.").'</p>';
 
-if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 elseif ($type == 'marine') $date_array = $Marine->countAllDatesLast7Days();
 elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLast7Days();
 if (count($date_array) == 0) {
@@ -42,13 +42,13 @@ 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $date_data = '';
 $date_cnt = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '"'.$date_item['date_name'].'",';
 	$date_cnt .= $date_item['date_count'].',';
 }
 $date_data = "['x',".substr($date_data, 0, -1)."]";
-$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
+$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
 print 'c3.generate({
     bindto: "#chart",
     data: { x: "x",
@@ -57,11 +57,11 @@ 
 print '</script>';
 }
 if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) {
-	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>';
+	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>';
 } else {
 	print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>';
 }
-if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao,$filter_name);
+if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao, $filter_name);
 elseif ($type == 'marine') $date_array = $Marine->countAllDates();
 elseif ($type == 'tracker') $date_array = $Tracker->countAllDates();
 if (!empty($date_array))
@@ -75,7 +75,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-aircraft.php

Spacing +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@ 
 $title = _("Statistics").' - '._("Most common Aircraft");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -23,10 +23,10 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common aircraft types.").'</p>';
 	  
-$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $aircraft_data = '';
-foreach($aircraft_array as $aircraft_item)
+foreach ($aircraft_array as $aircraft_item)
 {
 	if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 	else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
@@ -52,7 +52,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($aircraft_array as $aircraft_item)
+	foreach ($aircraft_array as $aircraft_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

atc-data.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
 $ATC = new ATC();
 
 if (isset($_GET['atcid'])) {
-	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
-	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
+	$atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT);
+	$atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
 	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
  ?>
@@ -38,7 +38,7 @@ 
 print '</div>';
 
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>';
 if ($spotter_item['atc_range'] > 0) {
     print '<div><span>'._("Range").'</span>';
     print $spotter_item['atc_range'];

table-output.php

Spacing +47 added lines, -47 removed lines

@@ -4,8 +4,8 @@ 
 
 require_once(dirname(__FILE__).'/require/class.Common.php');
 $Common = new Common();
-$showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
-$showDuration = $Common->multiKeyExists($spotter_array,'duration');
+$showRouteStop = $Common->multiKeyExists($spotter_array, 'route_stop');
+$showDuration = $Common->multiKeyExists($spotter_array, 'duration');
 
 if (!isset($type)) $type = 'aircraft';
 
@@ -106,7 +106,7 @@ 
 	}
 	print '<th class="more"></th>';
 	print '</thead>';
-} else if (strtolower($current_page) == "upcoming"){
+} else if (strtolower($current_page) == "upcoming") {
 	print '<thead>';
 	if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
 		if ($_GET['sort'] == "airline_name_asc")
@@ -160,7 +160,7 @@ 
 	}
 	*/
 	print '</thead>';
-} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){
+} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 	print '<thead>';
 	print '<th class="aircraft_thumbnail"></th>';
 	print '<th class="logo">'._("Airline").'</th>';
@@ -197,7 +197,7 @@ 
 	print '</thead>';
 } else {
 
-	if ($hide_th_links === true){
+	if ($hide_th_links === true) {
 		print '<thead>';
 		print '<th class="aircraft_thumbnail"></th>';
 		if ($type == 'aircraft') {
@@ -454,7 +454,7 @@ 
 }
 
 print '<tbody>'."\n";
-foreach($spotter_array as $spotter_item)
+foreach ($spotter_array as $spotter_item)
 {
 	if (isset($globalTimezone))
 	{
@@ -489,13 +489,13 @@ 
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 					}
 					if (isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} else {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					}
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+						$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 					if (isset($spotter_item['airline_name'])) {
 						print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -514,7 +514,7 @@ 
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -532,7 +532,7 @@ 
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -576,7 +576,7 @@ 
 				print '</td>'."\n";
 			}
 		}
-	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
+	} elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed") {
 		if ($type == 'aircraft') {
 			if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
 			    $spotter_item['squawk'] = '-';
@@ -593,17 +593,17 @@ 
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 					}
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} else {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					}
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+						$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 						print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -636,7 +636,7 @@ 
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -650,7 +650,7 @@ 
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -759,7 +759,7 @@ 
 		print '</td>'."\n";
 	}
 	// Aircraft type
-	if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){
+	if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") {
 		print '<td class="type">'."\n";
 		if ($type == 'aircraft') {
 			if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) {
@@ -810,22 +810,22 @@ 
 			}
 			if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 				if ($spotter_item['departure_airport_time'] > 2460) {
-					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-				} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+					$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
+				} else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
-					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+					$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 				print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 			} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
-					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+					$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 				print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
-					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
+					$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
 				} else {
-					$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+					$departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 				}
 				print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n";
 			}
@@ -840,7 +840,7 @@ 
 						$latitude = $spotter_item['latitude'];
 						$longitude = $spotter_item['longitude'];
 					}
-					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
+					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude);
 				} else $distance = '';
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -883,20 +883,20 @@ 
 			}
 			if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
-					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+					$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
-					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+					$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 			} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
-					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+					$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
-					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+					$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 			}
@@ -909,7 +909,7 @@ 
 						$latitude = $spotter_item['latitude'];
 						$longitude = $spotter_item['longitude'];
 					}
-					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
+					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude);
 				} else $distance = '';
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -952,19 +952,19 @@ 
 				print '<span class="mobile">-</span>'."\n";
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-					print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n";
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n";
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n";
 				}
 			}
 			print '</td>'."\n";
 		}
-		if(strtolower($current_page) != "upcoming"){
+		if (strtolower($current_page) != "upcoming") {
 			if ($type == 'aircraft') {
 				//if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 				if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
@@ -1007,7 +1007,7 @@ 
 		
 		if ($showRouteStop) {
 		// Route stop
-			if(strtolower($current_page) != "upcoming"){
+			if (strtolower($current_page) != "upcoming") {
 				print '<td class="route_stop">'."\n";
 				if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') {
 					print '<span class="nomobile">-</span>'."\n";
@@ -1026,11 +1026,11 @@ 
 		}
 		if ($showDuration) {
 		// Duration
-			if(strtolower($current_page) != "upcoming"){
+			if (strtolower($current_page) != "upcoming") {
 				print '<td class="duration">'."\n";
 				if (isset($spotter_item['duration'])) {
-					print '<span class="nomobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n";
-					print '<span class="mobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n";
+					print '<span class="nomobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n";
+					print '<span class="mobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n";
 				} else {
 					print '<span class="nomobile">-</span>'."\n";
 					print '<span class="mobile">-</span>'."\n";
@@ -1043,7 +1043,7 @@ 
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 		if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') {
 			print '<td class="message"><p>'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</p><p class="decode">';
 			$decode_array = json_decode($spotter_item['decode']);
 			foreach ($decode_array as $key => $value) {
@@ -1053,7 +1053,7 @@ 
 			print '</td>'."\n";
 		} else {
 			print '<td class="message">'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</td>'."\n";
 		}
 	}
@@ -1078,7 +1078,7 @@ 
 		}
 		print '</td>'."\n";
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 	if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") {
@@ -1104,7 +1104,7 @@ 
 		print '</td>'."\n";
 		*/
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 

js/map.2d.js.php

Spacing +13 added lines, -13 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
 // Compressed GeoJson is used if true
@@ -20,10 +20,10 @@ 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 	else $enddate = time();
-	setcookie("archive_begin",$begindate);
-	setcookie("archive_end",$enddate);
-	setcookie("archive_update",$lastupd);
-	setcookie("archive_speed",$archivespeed);
+	setcookie("archive_begin", $begindate);
+	setcookie("archive_end", $enddate);
+	setcookie("archive_update", $lastupd);
+	setcookie("archive_speed", $archivespeed);
 ?>
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -74,16 +74,16 @@ 
 <?php
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['flightaware_id'])) {
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -119,7 +119,7 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
 	}
@@ -213,19 +213,19 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);

require/class.GeoidHeight.php

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
 * by Ycarus <ycarus@zugaina.org> in 2017
 */
-class GeoidHeight  {
+class GeoidHeight {
 	private $c0 = 240;
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
 	private $c0n = 372;
@@ -34,7 +34,7 @@ 
 	private $v10 = null;
 	private $v11 = null;
 
-	public function __construct($name='') {
+	public function __construct($name = '') {
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
@@ -42,35 +42,35 @@ 
 			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
 		}
 
-		$f = @fopen($name,"r");
+		$f = @fopen($name, "r");
 		if ($f === FALSE) {
 			throw new Exception("Can't open ".$name);
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		if (trim($line) != 'P5') {
 			throw new Exception('No PGM header');
 		}
 		$headerlen = strlen($line);
 		while (true) {
-			$line = fgets($f,4096);
+			$line = fgets($f, 4096);
 			if ((strlen($line) == 0)) {
 				throw new Exception('EOF before end of file header');
 			}
 			$headerlen += strlen($line);
-			if (strpos($line,'# Offset ') !== FALSE) {
+			if (strpos($line, '# Offset ') !== FALSE) {
 				$this->offset = substr($line, 9);
-			} else if (strpos($line,'# Scale ') !== FALSE) {
+			} else if (strpos($line, '# Scale ') !== FALSE) {
 				$this->scale = substr($line, 8);
-			} else if ((strpos($line,'#') === FALSE)) {
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
+			} else if ((strpos($line, '#') === FALSE)) {
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
 				break;
 			}
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		$headerlen += strlen($line);
-		$levels = (int)$line;
-		$this->width = (int)$this->width;
-		$this->height = (int)$this->height;
+		$levels = (int) $line;
+		$this->width = (int) $this->width;
+		$this->height = (int) $this->height;
 		if (($levels != 65535)) {
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
 		}
@@ -85,42 +85,42 @@ 
 		}
 
 		$fullsize = filesize($name);
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
 			throw new Exception('File has the wrong length');
 		}
 
 		$this->headerlen = $headerlen;
-		$this->raw= $f;
-		$this->rlonres = ($this->width / 360.0);
-		$this->rlatres = (($this->height - 1) / 180.0);
+		$this->raw = $f;
+		$this->rlonres = ($this->width/360.0);
+		$this->rlatres = (($this->height - 1)/180.0);
 	}
 
-	private function _rawval($ix,$iy) {
+	private function _rawval($ix, $iy) {
 		if (($iy < 0)) {
 			$iy = -$iy;
-			$ix += ($this->width / 2);
+			$ix += ($this->width/2);
 		} else if (($iy >= $this->height)) {
-			$iy = ((2 * ($this->height - 1)) - $iy);
-			$ix += ($this->width / 2);
+			$iy = ((2*($this->height - 1)) - $iy);
+			$ix += ($this->width/2);
 		}
 		if (($ix < 0)) {
 			$ix += $this->width;
 		} else if (($ix >= $this->width)) {
 			$ix -= $this->width;
 		}
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
-		fseek($this->raw,$k);
-		return unpack('n',fread($this->raw,2))[1];
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
+		fseek($this->raw, $k);
+		return unpack('n', fread($this->raw, 2))[1];
 	}
 
-	public function get($lat,$lon,$cubic=true) {
+	public function get($lat, $lon, $cubic = true) {
 		if (($lon < 0)) {
 			$lon += 360;
 		}
-		$fy = ((90 - $lat) * $this->rlatres);
-		$fx = ($lon * $this->rlonres);
-		$iy = (int)$fy;
-		$ix = (int)$fx;
+		$fy = ((90 - $lat)*$this->rlatres);
+		$fx = ($lon*$this->rlonres);
+		$iy = (int) $fy;
+		$ix = (int) $fx;
 		$fx -= $ix;
 		$fy -= $iy;
 		$t = array();
@@ -147,7 +147,7 @@ 
 					$c3x = $this->c3;
 					$c0x = $this->c0;
 				}
-				for ($i = 0; $i < 10;++$i) {
+				for ($i = 0; $i < 10; ++$i) {
 					$t[$i] = 0;
 					for ($j = 0; $j < 12; ++$j) {
 						$t[$i] += $v[$j]*$c3x[$j][$i];
@@ -158,13 +158,13 @@ 
 			$this->t = $t;
 		} else $t = $this->t;
 		if (!($cubic)) {
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
-			$h = (((1 - $fy) * $a) + ($fy * $b));
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
+			$h = (((1 - $fy)*$a) + ($fy*$b));
 		} else {
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
 		}
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
 	}
 }
 /*