Ysurac / FlightAirMap

marine-data.php

Spacing +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident, $currenttime);
 		/*
 		if (empty($spotter_array)) {
 			$from_archive = true;
@@ -31,11 +31,11 @@ 
 	}
 }
 if (isset($_GET['fammarine_id'])) {
-	$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
+	$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id, $currenttime);
 		/*
 		if (empty($spotter_array)) {
 			$from_archive = true;
@@ -62,7 +62,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {

tracker-data.php

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {

Indentation +9 added lines, -9 removed lines

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

Spacing +11 added lines, -11 removed lines

@@ -11,14 +11,14 @@ 
 
 $from_archive = false;
 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 (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident,$currenttime);
+		$spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident,$currenttime);
+			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident, $currenttime);
 		}
 		
 	} else {
@@ -30,16 +30,16 @@ 
 	}
 }
 if (isset($_GET['famtrackid'])) {
-	$famtrackid = urldecode(filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING));
+	$famtrackid = urldecode(filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING));
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid,$currenttime);
+		$spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($famtrackid,$currenttime);
+			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($famtrackid, $currenttime);
 		}
 		
 	} else {
@@ -59,7 +59,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -79,8 +79,8 @@ 
 print '<div><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
     try {
-	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-    } catch(Exception $e) {
+	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+    } catch (Exception $e) {
     }
 }
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {

require/class.AIS.php

Doc Comments +25 added lines

@@ -68,6 +68,10 @@ 
        't', 'u', 'v', 'w' // 119
     ); // char 64
     */
+
+	/**
+	 * @param integer $ascii
+	 */
 	private function asciidec_2_8bit($ascii) {
 		//only process in the following range: 48-87, 96-119
 		if ($ascii < 48) { }
@@ -93,6 +97,10 @@ 
 		return(substr($bin, -6)); 
 	}
 
+	/**
+	 * @param integer $_start
+	 * @param integer $_size
+	 */
 	private function binchar($_str, $_start, $_size) {
 		//  ' ' --- '?', // 0x20 - 0x3F
 		//  '@' --- '_', // 0x40 - 0x5F
@@ -118,6 +126,10 @@ 
 	}
 
 	// function for decoding the AIS Message ITU Payload
+
+	/**
+	 * @param string $_aisdata
+	 */
 	private function decode_ais($_aisdata) {
 		$ro = new stdClass(); // return object
 		$ro->cls = 0; // AIS class undefined, also indicate unparsed msg
@@ -351,6 +363,12 @@ 
 		elseif ($code == 99) return 'Other Type, no additional information';
 	}
 
+	/**
+	 * @param string $_itu
+	 * @param integer $_len
+	 * @param integer $_filler
+	 * @param string $aux
+	 */
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
 		global $port; // tcpip port...
 		
@@ -371,6 +389,10 @@ 
 
 	// char* - AIS \r terminated string
 	// TCP based streams which send messages in full can use this instead of calling process_ais_buf
+
+	/**
+	 * @param string $rawdata
+	 */
 	public function process_ais_raw($rawdata, $aux = '') { // return int
 		static $num_seq; // 1 to 9
 		static $seq; // 1 to 9
@@ -589,6 +611,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $mmsi
+	 */
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
 			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';

Indentation +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
 		return ($dec);
 	}
 	
-    /*
+	/*
     $ais_map64 = array(
        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', // 48
        ':', ';', '<', '=', '>', '?', '@', 'A', 'B', 'C',
@@ -97,13 +97,13 @@ 
 		//  ' ' --- '?', // 0x20 - 0x3F
 		//  '@' --- '_', // 0x40 - 0x5F
 		$ais_chars = array(
-		    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-		    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-		    'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']',
-		    '^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'',
-		    '(', ')', '*', '+', ',', '-', '.', '/', '0', '1',
-		    '2', '3', '4', '5', '6', '7', '8', '9', ':', ';',
-		    '<', '=', '>', '?'
+			'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+			'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+			'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']',
+			'^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'',
+			'(', ')', '*', '+', ',', '-', '.', '/', '0', '1',
+			'2', '3', '4', '5', '6', '7', '8', '9', ':', ';',
+			'<', '=', '>', '?'
 		);
 		// "
 		$rv = '';
@@ -419,8 +419,8 @@ 
 				}
 				if ($num_seq > 1) { // for multipart messages
 					if ($cmsg_sid != $msg_sid // different msg_sid
-					    || $msg_sid == -1 // invalid initial msg_sid
-					    || ($seq - $pseq) != 1 // not insequence
+						|| $msg_sid == -1 // invalid initial msg_sid
+						|| ($seq - $pseq) != 1 // not insequence
 					) {  // invalid for multipart message
 						$msg_sid = -1;
 						$cmsg_sid = -1;
@@ -433,7 +433,7 @@ 
 				$itu = $itu.$pcs[5]; // get itu message
 				$filler += (int)$pcs[6][0]; // get filler
 				if ($num_seq == 1 // valid single message
-				    || $num_seq == $pseq // valid multi-part message
+					|| $num_seq == $pseq // valid multi-part message
 				) {
 					if ($num_seq != 1) { // test
 						//echo $rawdata;
@@ -516,13 +516,13 @@ 
 		else $pad = '';
 		$rv = '';
 		$ais_chars = array(
-		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
-		    'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19,
-		    'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29,
-		    '^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39,
-		    '('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49,
-		    '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59,
-		    '<'=>60, '='=>61, '>'=>62, '?'=>63
+			'@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
+			'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19,
+			'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29,
+			'^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39,
+			'('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49,
+			'2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59,
+			'<'=>60, '='=>61, '>'=>62, '?'=>63
 		);
 		// "
 		$_a = str_split($name);

Spacing +128 added lines, -128 removed lines

@@ -29,31 +29,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);
 	}
 	
@@ -72,15 +72,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;
 					}
 				}
 			}
@@ -89,7 +89,7 @@ 
 	}
 
 	private function dec_2_6bit($dec) {
-		$bin=decbin($dec);
+		$bin = decbin($dec);
 		return(substr($bin, -6)); 
 	}
 
@@ -107,11 +107,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;
@@ -138,93 +138,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);
 		//var_dump($ro); // dump results here for demo purpose
 		return $ro;
@@ -355,14 +355,14 @@ 
 		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);
@@ -385,20 +385,20 @@ 
 		// 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
-			$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) {
@@ -431,7 +431,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
 				) {
@@ -451,13 +451,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;
 		}
@@ -469,41 +469,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;
@@ -511,8 +511,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(
@@ -529,26 +529,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/>";
@@ -558,15 +558,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;
@@ -591,14 +591,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';
 		}
 
@@ -609,19 +609,19 @@ 
 		global $globalDebug;
 		$result = array();
 		$data = new stdClass();
-		$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;
@@ -631,16 +631,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;

Braces +331 added lines, -143 removed lines

@@ -35,7 +35,9 @@ 
 			$temp += 1;
 			$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
 	}
 
@@ -47,7 +49,9 @@ 
 			$temp += 1;
 			$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;
 	}
 
@@ -70,10 +74,8 @@ 
     */
 	private function asciidec_2_8bit($ascii) {
 		//only process in the following range: 48-87, 96-119
-		if ($ascii < 48) { }
-		else {
-			if($ascii>119) { }
-			else {
+		if ($ascii < 48) { } else {
+			if($ascii>119) { } else {
 				if ($ascii>87 && $ascii<96) ;
 				else {
 					$ascii=$ascii+40;
@@ -175,7 +177,9 @@ 
 			$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 = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
 			$ro->cog = bindec(substr($_aisdata,112,12))/10;
@@ -185,7 +189,9 @@ 
 			$ro->name = $this->binchar($_aisdata,143,120);
 			$ro->cls = 2; // class B
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->typeid = bindec(substr($_aisdata,263,8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
@@ -216,9 +222,13 @@ 
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
 			$ro->cog = bindec(substr($_aisdata,85,9));
-			if ($ro->cog == 511) $ro->cog = 0.0;
+			if ($ro->cog == 511) {
+				$ro->cog = 0.0;
+			}
 			$ro->sog = bindec(substr($_aisdata,79,6));
-			if ($ro->sog == 63) $ro->sog = 0.0;
+			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->cls = 1; // class A
@@ -267,88 +277,171 @@ 
 	}
 	
 	public function getShipType($code) {
-		if ($code == 0) return 'Not available (default)';
-		elseif ($code >= 1 && $code <= 19) return 'Reserved for future use';
-		elseif ($code == 20) return 'Wing in ground (WIG), all ships of this type';
-		elseif ($code == 21) return 'Wing in ground (WIG), Hazardous category A';
-		elseif ($code == 22) return 'Wing in ground (WIG), Hazardous category B';
-		elseif ($code == 23) return 'Wing in ground (WIG), Hazardous category C';
-		elseif ($code == 24) return 'Wing in ground (WIG), Hazardous category D';
-		elseif ($code == 25) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 26) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 27) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 28) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 29) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 30) return 'Fishing';
-		elseif ($code == 31) return 'Towing';
-		elseif ($code == 32) return 'Towing: length exceeds 200m or breadth exceeds 25m';
-		elseif ($code == 33) return 'Dredging or underwater ops';
-		elseif ($code == 34) return 'Diving ops';
-		elseif ($code == 35) return 'Military ops';
-		elseif ($code == 36) return 'Sailing';
-		elseif ($code == 37) return 'Pleasure Craft';
-		elseif ($code == 38) return 'Reserved';
-		elseif ($code == 39) return 'Reserved';
-		elseif ($code == 40) return 'High speed craft (HSC), all ships of this type';
-		elseif ($code == 41) return 'High speed craft (HSC), Hazardous category A';
-		elseif ($code == 42) return 'High speed craft (HSC), Hazardous category B';
-		elseif ($code == 43) return 'High speed craft (HSC), Hazardous category C';
-		elseif ($code == 44) return 'High speed craft (HSC), Hazardous category D';
-		elseif ($code == 45) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 46) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 47) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 48) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 49) return 'High speed craft (HSC), No additional information';
-		elseif ($code == 50) return 'Pilot Vessel';
-		elseif ($code == 51) return 'Search and Rescue vessel';
-		elseif ($code == 52) return 'Tug';
-		elseif ($code == 53) return 'Port Tender';
-		elseif ($code == 54) return 'Anti-pollution equipment';
-		elseif ($code == 55) return 'Law Enforcement';
-		elseif ($code == 56) return 'Spare - Local Vessel';
-		elseif ($code == 57) return 'Spare - Local Vessel';
-		elseif ($code == 58) return 'Medical Transport';
-		elseif ($code == 59) return 'Noncombatant ship according to RR Resolution No. 18';
-		elseif ($code == 60) return 'Passenger, all ships of this type';
-		elseif ($code == 61) return 'Passenger, Hazardous category A';
-		elseif ($code == 62) return 'Passenger, Hazardous category B';
-		elseif ($code == 63) return 'Passenger, Hazardous category C';
-		elseif ($code == 64) return 'Passenger, Hazardous category D';
-		elseif ($code == 65) return 'Passenger, Reserved for future use';
-		elseif ($code == 66) return 'Passenger, Reserved for future use';
-		elseif ($code == 67) return 'Passenger, Reserved for future use';
-		elseif ($code == 68) return 'Passenger, Reserved for future use';
-		elseif ($code == 69) return 'Passenger, No additional information';
-		elseif ($code == 70) return 'Cargo, all ships of this type';
-		elseif ($code == 71) return 'Cargo, Hazardous category A';
-		elseif ($code == 72) return 'Cargo, Hazardous category B';
-		elseif ($code == 73) return 'Cargo, Hazardous category C';
-		elseif ($code == 74) return 'Cargo, Hazardous category D';
-		elseif ($code == 75) return 'Cargo, Reserved for future use';
-		elseif ($code == 76) return 'Cargo, Reserved for future use';
-		elseif ($code == 77) return 'Cargo, Reserved for future use';
-		elseif ($code == 78) return 'Cargo, Reserved for future use';
-		elseif ($code == 79) return 'Cargo, No additional information';
-		elseif ($code == 80) return 'Tanker, all ships of this type';
-		elseif ($code == 81) return 'Tanker, Hazardous category A';
-		elseif ($code == 82) return 'Tanker, Hazardous category B';
-		elseif ($code == 83) return 'Tanker, Hazardous category C';
-		elseif ($code == 84) return 'Tanker, Hazardous category D';
-		elseif ($code == 85) return 'Tanker, Reserved for future use';
-		elseif ($code == 86) return 'Tanker, Reserved for future use';
-		elseif ($code == 87) return 'Tanker, Reserved for future use';
-		elseif ($code == 88) return 'Tanker, Reserved for future use';
-		elseif ($code == 89) return 'Tanker, No additional information';
-		elseif ($code == 90) return 'Other Type, all ships of this type';
-		elseif ($code == 91) return 'Other Type, Hazardous category A';
-		elseif ($code == 92) return 'Other Type, Hazardous category B';
-		elseif ($code == 93) return 'Other Type, Hazardous category C';
-		elseif ($code == 94) return 'Other Type, Hazardous category D';
-		elseif ($code == 95) return 'Other Type, Reserved for future use';
-		elseif ($code == 96) return 'Other Type, Reserved for future use';
-		elseif ($code == 97) return 'Other Type, Reserved for future use';
-		elseif ($code == 98) return 'Other Type, Reserved for future use';
-		elseif ($code == 99) return 'Other Type, no additional information';
+		if ($code == 0) {
+			return 'Not available (default)';
+		} elseif ($code >= 1 && $code <= 19) {
+			return 'Reserved for future use';
+		} elseif ($code == 20) {
+			return 'Wing in ground (WIG), all ships of this type';
+		} elseif ($code == 21) {
+			return 'Wing in ground (WIG), Hazardous category A';
+		} elseif ($code == 22) {
+			return 'Wing in ground (WIG), Hazardous category B';
+		} elseif ($code == 23) {
+			return 'Wing in ground (WIG), Hazardous category C';
+		} elseif ($code == 24) {
+			return 'Wing in ground (WIG), Hazardous category D';
+		} elseif ($code == 25) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 26) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 27) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 28) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 29) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 30) {
+			return 'Fishing';
+		} elseif ($code == 31) {
+			return 'Towing';
+		} elseif ($code == 32) {
+			return 'Towing: length exceeds 200m or breadth exceeds 25m';
+		} elseif ($code == 33) {
+			return 'Dredging or underwater ops';
+		} elseif ($code == 34) {
+			return 'Diving ops';
+		} elseif ($code == 35) {
+			return 'Military ops';
+		} elseif ($code == 36) {
+			return 'Sailing';
+		} elseif ($code == 37) {
+			return 'Pleasure Craft';
+		} elseif ($code == 38) {
+			return 'Reserved';
+		} elseif ($code == 39) {
+			return 'Reserved';
+		} elseif ($code == 40) {
+			return 'High speed craft (HSC), all ships of this type';
+		} elseif ($code == 41) {
+			return 'High speed craft (HSC), Hazardous category A';
+		} elseif ($code == 42) {
+			return 'High speed craft (HSC), Hazardous category B';
+		} elseif ($code == 43) {
+			return 'High speed craft (HSC), Hazardous category C';
+		} elseif ($code == 44) {
+			return 'High speed craft (HSC), Hazardous category D';
+		} elseif ($code == 45) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 46) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 47) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 48) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 49) {
+			return 'High speed craft (HSC), No additional information';
+		} elseif ($code == 50) {
+			return 'Pilot Vessel';
+		} elseif ($code == 51) {
+			return 'Search and Rescue vessel';
+		} elseif ($code == 52) {
+			return 'Tug';
+		} elseif ($code == 53) {
+			return 'Port Tender';
+		} elseif ($code == 54) {
+			return 'Anti-pollution equipment';
+		} elseif ($code == 55) {
+			return 'Law Enforcement';
+		} elseif ($code == 56) {
+			return 'Spare - Local Vessel';
+		} elseif ($code == 57) {
+			return 'Spare - Local Vessel';
+		} elseif ($code == 58) {
+			return 'Medical Transport';
+		} elseif ($code == 59) {
+			return 'Noncombatant ship according to RR Resolution No. 18';
+		} elseif ($code == 60) {
+			return 'Passenger, all ships of this type';
+		} elseif ($code == 61) {
+			return 'Passenger, Hazardous category A';
+		} elseif ($code == 62) {
+			return 'Passenger, Hazardous category B';
+		} elseif ($code == 63) {
+			return 'Passenger, Hazardous category C';
+		} elseif ($code == 64) {
+			return 'Passenger, Hazardous category D';
+		} elseif ($code == 65) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 66) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 67) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 68) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 69) {
+			return 'Passenger, No additional information';
+		} elseif ($code == 70) {
+			return 'Cargo, all ships of this type';
+		} elseif ($code == 71) {
+			return 'Cargo, Hazardous category A';
+		} elseif ($code == 72) {
+			return 'Cargo, Hazardous category B';
+		} elseif ($code == 73) {
+			return 'Cargo, Hazardous category C';
+		} elseif ($code == 74) {
+			return 'Cargo, Hazardous category D';
+		} elseif ($code == 75) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 76) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 77) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 78) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 79) {
+			return 'Cargo, No additional information';
+		} elseif ($code == 80) {
+			return 'Tanker, all ships of this type';
+		} elseif ($code == 81) {
+			return 'Tanker, Hazardous category A';
+		} elseif ($code == 82) {
+			return 'Tanker, Hazardous category B';
+		} elseif ($code == 83) {
+			return 'Tanker, Hazardous category C';
+		} elseif ($code == 84) {
+			return 'Tanker, Hazardous category D';
+		} elseif ($code == 85) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 86) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 87) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 88) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 89) {
+			return 'Tanker, No additional information';
+		} elseif ($code == 90) {
+			return 'Other Type, all ships of this type';
+		} elseif ($code == 91) {
+			return 'Other Type, Hazardous category A';
+		} elseif ($code == 92) {
+			return 'Other Type, Hazardous category B';
+		} elseif ($code == 93) {
+			return 'Other Type, Hazardous category C';
+		} elseif ($code == 94) {
+			return 'Other Type, Hazardous category D';
+		} elseif ($code == 95) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 96) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 97) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 98) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 99) {
+			return 'Other Type, no additional information';
+		}
 	}
 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
@@ -386,19 +479,34 @@ 
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
 		$end = strrpos ( $rawdata , '*' );
-		if ($end === FALSE) return -1; // check for NULLS!!!
+		if ($end === FALSE) {
+			return -1;
+		}
+		// check for NULLS!!!
 		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
+		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
+		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
 			$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
+			if ($pcs[3] == '') {
+				$msg_sid = -1;
+			}
+			// non-multipart message, set to -1
+			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) {
@@ -459,10 +567,18 @@ 
 				//DEBUG echo "[$start $end $tst]\n";
 				$result = $this->process_ais_raw( $tst, "" );
 				$last_pos = $end + 1;
-			} else break;
+			} else {
+				break;
+			}
+		}
+		if ($last_pos > 0) {
+			$cbuf = substr($cbuf, $last_pos);
+		}
+		// move...
+		if (strlen($cbuf) > 1024) {
+			$cbuf = "";
 		}
-		if ($last_pos > 0) $cbuf = substr($cbuf, $last_pos); // move...
-		if (strlen($cbuf) > 1024) $cbuf = ""; // prevent overflow simple mode...
+		// prevent overflow simple mode...
 		return $result;
 	}
 
@@ -482,7 +598,9 @@ 
 		if ($lat<0.0) {
 			$lat = -$lat;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$latd = 0x00000000;
 		$latd = intval ($lat * 600000.0);
 		if ($neg==true) {
@@ -498,7 +616,9 @@ 
 		if ($lon<0.0) {
 			$lon = -$lon;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$lond = 0x00000000;
 		$lond = intval ($lon * 600000.0);
 		if ($neg==true) {
@@ -511,9 +631,14 @@ 
 
 	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);
-		else $pad = '';
+		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(
 		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
@@ -526,9 +651,12 @@ 
 		);
 		// "
 		$_a = str_split($name);
-		if ($_a) foreach ($_a as $_1) {
+		if ($_a) {
+			foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
-			else $dec = 0;
+		} else {
+				$dec = 0;
+			}
 			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
@@ -540,7 +668,9 @@ 
 		$len_bit = strlen($_enc);
 		$rem6 = $len_bit % 6;
 		$pad6_len = 0;
-		if ($rem6) $pad6_len = 6 - $rem6;
+		if ($rem6) {
+			$pad6_len = 6 - $rem6;
+		}
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
 		$len_enc = strlen($_enc) / 6;
@@ -549,8 +679,11 @@ 
 		for ($i=0; $i<$len_enc; $i++) {
 			$offset = $i * 6;
 			$dec = bindec(substr($_enc,$offset,6));
-			if ($dec < 40) $dec += 48;
-			else $dec += 56;
+			if ($dec < 40) {
+				$dec += 48;
+			} else {
+				$dec += 56;
+			}
 			//echo chr($dec)." $dec<br/>";
 			$itu .= chr($dec);
 		}
@@ -563,25 +696,41 @@ 
 		}
 		$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';
+		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];
-		else $msbc = '0';
+		if ($msb >=0 && $msb <= 15 ) {
+			$msbc = $hex_arr[$msb];
+		} else {
+			$msbc = '0';
+		}
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
 	}
 
 	public function parse($buffer) {
 		$data = $this->process_ais_buf($buffer);
-		if (!is_object($data)) return array();
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if (!is_object($data)) {
+			return array();
+		}
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim($data->name);
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->cog != 0) $result['heading'] = $data->cog;
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
 		/*
 		    $ro->cls = 0; // AIS class undefined, also indicate unparsed msg
 		    $ro->id = bindec(substr($_aisdata,0,6));
@@ -591,15 +740,25 @@ 
 
 	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';
-			else return 'Ship';
+			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';
+			}
 		}
 
 	
@@ -616,32 +775,61 @@ 
 			//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;
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$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;
-		elseif ($data->cog != 0) $result['heading'] = $data->cog;
-		if ($data->status != '') $result['status'] = $data->status;
-		if ($data->statusid !== '') $result['statusid'] = $data->statusid;
-		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->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->heading !== '') {
+			$result['heading'] = $data->heading;
+		} elseif ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
+		if ($data->status != '') {
+			$result['status'] = $data->status;
+		}
+		if ($data->statusid !== '') {
+			$result['statusid'] = $data->statusid;
+		}
+		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 (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');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			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');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			if ($eta_ts != '') {
+				$result['eta_ts'] = $eta_ts;
+			}
 		}
 		if ($data->destination != '') {
 			$dest = trim(str_replace('@','',$data->destination));
-			if ($dest != '') $result['destination'] = $dest;
+			if ($dest != '') {
+				$result['destination'] = $dest;
+			}
 		}
 		$result['all'] = (array) $data;
 		/*

accident.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 header('Location: '.$globalURL.'/accident/'.$date);
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/accident/'.$date);
 ?>
\ No newline at end of file

statistics-fatalities-year.php

Spacing +5 added lines, -5 removed lines

@@ -19,13 +19,13 @@ 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $year_data = '';
 $year_cnt = '';
-foreach($date_array as $year_item)
+foreach ($date_array as $year_item)
 {
 	$year_data .= '"'.$year_item['year'].'-01-01",';
 	$year_cnt .= $year_item['count'].',';
 }
 $year_data = "['x',".substr($year_data, 0, -1)."]";
-$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 print 'c3.generate({
     bindto: "#chart",
     data: { x: "x",
@@ -35,12 +35,12 @@ 
 
 if (!empty($date_array))
 {
-	foreach($date_array as $key => $row) {
+	foreach ($date_array as $key => $row) {
 		$years[$key] = $row['year'];
 		$counts[$key] = $row['count'];
 	}
 	//array_multisort($years,SORT_DESC,$date_array);
-	array_multisort($counts,SORT_DESC,$date_array);
+	array_multisort($counts, SORT_DESC, $date_array);
 	print '<div class="table-responsive">';
 	print '<table class="common-date table-striped">';
 	print '<thead>';
@@ -50,7 +50,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-route-airport.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 $route_array = $Spotter->countAllRoutes();
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $route_data = '';
-foreach($route_array as $route_item)
+foreach ($route_array as $route_item)
 {
 	$route_data .= '[ "'.$route_item['airport_departure_icao'].' - '.$route_item['airport_arrival_icao'].'",'.$route_item['route_count'].'],';
 }
@@ -46,7 +46,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($route_array as $route_item)
+	foreach ($route_array as $route_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 $Spotter = new Spotter();
 $title = _("Statistics").' - '._("Most common Route by Airport");
 require_once('header.php');
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 include('statistics-sub-menu.php'); 
 
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

require/class.Connection.php

Braces +80 added lines, -31 removed lines

@@ -72,8 +72,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $globalDBuser;
 				$globalDBSpass = $globalDBpass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			} else {
 				$DBname = 'default';
 				$globalDBSdriver = $globalDBdriver;
@@ -81,8 +84,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $user;
 				$globalDBSpass = $pass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			}
 		} else {
 			$globalDBSdriver = $globalDB[$DBname]['driver'];
@@ -90,11 +96,16 @@ 
 			$globalDBSname = $globalDB[$DBname]['name'];
 			$globalDBSuser = $globalDB[$DBname]['user'];
 			$globalDBSpass = $globalDB[$DBname]['pass'];
-			if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
-			else $globalDBSport = 3306;
+			if (isset($globalDB[$DBname]['port'])) {
+				$globalDBSport = $globalDB[$DBname]['port'];
+			} else {
+				$globalDBSport = 3306;
+			}
 		}
 		// Set number of try to connect to DB
-		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5;
+		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) {
+			$globalDBretry = 5;
+		}
 		$i = 0;
 		while (true) {
 			try {
@@ -103,10 +114,16 @@ 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -120,23 +137,35 @@ 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
 			} catch(PDOException $e) {
 				$i++;
-				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				if (isset($globalDebug) && $globalDebug) {
+					echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				}
 				//exit;
-				if ($i > $globalDBretry) return false;
+				if ($i > $globalDBretry) {
+					return false;
+				}
 				//return false;
 			}
 		}
-		if ($DBname === 'default') $this->db = $this->dbs['default'];
+		if ($DBname === 'default') {
+			$this->db = $this->dbs['default'];
+		}
 		return true;
 	}
 
@@ -148,7 +177,9 @@ 
 		} else {
 			$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
 		}
-		if ($this->db == NULL) return false;
+		if ($this->db == NULL) {
+			return false;
+		}
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
@@ -157,21 +188,28 @@ 
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	public function connectionExists()
 	{
 		global $globalDBdriver, $globalDBCheckConnection;
-		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
+		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
+			return true;
+		}
 		$query = "SELECT 1 + 1";
-		if ($this->db === null) return false;
+		if ($this->db === null) {
+			return false;
+		}
 		try {
 			$sum = @$this->db->query($query);
 			if ($sum instanceof \PDOStatement) {
 				$sum = $sum->fetchColumn(0);
-			} else $sum = 0;
+			} else {
+				$sum = 0;
+			}
 			if (intval($sum) !== 2) {
 			     return false;
 			}
@@ -206,8 +244,9 @@ 
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
 		if($nb[0]['nb'] > 0) {
 			return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/*
@@ -257,9 +296,12 @@ 
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
-			if ($result['nb'] > 0) return true;
-			else return false;
-/*		} else {
+			if ($result['nb'] > 0) {
+				return true;
+			} else {
+				return false;
+			}
+			/*		} else {
 			$query = "SELECT * FROM ".$table." LIMIT 0";
 			try {
 				$results = $this->db->query($query);
@@ -298,7 +340,9 @@ 
 				$sth->closeCursor();
 				return $result['value'];
 			}
-		} else return $version;
+		} else {
+			return $version;
+		}
 	}
 	
 	/*
@@ -307,9 +351,14 @@ 
 	*/
 	public function latest() {
 	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+	    	return true;
+	    }
+	    if ($this->check_schema_version() == $this->latest_schema) {
+	    	return true;
+	    } else {
+	    	return false;
+	    }
 	}
 
 }

Doc Comments +20 added lines

@@ -6,6 +6,9 @@ 
 	public $dbs = array();
 	public $latest_schema = 45;
 	
+	/**
+	 * @param string $dbname
+	 */
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
 	    global $globalNoDB;
 	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
@@ -141,6 +144,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function tableExists($table)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -190,6 +196,11 @@ 
 	/*
 	* Check if index exist
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $index
+	 */
 	public function indexExists($table,$index)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -232,6 +243,10 @@ 
 		return $columns;
 	}
 
+	/**
+	 * @param string $table
+	 * @param string $column
+	 */
 	public function getColumnType($table,$column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
@@ -242,6 +257,11 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $name
+	 */
 	public function checkColumnName($table,$name)
 	{
 		global $globalDBdriver, $globalDBname;

Indentation +30 added lines, -30 removed lines

@@ -7,35 +7,35 @@ 
 	public $latest_schema = 45;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+		global $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
-	    } else {
+		} else {
 		if ($dbc === null) {
-		    if ($this->db === null && $dbname === null) {
+			if ($this->db === null && $dbname === null) {
 			if ($user === null && $pass === null) {
-			    $this->createDBConnection();
+				$this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+				$this->createDBConnection(null,$user,$pass);
 			}
-		    } else {
+			} else {
 			$this->createDBConnection($dbname);
-		    }
+			}
 		} elseif ($dbname === null || $dbname === 'default') {
-	    	    $this->db = $dbc;
-	    	    if ($this->connectionExists() === false) {
+				$this->db = $dbc;
+				if ($this->connectionExists() === false) {
 			/*
 			echo 'Restart Connection !!!'."\n";
 			$e = new \Exception;
 			var_dump($e->getTraceAsString());
 			*/
 			$this->createDBConnection();
-		    }
+			}
 		} else {
-		    //$this->connectionExists();
-		    $this->dbs[$dbname] = $dbc;
+			//$this->connectionExists();
+			$this->dbs[$dbname] = $dbc;
+		}
 		}
-	    }
 	}
 
 	public function db() {
@@ -56,11 +56,11 @@ 
 	}
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -157,7 +157,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -174,14 +174,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -285,8 +285,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 				try {
@@ -307,10 +307,10 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		global $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }

Spacing +29 added lines, -29 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 45;
 	
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 	    global $globalNoDB;
 	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
@@ -16,7 +16,7 @@ 
 			if ($user === null && $pass === null) {
 			    $this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+			    $this->createDBConnection(null, $user, $pass);
 			}
 		    } else {
 			$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
 				//exit;
@@ -153,10 +153,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -177,8 +177,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -190,7 +190,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -201,11 +201,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -220,7 +220,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -232,7 +232,7 @@ 
 		return $columns;
 	}
 
-	public function getColumnType($table,$column) {
+	public function getColumnType($table, $column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
 		return $tomet['native_type'];
@@ -242,7 +242,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -252,8 +252,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -292,7 +292,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

airline-statistics-arrival-airport-country.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

Braces +4 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($_GET['airline'] == $airline_name['airline_icao'])
@@ -64,8 +66,7 @@ 
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Spacing +19 added lines, -19 removed lines

@@ -7,21 +7,21 @@ 
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Arrival Airports by Country from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Arrival Airports by Country from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>─────────────────</option>';
@@ -42,9 +42,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($_GET['airline'] == $airline_name['airline_icao'])
+		if ($_GET['airline'] == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,9 +94,9 @@ 
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	/*
 	if ($alliance) {
@@ -105,14 +105,14 @@ 
 		$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAirline($airline);
 	}
 	*/
-	$airport_country_array = $Stats->countAllArrivalCountries(true,$airline);
+	$airport_country_array = $Stats->countAllArrivalCountries(true, $airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -160,7 +160,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

incident.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 header('Location: '.$globalURL.'/incident/'.$date);
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/incident/'.$date);
 ?>
\ No newline at end of file