Ysurac / FlightAirMap

require/class.AIS.php

Spacing +129 added lines, -129 removed lines

@@ -117,31 +117,31 @@ 
 
 	private function make_latf($temp) { // unsigned long 
 		$flat = 0.0; // float
-		$temp = $temp & 0x07FFFFFF;
-		if ($temp & 0x04000000) {
-			$temp = $temp ^ 0x07FFFFFF;
+		$temp = $temp&0x07FFFFFF;
+		if ($temp&0x04000000) {
+			$temp = $temp^0x07FFFFFF;
 			$temp += 1;
-			$flat = (float)($temp / (60.0 * 10000.0));
+			$flat = (float) ($temp/(60.0*10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else $flat = (float) ($temp/(60.0*10000.0));
 		return $flat; // float
 	}
 
 	private function make_lonf($temp) { // unsigned long
 		$flon = 0.0; // float
-		$temp = $temp & 0x0FFFFFFF;
-		if ($temp & 0x08000000) {
-			$temp = $temp ^ 0x0FFFFFFF;
+		$temp = $temp&0x0FFFFFFF;
+		if ($temp&0x08000000) {
+			$temp = $temp^0x0FFFFFFF;
 			$temp += 1;
-			$flon = (float)($temp / (60.0 * 10000.0));
+			$flon = (float) ($temp/(60.0*10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else $flon = (float) ($temp/(60.0*10000.0));
 		return $flon;
 	}
 
 	private function ascii_2_dec($chr) {
-		$dec=ord($chr);//get decimal ascii code
-		$hex=dechex($dec);//convert decimal to hex
+		$dec = ord($chr); //get decimal ascii code
+		$hex = dechex($dec); //convert decimal to hex
 		return ($dec);
 	}
 	
@@ -160,15 +160,15 @@ 
 		//only process in the following range: 48-87, 96-119
 		if ($ascii < 48) { }
 		else {
-			if($ascii>119) { }
+			if ($ascii > 119) { }
 			else {
-				if ($ascii>87 && $ascii<96) ;
+				if ($ascii > 87 && $ascii < 96);
 				else {
-					$ascii=$ascii+40;
-					if ($ascii>128){
-						$ascii=$ascii+32;
+					$ascii = $ascii + 40;
+					if ($ascii > 128) {
+						$ascii = $ascii + 32;
 					} else {
-						$ascii=$ascii+40;
+						$ascii = $ascii + 40;
 					}
 				}
 			}
@@ -177,7 +177,7 @@ 
 	}
 
 	private function dec_2_6bit($dec) {
-		$bin=decbin($dec);
+		$bin = decbin($dec);
 		return(substr($bin, -6)); 
 	}
 
@@ -195,11 +195,11 @@ 
 		);
 		// "
 		$rv = '';
-		if ($_size % 6 == 0) {
-			$len = $_size / 6;
-			for ($i=0; $i<$len; $i++) {
-				$offset = $i * 6;
-				$rv .= $ais_chars[ bindec(substr($_str,$_start + $offset,6)) ];
+		if ($_size%6 == 0) {
+			$len = $_size/6;
+			for ($i = 0; $i < $len; $i++) {
+				$offset = $i*6;
+				$rv .= $ais_chars[bindec(substr($_str, $_start + $offset, 6))];
 			}
 		}
 		return $rv;
@@ -226,93 +226,93 @@ 
 		$ro->eta_hour = '';
 		$ro->eta_minute = '';
 		$ro->ts = time();
-		$ro->id = bindec(substr($_aisdata,0,6));
-		$ro->mmsi = bindec(substr($_aisdata,8,30));
+		$ro->id = bindec(substr($_aisdata, 0, 6));
+		$ro->mmsi = bindec(substr($_aisdata, 8, 30));
 		if ($ro->id >= 1 && $ro->id <= 3) {
-			$ro->cog = bindec(substr($_aisdata,116,12))/10;
-			$ro->sog = bindec(substr($_aisdata,50,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
+			$ro->cog = bindec(substr($_aisdata, 116, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 50, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 4) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,79,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,107,27)));
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 79, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 107, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 5) {
-			$ro->imo = bindec(substr($_aisdata,40,30));
-			$ro->callsign = $this->binchar($_aisdata,70,42);
-			$ro->name = $this->binchar($_aisdata,112,120);
-			$ro->typeid = bindec(substr($_aisdata,232,8));
+			$ro->imo = bindec(substr($_aisdata, 40, 30));
+			$ro->callsign = $this->binchar($_aisdata, 70, 42);
+			$ro->name = $this->binchar($_aisdata, 112, 120);
+			$ro->typeid = bindec(substr($_aisdata, 232, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,240,9));
 			//$ro->to_stern = bindec(substr($_aisdata,249,9));
 			//$ro->to_port = bindec(substr($_aisdata,258,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,264,6));
-			$ro->eta_month = bindec(substr($_aisdata,274,4));
-			$ro->eta_day = bindec(substr($_aisdata,278,5));
-			$ro->eta_hour = bindec(substr($_aisdata,283,5));
-			$ro->eta_minute = bindec(substr($_aisdata,288,6));
+			$ro->eta_month = bindec(substr($_aisdata, 274, 4));
+			$ro->eta_day = bindec(substr($_aisdata, 278, 5));
+			$ro->eta_hour = bindec(substr($_aisdata, 283, 5));
+			$ro->eta_minute = bindec(substr($_aisdata, 288, 6));
 			//$ro->draught = bindec(substr($_aisdata,294,8));
-			$ro->destination = $this->binchar($_aisdata,302,120);
+			$ro->destination = $this->binchar($_aisdata, 302, 120);
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 9) {
 			// Search and Rescue aircraft position report
 		} else if ($ro->id == 18) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 57, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 85, 27)));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
-			$ro->name = $this->binchar($_aisdata,143,120);
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
+			$ro->name = $this->binchar($_aisdata, 143, 120);
 			$ro->cls = 2; // class B
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
-			$ro->typeid = bindec(substr($_aisdata,263,8));
+			$ro->typeid = bindec(substr($_aisdata, 263, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
 			//$ro->to_stern = bindec(substr($_aisdata,280,9));
 			//$ro->to_port = bindec(substr($_aisdata,289,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,295,6));
 		} else if ($ro->id == 21) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,164,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,192,27)));
-			$ro->name = $this->binchar($_aisdata,43,120);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 164, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 192, 27)));
+			$ro->name = $this->binchar($_aisdata, 43, 120);
 			//$ro->to_bow = bindec(substr($_aisdata,219,9));
 			//$ro->to_stern = bindec(substr($_aisdata,228,9));
 			//$ro->to_port = bindec(substr($_aisdata,237,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,243,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 24) {
-			$pn = bindec(substr($_aisdata,38,2));
+			$pn = bindec(substr($_aisdata, 38, 2));
 			if ($pn == 0) {
-				$ro->name = $this->binchar($_aisdata,40,120);
+				$ro->name = $this->binchar($_aisdata, 40, 120);
 			}
-			$ro->typeid = bindec(substr($_aisdata,40,8));
+			$ro->typeid = bindec(substr($_aisdata, 40, 8));
 			$ro->type = $this->getShipType($ro->typeid);
-			$ro->callsign = $this->binchar($_aisdata,90,42);
+			$ro->callsign = $this->binchar($_aisdata, 90, 42);
 			//$ro->to_bow = bindec(substr($_aisdata,132,9));
 			//$ro->to_stern = bindec(substr($_aisdata,141,9));
 			//$ro->to_port = bindec(substr($_aisdata,150,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,156,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
-			$ro->cog = bindec(substr($_aisdata,85,9));
+			$ro->cog = bindec(substr($_aisdata, 85, 9));
 			if ($ro->cog == 511) $ro->cog = 0.0;
-			$ro->sog = bindec(substr($_aisdata,79,6));
+			$ro->sog = bindec(substr($_aisdata, 79, 6));
 			if ($ro->sog == 63) $ro->sog = 0.0;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 44, 18))*10);
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 62, 17))*10);
 			$ro->cls = 1; // class A
 		
 		}
-		$ro->statusid = bindec(substr($_aisdata,38,4));
+		$ro->statusid = bindec(substr($_aisdata, 38, 4));
 		$ro->status = $this->getStatus($ro->statusid);
 		return $ro;
 	}
@@ -359,7 +359,7 @@ 
 	}
 
 	public function getShipTypeID($type) {
-		$typeid = array_search($type,$this->shiptype);
+		$typeid = array_search($type, $this->shiptype);
 		if ($typeid !== FALSE) return $typeid;
 		elseif ($type == 'Cargo' || $type == 'General Cargo' || $type == 'Bulk Carrier' || $type == 'Container Ship' || $type == 'Cargo A' || $type == 'Reefer' || $type == 'Vehicles Carrier' || $type == 'Ro-Ro Cargo') return 70;
 		elseif ($type == 'Passengers Ship' || $type == 'Passenger' || $type == 'Ro-Ro/Passenger Ship' || $type == 'Motor Passenger') return 60;
@@ -381,14 +381,14 @@ 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
 		global $port; // tcpip port...
 		static $debug_counter = 0;
-		$aisdata168='';//six bit array of ascii characters
+		$aisdata168 = ''; //six bit array of ascii characters
 		$ais_nmea_array = str_split($_itu); // convert to an array
 		foreach ($ais_nmea_array as $value) {
 			$dec = $this->ascii_2_dec($value);
 			$bit8 = $this->asciidec_2_8bit($dec);
 			$bit6 = $this->dec_2_6bit($bit8);
 			//echo $value ."-" .$bit6 ."";
-			$aisdata168 .=$bit6;
+			$aisdata168 .= $bit6;
 		}
 		//echo $aisdata168 . "<br/>";
 		//return $this->decode_ais($aisdata168, $aux);
@@ -411,24 +411,24 @@ 
 		// calculate checksum after ! till *
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
-		$end = strrpos ( $rawdata , '*' );
+		$end = strrpos($rawdata, '*');
 		if ($end === FALSE) return -1; // check for NULLS!!!
-		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
-		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
-		if ( $chksum == $dcs ) { // NMEA checksum pass
+		$cs = substr($rawdata, $end + 1);
+		if (strlen($cs) != 2) return -1; // correct cs length
+		$dcs = (int) hexdec($cs);
+		for ($alias = 1; $alias < $end; $alias++) $chksum ^= ord($rawdata[$alias]); // perform XOR for NMEA checksum
+		if ($chksum == $dcs) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
 			if (!isset($pcs[1])) {
 				echo "ERROR,INVALID_DATA ".time()." $rawdata\n";
 				return -1;
 			}
-			$num_seq = (int)$pcs[1]; // number of sequences
-			$seq = (int)$pcs[2]; // get sequence
+			$num_seq = (int) $pcs[1]; // number of sequences
+			$seq = (int) $pcs[2]; // get sequence
 			// get msg sequence id
 			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			else $msg_sid = (int) $pcs[3]; // multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -461,7 +461,7 @@ 
 					}
 				}
 				$itu = $itu.$pcs[5]; // get itu message
-				$filler += (int)$pcs[6][0]; // get filler
+				$filler += (int) $pcs[6][0]; // get filler
 				if ($num_seq == 1 // valid single message
 				    || $num_seq == $pseq // valid multi-part message
 				) {
@@ -483,13 +483,13 @@ 
 		$cbuf = $cbuf.$ibuf;
 		$last_pos = 0;
 		$result = new stdClass();
-		while ( ($start = strpos($cbuf,"VDM",$last_pos)) !== FALSE) {
+		while (($start = strpos($cbuf, "VDM", $last_pos)) !== FALSE) {
 		//while ( ($start = strpos($cbuf,"!AI",$last_pos)) !== FALSE) {
 			//DEBUG echo $cbuf;
-			if ( ($end = strpos($cbuf,"\r\n", $start)) !== FALSE) { //TBD need to trim?
+			if (($end = strpos($cbuf, "\r\n", $start)) !== FALSE) { //TBD need to trim?
 				$tst = substr($cbuf, $start - 3, ($end - $start + 3));
 				//DEBUG echo "[$start $end $tst]\n";
-				$result = $this->process_ais_raw( $tst, "" );
+				$result = $this->process_ais_raw($tst, "");
 				$last_pos = $end + 1;
 			} else break;
 		}
@@ -501,41 +501,41 @@ 
 	// incoming data from serial or IP comms
 	public function process_ais_line($cbuf) {
 		$result = new stdClass();
-		$start = strpos($cbuf,"VDM");
+		$start = strpos($cbuf, "VDM");
 		$tst = substr($cbuf, $start - 3);
-		$result = $this->process_ais_raw( $tst, "" );
+		$result = $this->process_ais_raw($tst, "");
 		return $result;
 	}
 
 	/* AIS Encoding
 	*/
-	private function mk_ais_lat( $lat ) {
+	private function mk_ais_lat($lat) {
 		//$lat = 1.2569;
-		if ($lat<0.0) {
+		if ($lat < 0.0) {
 			$lat = -$lat;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$latd = 0x00000000;
-		$latd = intval ($lat * 600000.0);
-		if ($neg==true) {
+		$latd = intval($lat*600000.0);
+		if ($neg == true) {
 			$latd = ~$latd;
-			$latd+=1;
+			$latd += 1;
 			$latd &= 0x07FFFFFF;
 		}
 		return $latd;
 	}
 
-	private function mk_ais_lon( $lon ) {
+	private function mk_ais_lon($lon) {
 		//$lon = 103.851;
-		if ($lon<0.0) {
+		if ($lon < 0.0) {
 			$lon = -$lon;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$lond = 0x00000000;
-		$lond = intval ($lon * 600000.0);
-		if ($neg==true) {
+		$lond = intval($lon*600000.0);
+		if ($neg == true) {
 			$lond = ~$lond;
-			$lond+=1;
+			$lond += 1;
 			$lond &= 0x0FFFFFFF;
 		}
 		return $lond;
@@ -543,8 +543,8 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
+		if ($len > $max_len) $name = substr($name, 0, $max_len);
+		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len)*6);
 		else $pad = '';
 		$rv = '';
 		$ais_chars = array(
@@ -561,26 +561,26 @@ 
 		if ($_a) foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
 			else $dec = 0;
-			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
+			$bin = str_pad(decbin($dec), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
 		}
 		return $rv.$pad;
 	}
 
-	private function mk_ais($_enc, $_part=1,$_total=1,$_seq='',$_ch='A') {
+	private function mk_ais($_enc, $_part = 1, $_total = 1, $_seq = '', $_ch = 'A') {
 		$len_bit = strlen($_enc);
-		$rem6 = $len_bit % 6;
+		$rem6 = $len_bit%6;
 		$pad6_len = 0;
 		if ($rem6) $pad6_len = 6 - $rem6;
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
-		$len_enc = strlen($_enc) / 6;
+		$len_enc = strlen($_enc)/6;
 		//echo $_enc.' '.$len_enc.'<br/>';
 		$itu = '';
-		for ($i=0; $i<$len_enc; $i++) {
-			$offset = $i * 6;
-			$dec = bindec(substr($_enc,$offset,6));
+		for ($i = 0; $i < $len_enc; $i++) {
+			$offset = $i*6;
+			$dec = bindec(substr($_enc, $offset, 6));
 			if ($dec < 40) $dec += 48;
 			else $dec += 56;
 			//echo chr($dec)." $dec<br/>";
@@ -590,15 +590,15 @@ 
 		$chksum = 0;
 		$itu = "AIVDM,$_part,$_total,$_seq,$_ch,".$itu.",0";
 		$len_itu = strlen($itu);
-		for ($i=0; $i<$len_itu; $i++) {
-			$chksum ^= ord( $itu[$i] );
+		for ($i = 0; $i < $len_itu; $i++) {
+			$chksum ^= ord($itu[$i]);
 		}
-		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
+		$hex_arr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+		$lsb = $chksum&0x0F;
+		if ($lsb >= 0 && $lsb <= 15) $lsbc = $hex_arr[$lsb];
 		else $lsbc = '0';
-		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
+		$msb = (($chksum&0xF0) >> 4)&0x0F;
+		if ($msb >= 0 && $msb <= 15) $msbc = $hex_arr[$msb];
 		else $msbc = '0';
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
@@ -624,14 +624,14 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
+			if (substr($mmsi, 0, 3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			elseif (substr($mmsi, 0, 3) == '972') return 'MOB (Man Overboard) device';
+			elseif (substr($mmsi, 0, 3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
+			elseif (substr($mmsi, 0, 3) == '111') return 'SAR (Search and Rescue) aircraft';
+			elseif (substr($mmsi, 0, 2) == '98') return 'Auxiliary craft associated with a parent ship';
+			elseif (substr($mmsi, 0, 2) == '99') return 'Aids to Navigation';
+			elseif (substr($mmsi, 0, 2) == '00') return 'Coastal stations';
+			elseif (substr($mmsi, 0, 1) == '0') return 'Group of ships';
 			else return 'Ship';
 		}
 
@@ -641,19 +641,19 @@ 
 	public function parse_line($buffer) {
 		global $globalDebug;
 		$result = array();
-		$start = strpos($buffer,"VDM");
+		$start = strpos($buffer, "VDM");
 		$tst = substr($buffer, $start - 3);
-		$data = $this->process_ais_raw( $tst, "" );
+		$data = $this->process_ais_raw($tst, "");
 		if (!is_object($data)) {
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
 		if ($data->lon != 0) $result['longitude'] = $data->lon;
 		if ($data->lat != 0) $result['latitude'] = $data->lat;
-		$result['ident'] = trim(str_replace('@','',$data->name));
+		$result['ident'] = trim(str_replace('@', '', $data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'], 0, 3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
 		if ($data->sog != -1.0) $result['speed'] = $data->sog;
 		if ($data->heading !== '') $result['heading'] = $data->heading;
@@ -663,16 +663,16 @@ 
 		if ($data->type !== '') $result['type'] = $data->type;
 		if ($data->typeid !== '') $result['typeid'] = $data->typeid;
 		if ($data->imo !== '') $result['imo'] = $data->imo;
-		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign));
+		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@', '', $data->callsign));
 		if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') {
-			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d", $data->eta_month).'-'.sprintf("%02d", $data->eta_day).' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		} elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) {
-			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		}
 		if ($data->destination != '') {
-			$dest = trim(str_replace('@','',$data->destination));
+			$dest = trim(str_replace('@', '', $data->destination));
 			if ($dest != '') $result['destination'] = $dest;
 		}
 		$result['all'] = (array) $data;

install/index.php

Spacing +282 added lines, -282 removed lines

@@ -22,7 +22,7 @@ 
 require_once(dirname(__FILE__).'/class.create_db.php');
 require_once(dirname(__FILE__).'/class.update_schema.php');
 require_once(dirname(__FILE__).'/class.settings.php');
-$title="Install";
+$title = "Install";
 require(dirname(__FILE__).'/../require/settings.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 require(dirname(__FILE__).'/header.php');
@@ -95,8 +95,8 @@ 
 	if (!extension_loaded('curl')) {
 		$error[] = "Curl is not loaded.";
 	}
-	if(function_exists('apache_get_modules') ){
-		if(!in_array('mod_rewrite',apache_get_modules())) {
+	if (function_exists('apache_get_modules')) {
+		if (!in_array('mod_rewrite', apache_get_modules())) {
 			$error[] = "mod_rewrite is not available.";
 		}
 	/*
@@ -112,8 +112,8 @@ 
 	print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>';
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
 		if (function_exists('get_headers')) {
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 				print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
 			}
 		}
@@ -192,7 +192,7 @@ 
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
 					}
 				    }
 				?>
@@ -515,13 +515,13 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
 								    } else {
-									$hostport = explode(':',$source['host']);
+									$hostport = explode(':', $source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
 										$port = $hostport[1];
@@ -570,7 +570,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -624,7 +624,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
 										} else print '<option>'.$timezones.'</option>';
@@ -1076,7 +1076,7 @@ 
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
 			</p>
 			<br />
 			<p>
@@ -1138,14 +1138,14 @@ 
 $error = '';
 
 if (isset($_POST['dbtype'])) {
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1165,49 +1165,49 @@ 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
 	*/
 	
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
 	
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
 	if ($acars == 'acars') {
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
 	}
 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
 	
 	$source_name = $_POST['source_name'];
 	$source_latitude = $_POST['source_latitude'];
@@ -1221,8 +1221,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1231,16 +1231,16 @@ 
 	$newstype = $_POST['newstype'];
 	
 	$newsfeeds = array();
-	foreach($newsurl as $newskey => $url) {
+	foreach ($newsurl as $newskey => $url) {
 	    if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
 	    }
 	}
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1251,27 +1251,27 @@ 
 	$sbsurl = $_POST['sbsurl'];
 	*/
 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
 
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1287,7 +1287,7 @@ 
 	}
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
 */
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
 	$host = $_POST['host'];
 	$port = $_POST['port'];
 	$name = $_POST['name'];
@@ -1304,115 +1304,115 @@ 
 		else $cov = 'FALSE';
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
 		else $arch = 'FALSE';
-		if (strpos($format[$key],'_callback')) {
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
+		if (strpos($format[$key], '_callback')) {
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
 		}
 		if ($format[$key] == 'airwhere') $forcepilots = true;
 	}
-	$settings = array_merge($settings,array('globalSources' => $gSources));
+	$settings = array_merge($settings, array('globalSources' => $gSources));
 
 /*
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
 */
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
 
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
 
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
 	
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
 	if ($archiveyear == "archiveyear") {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
 	}
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
 	}
 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
 	if ($archive == 'archive') {
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
 	}
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
 	if ($archiveresults == 'archiveresults') {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
 	}
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
 	if ($daemon == 'daemon') {
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
 	}
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
 	if ($schedules == 'schedules') {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
 	}
 
 /*
@@ -1423,274 +1423,274 @@ 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
 	}
 */
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
 	$va = false;
 	if ($globalivao == 'ivao') {
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
 	if ($globalvatsim == 'vatsim') {
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
 	if ($globalphpvms == 'phpvms') {
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
 	if ($globalvam == 'vam') {
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
 	if ($va) {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
 	if ($globalva == 'va' || $va) {
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
 	} else {
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
 	}
 	
 	
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
 	if ($mapoffline == 'mapoffline') {
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
 	}
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
 	if ($globaloffline == 'globaloffline') {
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
 	}
 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
 	if ($notam == 'notam') {
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
 	}
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
 	if ($owner == 'owner') {
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
 	}
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
 	if ($map3d == 'map3d') {
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
 	}
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
 	if ($crash == 'crash') {
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
 	}
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
 	if ($fires == 'fires') {
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
 	}
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
 	if ($firessupport == 'firessupport') {
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
 	}
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
 	if ($mapsatellites == 'mapsatellites') {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
 	}
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
 	if ($map3ddefault == 'map3ddefault') {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
 	}
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
 	if ($map3dliveries == 'map3dliveries') {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
 	}
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
 	if ($translate == 'translate') {
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
 	}
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
 	if ($realairlines == 'realairlines') {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
 	}
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
 	if ($estimation == 'estimation') {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
 	}
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
 	if ($metar == 'metar') {
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
 	}
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
 	if ($metarcycle == 'metarcycle') {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
 	}
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
 	if ($fork == 'fork') {
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
 	}
 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
 	if ($colormap == 'colormap') {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
 	}
 	
 	if (isset($_POST['aircrafticoncolor'])) {
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
 	}
 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
 	if ($mappopup == 'mappopup') {
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
 	}
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
 	if ($airportpopup == 'airportpopup') {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
 	}
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
 	if ($maphistory == 'maphistory') {
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
 	}
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
 	if ($maptooltip == 'maptooltip') {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
 	}
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
 	if ($flightroute == 'flightroute') {
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
 	}
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
 	if ($flightremainingroute == 'flightremainingroute') {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
 	}
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
 	if ($allflights == 'allflights') {
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
 	}
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
 	if ($bbox == 'bbox') {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
 	}
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
 	if ($groundaltitude == 'groundaltitude') {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
 	}
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
 	if ($waypoints == 'waypoints') {
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
 	}
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
 	if ($geoid == 'geoid') {
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
 	}
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
 
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
 	if ($noairlines == 'noairlines') {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
 	}
 
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
 	if ($tsk == 'tsk') {
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
 	}
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
 	if ($mapmatching == 'mapmatching') {
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
 	}
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
     	}
 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
 
 	if ($error == '') settings::modify_settings($settings);
 	if ($error == '') settings::comment_settings($settings_comment);

live-geojson.php

Spacing +79 added lines, -79 removed lines

@@ -63,17 +63,17 @@ 
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -82,7 +82,7 @@ 
 $spotter_array = array();
 
 if (isset($_GET['ident'])) {
-	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+	$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getLastLiveTrackerDataByIdent($ident);
 	} elseif ($marine) {
@@ -96,7 +96,7 @@ 
 	}
 	$allhistory = true;
 } elseif (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);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -104,11 +104,11 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['famtrack_id'])) {
-	$famtrack_id = urldecode(filter_input(INPUT_GET,'famtrack_id',FILTER_SANITIZE_STRING));
+	$famtrack_id = urldecode(filter_input(INPUT_GET, 'famtrack_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $TrackerLive->getLastLiveTrackerDataById($famtrack_id);
 	$allhistory = true;
 } elseif (isset($_GET['fammarine_id'])) {
-	$fammarine_id = urldecode(filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING));
+	$fammarine_id = urldecode(filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $MarineLive->getLastLiveMarineDataById($fammarine_id);
 	$allhistory = true;
 /*
@@ -128,15 +128,15 @@ 
 */
 } elseif (isset($globalMapUseBbox) && $globalMapUseBbox && isset($_GET['coord']) && $min) {
 	$usecoord = true;
-	$coord = explode(',',$_GET['coord']);
-	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+	$coord = explode(',', $_GET['coord']);
+	if (filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
-			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
+			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord, $filter);
 		} elseif ($marine) {
-			$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord,$filter);
+			$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord, $filter);
 		} else {
-			$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord,$filter);
+			$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord, $filter);
 		}
 	} else {
 		if ($tracker) {
@@ -151,12 +151,12 @@ 
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($min) {
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getMinLiveTrackerData($filter);
@@ -168,17 +168,17 @@ 
 #	$min = true;
 } else {
 	if ($tracker) {
-		$spotter_array = $TrackerLive->getLiveTrackerData('','',$filter);
+		$spotter_array = $TrackerLive->getLiveTrackerData('', '', $filter);
 	} elseif ($marine) {
-		$spotter_array = $marineLive->getLiveMarineData('','',$filter);
+		$spotter_array = $marineLive->getLiveMarineData('', '', $filter);
 	} else {
-		$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+		$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 	}
 }
 
 if ($usecoord) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} else {
 		if ($tracker) {
 			$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
@@ -191,9 +191,9 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
-$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 if ($currenttime != '') $currenttime = round($currenttime/1000);
 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
@@ -212,7 +212,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				unset($idistance);
@@ -269,8 +269,8 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
+							if ($compress) $output .= '"c": "'.str_replace('\\', '', $spotter_item['ident']).'",';
+							else $output .= '"callsign": "'.str_replace('\\', '', $spotter_item['ident']).'",';
 							//"
 						} else {
 							if ($compress) $output .= '"c": "NA",';
@@ -279,7 +279,7 @@ 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -422,15 +422,15 @@ 
 						if (isset($archivespeed) || $usenextlatlon) {
 							if (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 								if (isset($spotter_item['arrival_airport_latitude'])) {
-									$cheading = $Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['arrival_airport_latitude'],$spotter_item['arrival_airport_longitude']);
-									$idistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['arrival_airport_latitude'],$spotter_item['arrival_airport_longitude']);
+									$cheading = $Common->getHeading($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['arrival_airport_latitude'], $spotter_item['arrival_airport_longitude']);
+									$idistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['arrival_airport_latitude'], $spotter_item['arrival_airport_longitude']);
 									$farr_lat = $spotter_item['arrival_airport_latitude'];
 									$farr_lon = $spotter_item['arrival_airport_longitude'];
 								} else {
 									$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 									if (isset($aairport[0]['latitude'])) {
-										$cheading = $Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$aairport[0]['latitude'],$aairport[0]['longitude']);
-										$idistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$aairport[0]['latitude'],$aairport[0]['longitude']);
+										$cheading = $Common->getHeading($spotter_item['latitude'], $spotter_item['longitude'], $aairport[0]['latitude'], $aairport[0]['longitude']);
+										$idistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $aairport[0]['latitude'], $aairport[0]['longitude']);
 										$farr_lat = $aairport[0]['latitude'];
 										$farr_lon = $aairport[0]['longitude'];
 									}
@@ -443,59 +443,59 @@ 
 						if ($currenttime != '') {
 							if (strtotime($spotter_item['date']) < $currenttime) {
 								if (isset($archivespeed)) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+									$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 									else {
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
 									}
 								} elseif ($usenextlatlon) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, 1, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+									$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 									else {
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, 1, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
 									}
 								}
 							} else {
 								if (isset($archivespeed)) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} elseif ($usenextlatlon) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
 							}
 						} else {
 							if (isset($archivespeed)) {
-								$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
-								$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+								$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
+								$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 								if (!isset($idistance) || $fdistance < $idistance) {
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} else {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed);
 									//$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
 							} elseif ($usenextlatlon) {
-								$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
-								$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+								$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
+								$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 								if (!isset($idistance) || $fdistance < $idistance) {
 										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} else {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading);
 									//$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
@@ -504,7 +504,7 @@ 
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -526,7 +526,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
 						if (isset($spotter_item['type'])) {
@@ -546,12 +546,12 @@ 
 								if ($currenttime != '') {
 									if (strtotime($spotter_item['date']) < $currenttime) {
 										if (!isset($archivespeed)) $archivespeed = 1;
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed, ($currenttime - strtotime($spotter_item['date'])));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
-											$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed, ($currenttime - strtotime($spotter_item['date'])));
+											$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 											if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
 											else {
 												$output .= $spotter_item['longitude'].', ';
@@ -630,7 +630,7 @@ 
                 
 			}
 */
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
@@ -638,11 +638,11 @@ 
 				    || ((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 != '' && $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 != '' && $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 != '' && $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) {
@@ -698,9 +698,9 @@ 
 								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 							}
 							$output_history .= '[';
-							$output_history .=  $spotter_history['longitude'].', ';
-							$output_history .=  $spotter_history['latitude'].', ';
-							$output_history .=  $spotter_history['altitude']*30.48;
+							$output_history .= $spotter_history['longitude'].', ';
+							$output_history .= $spotter_history['latitude'].', ';
+							$output_history .= $spotter_history['altitude']*30.48;
 							$output_history .= '],';
 							/*
 							if ($from_archive === false) {
@@ -719,8 +719,8 @@ 
 								$d = true;
 							}
 							$output_history .= '[';
-							$output_history .=  $spotter_history['longitude'].', ';
-							$output_history .=  $spotter_history['latitude'];
+							$output_history .= $spotter_history['longitude'].', ';
+							$output_history .= $spotter_history['latitude'];
 							$output_history .= '],';
 							/*
 							if ($from_archive === false) {
@@ -736,9 +736,9 @@ 
 						//echo $output_history;
 						if ($from_archive === false) {
 							$output_historyd = '[';
-							$output_historyd .=  $spotter_item['longitude'].', ';
-							$output_historyd .=  $spotter_item['latitude'];
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							$output_historyd .= $spotter_item['longitude'].', ';
+							$output_historyd .= $spotter_item['latitude'];
+							if (isset($spotter_history['altitude'])) $output_historyd .= ','.$spotter_item['altitude']*30.48;
 							$output_historyd .= '],';
 							//$output_history = $output_historyd.$output_history;
 							$output_history = $output_history.$output_historyd;
@@ -752,7 +752,7 @@ 
 					}
 				}
 				
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				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' 
@@ -786,7 +786,7 @@ 
 
 				//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']))
+				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' 
@@ -817,7 +817,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {