Ysurac / FlightAirMap

require/class.Image.php

Indentation +102 added lines, -102 removed lines

@@ -12,11 +12,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the aircraft registration
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -37,11 +37,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the ship name
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the ship name
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getMarineImage($mmsi,$imo = '',$name = '')
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
@@ -68,11 +68,11 @@ 
 	}
 
 	/**
-	* Gets the image copyright based on the Exif data
-	*
-	* @return String image copyright
-	*
-	*/
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @return String image copyright
+	 *
+	 */
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
@@ -87,11 +87,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the aircraft registration
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
@@ -119,11 +119,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the marine name
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the marine name
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch;
@@ -160,12 +160,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft image
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
@@ -209,14 +209,14 @@ 
 	}
 
 	/**
-	* Gets the vessel image
-	*
-	* @param String $mmsi the vessel mmsi
-	* @param String $imo the vessel imo
-	* @param String $name the vessel name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the vessel image
+	 *
+	 * @param String $mmsi the vessel mmsi
+	 * @param String $imo the vessel imo
+	 * @param String $name the vessel name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalMarineImageSources;
@@ -250,13 +250,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Planespotters
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -283,13 +283,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Deviantart
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromDeviantart($type,$registration, $name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -321,13 +321,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from JetPhotos
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
@@ -363,13 +363,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from PlanePictures
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
@@ -397,13 +397,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Flickr
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -446,13 +446,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Bing
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
@@ -478,13 +478,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from airport-data
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromAirportData($type,$aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
@@ -503,13 +503,13 @@ 
 	}
 
 	/**
-	* Gets image from WikiMedia
-	*
-	* @param String $registration the registration of the aircraft/mmsi
-	* @param String $name name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets image from WikiMedia
+	 *
+	 * @param String $registration the registration of the aircraft/mmsi
+	 * @param String $name name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -564,13 +564,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from custom url
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromCustomSource($type,$registration,$name='') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

require/class.SBS.php

Indentation +130 added lines, -130 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 class SBS {
-    static $latlon = array();
+	static $latlon = array();
     
-    public function parse($buffer) {
+	public function parse($buffer) {
 	// Not yet finished, no CRC checks
 	//echo $buffer."\n";
 	$data = array();
@@ -13,47 +13,47 @@ 
 	$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);
-	    //$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 == '@')) {
+		$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);
 		$data['hex'] = $icao;
 		$tc = intval(substr($bin,32,5),2);
 		if ($tc >= 1 && $tc <= 4) {
-		    //callsign
-		    $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);
-		    $callsign = $cs;
-		    $data['ident'] = $callsign;
+			//callsign
+			$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);
+			$callsign = $cs;
+			$data['ident'] = $callsign;
 		} elseif ($tc >= 9 && $tc <= 18) {
-		    // Check Q-bit
-		    $q = substr($bin,47,1);
-		    if ($q) {
+			// Check Q-bit
+			$q = substr($bin,47,1);
+			if ($q) {
 			$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);
-		    //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());
-		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+			}
+			// Check odd/even flag
+			$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());
+			elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -66,53 +66,53 @@ 
 			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()) {
+				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);
 				$lat = $lat_even;
 				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;
+					//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
+					$data['latitude'] = $lat;
+					$data['longitude'] = $lon;
 				}
-			    } else {
+				} 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);
 				$lat = $lat_odd;
 				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;
-				    $data['longitude'] = $lon;
+					//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
+					$data['latitude'] = $lat;
+					$data['longitude'] = $lon;
+				}
 				}
-			    }
 			} else echo "Not cprNL";
 			unset($this::$latlon[$icao]);
-		    }
+			}
 		} 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);
-		    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;
-		    $data['speed'] = $speed;
-		    $data['heading'] = $heading;
+			// 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);
+			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;
+			$data['speed'] = $speed;
+			$data['heading'] = $heading;
+		}
 		}
-	    }
-	    if (isset($data)) {
+		if (isset($data)) {
 		//print_r($data);
 		return $data;
-	    }
-        }
-    }
+		}
+		}
+	}
 
 
 	public function cprNL($lat) {
@@ -177,16 +177,16 @@ 
 	if ($lat < 86.53536998) return 3;
 	if ($lat < 87.00000000) return 2;
 	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;
-    }
+	}
 
 
-    function parityCheck($msg, $bin) {
+	function parityCheck($msg, $bin) {
 $modes_checksum_table = array(
 0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
 0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
@@ -208,75 +208,75 @@ 
 	$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 {
-	    //echo "**** CRC ERROR ****\n";
-	    return false;
+		//echo "**** CRC ERROR ****\n";
+		return false;
+	}
 	}
-    }
     
-    public function famaprs_to_basestation($data) {
+	public function famaprs_to_basestation($data) {
 	$result = array();
-        if (isset($data['ident']) && $data['ident'] != '') {
-	    $msg = array();
-	    $msg['msg_type'] = 'MSG';
-	    $msg['transmission_type'] = 1;
-	    $msg['session_id'] = 5;
-	    $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['callsign'] = $data['ident'];
-	    $msg['altitude'] = '';
-	    $msg['speed'] = '';
-	    $msg['track'] = '';
-	    $msg['latitude'] = '';
-	    $msg['longitude'] = '';
-	    $msg['verticalrate'] = '';
-	    $msg['squawk'] = '';
-	    $msg['alert'] = '';
-	    $msg['emergency'] = '';
-	    $msg['SPI'] = '';
-	    $msg['ground'] = '';
-    	    $result[] = implode(',',$msg);
-    	}
-    	if (isset($data['latitude']) && $data['latitude'] != 0) {
-	    $msg = array();
-	    $msg['msg_type'] = 'MSG';
-	    $msg['transmission_type'] = 2;
-	    $msg['session_id'] = 5;
-	    $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['callsign'] = '';
-	    if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
-	    else $msg['altitude'] = '';
-	    $msg['speed'] = $data['speed'];
-	    if (isset($data['heading'])) $msg['track'] = $data['heading'];
-	    else $msg['track'] = '';
-	    $msg['latitude'] = $data['latitude'];
-	    $msg['longitude'] = $data['longitude'];
-	    if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
-	    else $msg['verticalrate'] = '';
-	    if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
-	    else $msg['squawk'] = 0;
-	    $msg['alert'] = 0;
-	    $msg['emergency'] = 0;
-	    $msg['SPI'] = 0;
-	    if (isset($data['ground'])) $msg['ground'] = 1;
-	    else $msg['ground'] = 0;
-    	    $result[] = implode(',',$msg);
-        }
-        return $result;
-    }
+		if (isset($data['ident']) && $data['ident'] != '') {
+		$msg = array();
+		$msg['msg_type'] = 'MSG';
+		$msg['transmission_type'] = 1;
+		$msg['session_id'] = 5;
+		$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['callsign'] = $data['ident'];
+		$msg['altitude'] = '';
+		$msg['speed'] = '';
+		$msg['track'] = '';
+		$msg['latitude'] = '';
+		$msg['longitude'] = '';
+		$msg['verticalrate'] = '';
+		$msg['squawk'] = '';
+		$msg['alert'] = '';
+		$msg['emergency'] = '';
+		$msg['SPI'] = '';
+		$msg['ground'] = '';
+			$result[] = implode(',',$msg);
+		}
+		if (isset($data['latitude']) && $data['latitude'] != 0) {
+		$msg = array();
+		$msg['msg_type'] = 'MSG';
+		$msg['transmission_type'] = 2;
+		$msg['session_id'] = 5;
+		$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['callsign'] = '';
+		if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
+		else $msg['altitude'] = '';
+		$msg['speed'] = $data['speed'];
+		if (isset($data['heading'])) $msg['track'] = $data['heading'];
+		else $msg['track'] = '';
+		$msg['latitude'] = $data['latitude'];
+		$msg['longitude'] = $data['longitude'];
+		if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
+		else $msg['verticalrate'] = '';
+		if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
+		else $msg['squawk'] = 0;
+		$msg['alert'] = 0;
+		$msg['emergency'] = 0;
+		$msg['SPI'] = 0;
+		if (isset($data['ground'])) $msg['ground'] = 1;
+		else $msg['ground'] = 0;
+			$result[] = implode(',',$msg);
+		}
+		return $result;
+	}
 }
 ?>

statistics-country.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 }
 $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];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 
 require_once('header.php');

statistics-sub-menu.php

Indentation +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 ?>
 	</div>
 <?php 
-    if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
+	if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -95,7 +95,7 @@ 
 		    </ul>
 		</li>
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
@@ -107,7 +107,7 @@ 
 		    </ul>
 		</li>
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -127,7 +127,7 @@ 
 	</ul>
 </div>
 <?php
-    } else {
+	} else {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -189,7 +189,7 @@ 
 		</li>
 		-->
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<!--
 		<li class="dropdown">
@@ -203,7 +203,7 @@ 
 		</li>
 		-->
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -224,5 +224,5 @@ 
 	</ul>
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file

atc-data.php

Indentation +6 added lines, -6 removed lines

@@ -40,15 +40,15 @@
 //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>';
 if ($spotter_item['atc_range'] > 0) {
-    print '<div><span>'._("Range").'</span>';
-    print $spotter_item['atc_range'];
-    print '</div>';
+	print '<div><span>'._("Range").'</span>';
+	print $spotter_item['atc_range'];
+	print '</div>';
 }
 print '</div>';
 if ($spotter_item['info'] != '') {
-    print '<div class="notamtext"><span>'._("Info").'</span>';
-    print $spotter_item['info'];
-    print '</div>';
+	print '<div class="notamtext"><span>'._("Info").'</span>';
+	print $spotter_item['info'];
+	print '</div>';
 }
 print '</div>';
 }

atc-geojson.php

Indentation +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ref": "'.$spotter_item['atc_id'].'",';
 			$output .= '"ident": "'.$spotter_item['ident'].'",';
 			$output .= '"frequency": "'.$spotter_item['frequency'].'",';
@@ -50,18 +50,18 @@ 
 			} else {
 				$output .= '"icon": "images/atc.png"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 		$radius = $spotter_item['atc_range']*100;
 		if ($radius > 0) {
 			$output .= '{"type": "Feature",';
-			    $output .= '"properties": {';
+				$output .= '"properties": {';
 				$output .= '"ref": "'.$spotter_item['atc_id'].'",';
 				$output .= '"ident": "'.$spotter_item['ident'].'",';
 				$output .= '"frequency": "'.$spotter_item['frequency'].'",';
@@ -87,13 +87,13 @@ 
 				} else {
 					$output .= '"atccolor": "#888219"';
 				}
-			    $output .= '},';
-			    $output .= '"geometry": {';
+				$output .= '},';
+				$output .= '"geometry": {';
 				$output .= '"type": "Point",';
 				$output .= '"coordinates": [';
-				    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+					$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 				$output .= ']';
-			    $output .= '}';
+				$output .= '}';
 			$output .= '},';
 		}
 	}

live-geojson.php

Indentation +63 added lines, -63 removed lines

@@ -5,23 +5,23 @@ 
 $marine = false;
 $usecoord = false;
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -41,10 +41,10 @@ 
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -498,17 +498,17 @@ 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
+					) {
 					if ($tracker) {
 						if ($from_archive || $globalArchive) {
 							$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
@@ -597,65 +597,65 @@ 
 				}
 				
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['departure_airport']) 
-				        && $spotter_item['departure_airport'] != 'NA' 
-				        && isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['departure_airport']) 
+						&& $spotter_item['departure_airport'] != 'NA' 
+						&& isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
+					if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
 					}
-				    }
-				    $output_air  = substr($output_air, 0, -1);
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air  = substr($output_air, 0, -1);
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute) 
-				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
-				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute) 
+							|| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
+					$havedata = false;
+					if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
 					$havedata = true;
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
-					    $havedata = true;
+						$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$havedata = true;
 					}
-				    }
-				    //$output_dest  = substr($output_dest, 0, -1);
-				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
-				    unset($output_dest);
+					}
+					//$output_dest  = substr($output_dest, 0, -1);
+					$output_dest .= ']}},';
+					if ($havedata) $output .= $output_dest;
+					unset($output_dest);
 				}
 			}
 			$output  = substr($output, 0, -1);

table-output.php

Indentation +3 added lines, -3 removed lines

@@ -277,7 +277,7 @@ 
 				print '<th class="arrival"><span class="nomobile">'._("Going to").'</span><span class="mobile">'._("To").'</span></th>';
 			}
 		}
-    		if ($type == 'aircraft') {
+			if ($type == 'aircraft') {
 			if ((isset($globalUsePilot) && $globalUsePilot) || (!isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalVAM) && $globalVAM) || (isset($globalphpVMS) && $globalphpVMS)))) {
 				print '<th class="pilot"><span class="nomobile">'._("Pilot name").'</span><span class="mobile">'._("Pilot").'</span></a></th>';
 			}
@@ -579,7 +579,7 @@ 
 	} 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'] = '-';
+				$spotter_item['squawk'] = '-';
 			}
 			if ($spotter_item['image_thumbnail'] != "")
 			{
@@ -618,7 +618,7 @@ 
 				print '</td>'."\n";
 			} else {
 				print '<td class="aircraft_thumbnail">'."\n";
-	       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
+		   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 		//}
 				if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" 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:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";

tracker-data.php

Indentation +9 added lines, -9 removed lines

@@ -78,10 +78,10 @@ 
 print '<div class="details">';
 print '<div><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
-    try {
+	try {
 	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-    } catch(Exception $e) {
-    }
+	} catch(Exception $e) {
+	}
 }
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
 	print $spotter_item['altitude'].' feet (FL'.$spotter_item['altitude'].')';
@@ -89,14 +89,14 @@ 
 	print round($spotter_item['altitude']*0.3048).' m (FL'.round($spotter_item['altitude']/100).')';
 }
 if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*0.3048) {
-    print '<br>';
-    print '<span>'._("Ground Altitude").'</span>';
-    if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	print '<br>';
+	print '<span>'._("Ground Altitude").'</span>';
+	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
 	print round($groundAltitude*3.28084).' feet';
-    } else {
+	} else {
 	print round($groundAltitude).' m';
-    }
-    print '</i>';
+	}
+	print '</i>';
 }
 print '</div>';
 print '<div><span>'._("Speed").'</span>';