Ysurac / FlightAirMap

location-data.php

Braces +40 added lines, -15 removed lines

@@ -17,12 +17,19 @@ 
 date_default_timezone_set('UTC');
 
 print '<div class="top">';
-if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
-elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
-elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
-elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
-elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
-else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
+if ($spotter_item['name'] != '') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
+} elseif ($spotter_item['location_id'] != 0) {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
+} elseif ($spotter_item['type'] == 'lightning') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
+} elseif ($spotter_item['type'] == 'wx') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
+} elseif ($spotter_item['type'] == 'fires') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
+} else {
+	print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
+}
 print '</div>';
 
 print '</div></div>';
@@ -40,8 +47,12 @@ 
 print $spotter_item['last_seen'].' UTC';
 print '</div>';
 
-if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+if ($spotter_item['city'] != '') {
+	print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
+}
+if ($spotter_item['country'] !='') {
+	print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+}
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
 /*
 if ($spotter_item['atc_range'] > 0) {
@@ -53,13 +64,27 @@ 
 if ($spotter_item['type'] == 'wx') {
 	$weather = json_decode($spotter_item['description'],true);
 	//print_r($weather);
-	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
-	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
-	if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
-	if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
-	if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
-	if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
-	if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
+	if (isset($weather['temp'])) {
+		print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
+	}
+	if (isset($weather['pressure'])) {
+		print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
+	}
+	if (isset($weather['wind_gust'])) {
+		print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
+	}
+	if (isset($weather['humidity'])) {
+		print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
+	}
+	if (isset($weather['rain'])) {
+		print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
+	}
+	if (isset($weather['precipitation'])) {
+		print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
+	}
+	if (isset($weather['precipitation24h'])) {
+		print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
+	}
 	$spotter_item['description'] = $weather['comment'];
 } elseif ($spotter_item['type'] == 'fires') {
 	//print_r(json_decode($spotter_item['description'],true));

require/class.ACARS.php

Braces +415 added lines, -263 removed lines

@@ -13,7 +13,9 @@ 
 	public function __construct($dbc = null,$fromACARSscript = false) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ACARS)');
+		}
 		if ($fromACARSscript) {
 			$this->fromACARSscript = true;
 			$this->SI = new SpotterImport($this->db);
@@ -27,14 +29,19 @@ 
 	*/
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$Spotter = new Spotter($this->db);
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -107,14 +114,24 @@ 
 		$message = '';
 		$result = array();
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		if ($n == 0) {
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
 		if ($n != 0) {
 			$registration = str_replace('.','',$registration);
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
-		} else $message = $data;
+			if ($globalDebug) {
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
+			}
+		} else {
+			$message = $data;
+		}
 		$decode = array();
 		$found = false;
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -134,12 +151,21 @@ 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$latitude = $la / 10000.0;
 					$longitude = $ln / 10000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 					// Temp not always available
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
+					}
+					if ($temp == '') {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
+					} else {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					}
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -153,25 +179,35 @@ 
 				$ahour = '';
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
+					if ($globalDebug) {
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
-				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+				} elseif ($n == 2 || $n  == 4) {
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($globalDebug) {
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
 					$found = true;
-				}
-				elseif ($n == 1) {
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
+				} elseif ($n == 1) {
+					if ($globalDebug) {
+						echo 'airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $darr);
@@ -189,7 +225,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -223,14 +261,23 @@ 
 				$apiste = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) {
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					}
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					if ($ahour == '') {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
+					} else {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					}
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode['icao'] = $icao;
 					$found = true;
@@ -252,9 +299,15 @@ 
 					$lns = $lns.'.'.$lns;
 					$latitude = $las / 1000.0;
 					$longitude = $lns / 1000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					}
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
@@ -272,7 +325,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -285,7 +340,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -298,7 +355,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
 				if ($n == 2) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -312,7 +371,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 6) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -325,7 +386,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 7) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -353,8 +416,12 @@ 
 					$decode['icao'] = $icao;
 					$latitude = $las / 100.0;
 					$longitude = $lns / 100.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
 					$found = true;
@@ -372,8 +439,12 @@ 
 				if ($n == 4) {
 					$latitude = $las;
 					$longitude = $lns;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
 					$found = true;
@@ -389,7 +460,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -410,7 +483,9 @@ 
 				$aident = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					$icao = trim($aident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode['icao'] = $icao;
@@ -427,7 +502,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -442,7 +519,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -457,7 +536,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -467,7 +548,9 @@ 
 			if (!$found) {
 				$n = sscanf($message,'MET01%4c',$airport);
 				if ($n == 1) {
-					if ($globalDebug) echo 'airport name : '.$airport;
+					if ($globalDebug) {
+						echo 'airport name : '.$airport;
+					}
 					$decode = array('Airport/Waypoint name' => $airport);
 					$found = true;
 				}
@@ -475,184 +558,126 @@ 
 			if ($label == 'H1') {
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
-				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
-				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
-				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
-				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
+				} elseif (preg_match(':^#M2APWD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
-				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
-				}
-				elseif (preg_match(':^#CF:',$message)) {
+				} elseif (preg_match(':^#CF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
-				}
-				elseif (preg_match(':^#DF:',$message)) {
+				} elseif (preg_match(':^#DF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
-				}
-				elseif (preg_match(':^#EC:',$message)) {
+				} elseif (preg_match(':^#EC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
-				}
-				elseif (preg_match(':^#EI:',$message)) {
+				} elseif (preg_match(':^#EI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
-				}
-				elseif (preg_match(':^#H1:',$message)) {
+				} elseif (preg_match(':^#H1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
-				}
-				elseif (preg_match(':^#H2:',$message)) {
+				} elseif (preg_match(':^#H2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
-				}
-				elseif (preg_match(':^#HD:',$message)) {
+				} elseif (preg_match(':^#HD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
-				}
-				elseif (preg_match(':^#M1:',$message)) {
+				} elseif (preg_match(':^#M1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
-				}
-				elseif (preg_match(':^#M2:',$message)) {
+				} elseif (preg_match(':^#M2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
-				}
-				elseif (preg_match(':^#M3:',$message)) {
+				} elseif (preg_match(':^#M3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
-				}
-				elseif (preg_match(':^#MD:',$message)) {
+				} elseif (preg_match(':^#MD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
-				}
-				elseif (preg_match(':^#PS:',$message)) {
+				} elseif (preg_match(':^#PS:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
-				}
-				elseif (preg_match(':^#S1:',$message)) {
+				} elseif (preg_match(':^#S1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
-				}
-				elseif (preg_match(':^#S2:',$message)) {
+				} elseif (preg_match(':^#S2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
-				}
-				elseif (preg_match(':^#SD:',$message)) {
+				} elseif (preg_match(':^#SD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
-				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
-				}
-				elseif (preg_match(':^#WO:',$message)) {
+				} elseif (preg_match(':^#WO:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
-				}
-				elseif (preg_match(':^#A1:',$message)) {
+				} elseif (preg_match(':^#A1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#A3:',$message)) {
+				} elseif (preg_match(':^#A3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
-				}
-				elseif (preg_match(':^#A4:',$message)) {
+				} elseif (preg_match(':^#A4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
-				}
-				elseif (preg_match(':^#A6:',$message)) {
+				} elseif (preg_match(':^#A6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
-				}
-				elseif (preg_match(':^#A8:',$message)) {
+				} elseif (preg_match(':^#A8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#A9:',$message)) {
+				} elseif (preg_match(':^#A9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
-				}
-				elseif (preg_match(':^#A0:',$message)) {
+				} elseif (preg_match(':^#A0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
-				}
-				elseif (preg_match(':^#AA:',$message)) {
+				} elseif (preg_match(':^#AA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#AB:',$message)) {
+				} elseif (preg_match(':^#AB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#AC:',$message)) {
+				} elseif (preg_match(':^#AC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AD:',$message)) {
+				} elseif (preg_match(':^#AD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AF:',$message)) {
+				} elseif (preg_match(':^#AF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
-				}
-				elseif (preg_match(':^#B1:',$message)) {
+				} elseif (preg_match(':^#B1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B2:',$message)) {
+				} elseif (preg_match(':^#B2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B3:',$message)) {
+				} elseif (preg_match(':^#B3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B4:',$message)) {
+				} elseif (preg_match(':^#B4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B6:',$message)) {
+				} elseif (preg_match(':^#B6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
-				}
-				elseif (preg_match(':^#B8:',$message)) {
+				} elseif (preg_match(':^#B8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#B9:',$message)) {
+				} elseif (preg_match(':^#B9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
-				}
-				elseif (preg_match(':^#B0:',$message)) {
+				} elseif (preg_match(':^#B0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
-				}
-				elseif (preg_match(':^#BA:',$message)) {
+				} elseif (preg_match(':^#BA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#BB:',$message)) {
+				} elseif (preg_match(':^#BB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#BC:',$message)) {
+				} elseif (preg_match(':^#BC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BD:',$message)) {
+				} elseif (preg_match(':^#BD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BE:',$message)) {
+				} elseif (preg_match(':^#BE:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
-				}
-				elseif (preg_match(':^#BF:',$message)) {
+				} elseif (preg_match(':^#BF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
-				}
-				elseif (preg_match(':^#H3:',$message)) {
+				} elseif (preg_match(':^#H3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
 				}
 			}
 			if ($label == '10') {
 				if (preg_match(':^DTO01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
-				}
-				elseif (preg_match(':^AIS01:',$message)) {
+				} elseif (preg_match(':^AIS01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
-				}
-				elseif (preg_match(':^FTX01:',$message)) {
+				} elseif (preg_match(':^FTX01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
-				}
-				elseif (preg_match(':^FPL01:',$message)) {
+				} elseif (preg_match(':^FPL01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
-				}
-				elseif (preg_match(':^WAB01:',$message)) {
+				} elseif (preg_match(':^WAB01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
-				}
-				elseif (preg_match(':^MET01:',$message)) {
+				} elseif (preg_match(':^MET01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
-				}
-				elseif (preg_match(':^WAB02:',$message)) {
+				} elseif (preg_match(':^WAB02:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
 				}
 			}
@@ -667,38 +692,28 @@ 
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
-					}
-					elseif ($state == 'L') {
+					} elseif ($state == 'L') {
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
-					}
-					elseif ($type == 'S') {
+					} elseif ($type == 'S') {
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
-					}
-					elseif ($type == 'H') {
+					} elseif ($type == 'H') {
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
-					}
-					elseif ($type == 'G') {
+					} elseif ($type == 'G') {
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
-					}
-					elseif ($type == 'C') {
+					} elseif ($type == 'C') {
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
-					}
-					elseif ($type == '2') {
+					} elseif ($type == '2') {
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
-					}
-					elseif ($type == 'X') {
+					} elseif ($type == 'X') {
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
-					}
-					elseif ($type == 'I') {
+					} elseif ($type == 'I') {
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
 					}
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -707,7 +722,9 @@ 
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') {
+				$decode = array_merge(array('Message title' => $title),$decode);
+			}
 			/*
 			// Business jets always use GS0001
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -742,31 +759,54 @@ 
 			$msg = $message['message'];
 			$decode = $message['decode'];
 			$registration = (string)$message['registration'];
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
-			else $latitude = '';
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
-			else $longitude = '';
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
-			else $airicao = '';
-			if (isset($decode['icao'])) $icao = $decode['icao'];
-			else $icao = $Translation->checkTranslation($ident);
+			if (isset($decode['latitude'])) {
+				$latitude = $decode['latitude'];
+			} else {
+				$latitude = '';
+			}
+			if (isset($decode['longitude'])) {
+				$longitude = $decode['longitude'];
+			} else {
+				$longitude = '';
+			}
+			if (isset($decode['airicao'])) {
+				$airicao = $decode['airicao'];
+			} else {
+				$airicao = '';
+			}
+			if (isset($decode['icao'])) {
+				$icao = $decode['icao'];
+			} else {
+				$icao = $Translation->checkTranslation($ident);
+			}
 			$image_array = $Image->getSpotterImage($registration);
 			if (!isset($image_array[0]['registration'])) {
 				$Image->addSpotterImage($registration);
 			}
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
-			if ($globalDebug && isset($info) && $info != '') echo $info;
-			if (count($decode) > 0) $decode_json = json_encode($decode);
-			else $decode_json = '';
+			if ($ident != 'GS0001') {
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			}
+			if ($globalDebug && isset($info) && $info != '') {
+				echo $info;
+			}
+			if (count($decode) > 0) {
+				$decode_json = json_encode($decode);
+			} else {
+				$decode_json = '';
+			}
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
 			}
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			if (!isset($globalACARSArchive)) {
+				$globalACARSArchive = array('10','80','81','82','3F');
+			}
+			if ($result && in_array($label,$globalACARSArchive)) {
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			}
 			if ($globalDebug && count($decode) > 0) {
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
 			}
@@ -789,7 +829,9 @@ 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
 			$Connection = new Connection($this->db);
 			$this->db = $Connection->db;
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
+			if ($globalDebug) {
+				echo "Test if not already in Live ACARS table...";
+			}
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
 			try {
@@ -799,7 +841,9 @@ 
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
-				if ($globalDebug) echo "Add Live ACARS data...";
+				if ($globalDebug) {
+					echo "Add Live ACARS data...";
+				}
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
 				try {
@@ -809,10 +853,14 @@ 
 					return "error : ".$e->getMessage();
 				}
 			} else {
-				if ($globalDebug) echo "Data already in DB...\n";
+				if ($globalDebug) {
+					echo "Data already in DB...\n";
+				}
 				return false;
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 			return true;
 		}
 	}
@@ -843,7 +891,9 @@ 
 			    	    }
 				    if ($stht->fetchColumn() == 0) {
 			*/
-			if ($globalDebug) echo "Add Live ACARS data...";
+			if ($globalDebug) {
+				echo "Add Live ACARS data...";
+			}
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
@@ -852,7 +902,9 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 	}
 
@@ -875,8 +927,11 @@ 
 			return '';
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0]['title'];
-		else return '';
+		if (count($row) > 0) {
+			return $row[0]['title'];
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -895,8 +950,11 @@ 
 			return array();
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row;
-		else return array();
+		if (count($row) > 0) {
+			return $row;
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -916,8 +974,11 @@ 
 			return array();
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0];
-		else return array();
+		if (count($row) > 0) {
+			return $row[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -962,19 +1023,35 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
@@ -999,7 +1076,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1007,8 +1086,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/**
@@ -1057,31 +1137,51 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
 			$icao = '';
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1091,7 +1191,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1099,7 +1201,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -1115,25 +1219,37 @@ 
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
 		$Spotter = new Spotter($this->db);
-		if ($globalDebug) echo "Test if we add ModeS data...";
+		if ($globalDebug) {
+			echo "Test if we add ModeS data...";
+		}
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
+		if ($icao == '') {
+			$icao = $Translation->checkTranslation($ident);
+		}
+		if ($globalDebug) {
+			echo '- Ident : '.$icao.' - ';
+		}
 		if ($ident == '' || $registration == '') {
-			if ($globalDebug) echo "Ident or registration null, exit\n";
+			if ($globalDebug) {
+				echo "Ident or registration null, exit\n";
+			}
 			return '';
 		}
 		$registration = str_replace('.','',$registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
+		if ($globalDebug) {
+			echo "Check if needed to add translation ".$ident.'... ';
+		}
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
 		$querysi_values = array(':registration' => $registration);
 		try {
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1141,9 +1257,14 @@ 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($globalDebug) {
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
+			}
+			if ($ident != $trans_ident) {
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
+			} elseif ($trans_ident == $ident) {
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			}
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1152,32 +1273,46 @@ 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
 				$sth->closeCursor();
-				if (isset($result['modes'])) $hex = $result['modes'];
-				else $hex = '';
+				if (isset($result['modes'])) {
+					$hex = $result['modes'];
+				} else {
+					$hex = '';
+				}
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
+				if ($this->fromACARSscript) {
+					$this->SI->add($SI_data);
+				}
 			}
 		}
-		if ($globalDebug) echo 'Done'."\n";
+		if ($globalDebug) {
+			echo 'Done'."\n";
+		}
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
 		$query_values = array(':ident' => $icao);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (isset($result['flightaware_id'])) {
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
-			else $ModeS = '';
+			if (isset($result['ModeS'])) {
+				$ModeS = $result['ModeS'];
+			} else {
+				$ModeS = '';
+			}
 			if ($ModeS == '') {
 				$id = explode('-',$result['flightaware_id']);
 				$ModeS = $id[0];
@@ -1190,24 +1325,32 @@ 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
 				if (count($row) ==  0) {
-					if ($globalDebug) echo " Add to ModeS table - ";
+					if ($globalDebug) {
+						echo " Add to ModeS table - ";
+					}
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				} else {
-					if ($globalDebug) echo " Update ModeS table - ";
+					if ($globalDebug) {
+						echo " Update ModeS table - ";
+					}
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1219,7 +1362,9 @@ 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1240,7 +1385,9 @@ 
 					    return "error : ".$e->getMessage();
 				}
 				*/
-				if ($globalDebug) echo " Update Spotter_output table - ";
+				if ($globalDebug) {
+					echo " Update Spotter_output table - ";
+				}
 				if ($ICAOTypeCode != '') {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1251,8 +1398,7 @@ 
 				} else {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
-					}
-					elseif ($globalDBdriver == 'pgsql') {
+					} elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1261,14 +1407,20 @@ 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
+			if ($globalDebug) {
+				echo " Can't find ModeS in spotter_output - ";
+			}
+		}
+		if ($globalDebug) {
+			echo "Done\n";
 		}
-		if ($globalDebug) echo "Done\n";
 	}
 }
 ?>

require/class.Accident.php

Braces +87 added lines, -31 removed lines

@@ -10,7 +10,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Accident)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Accident)');
+		}
 	}
 
 	public function get() {
@@ -109,8 +111,11 @@ 
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) {
+						$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+					} else {
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					}
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -126,17 +131,30 @@ 
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-				if ($row['registration'] == '') $row['registration'] = 'NA';
-				if ($row['ident'] == '') $row['ident'] = 'NA';
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+				if ($row['registration'] == '') {
+					$row['registration'] = 'NA';
+				}
+				if ($row['ident'] == '') {
+					$row['ident'] = 'NA';
+				}
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
 				if (isset($identicao[0])) {
 					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+							$icao = $row['ident'];
+						} else {
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+						}
+					} else {
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					}
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-				} else $icao = $row['ident'];
+				} else {
+					$icao = $row['ident'];
+				}
 				$icao = $Translation->checkTranslation($icao,false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -151,10 +169,14 @@ 
 					//else echo 'No data...'."\n";
 				}
 				$data = array_merge($row,$data);
-				if ($data['ident'] == null) $data['ident'] = $icao;
+				if ($data['ident'] == null) {
+					$data['ident'] = $icao;
+				}
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
-				} else $data['message'] = strtolower($data['title']);
+				} else {
+					$data['message'] = strtolower($data['title']);
+				}
 				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
@@ -173,8 +195,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/*
@@ -219,7 +242,9 @@ 
 	*/
 	public function import($file) {
 		global $globalTransaction, $globalDebug;
-		if ($globalDebug) echo 'Import '.$file."\n";
+		if ($globalDebug) {
+			echo 'Import '.$file."\n";
+		}
 		$result = array();
 		if (file_exists($file)) {
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -230,8 +255,11 @@ 
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
-			elseif ($globalDebug) echo 'Nothing to import';
+			if (!empty($result)) {
+				$this->add($result,true);
+			} elseif ($globalDebug) {
+				echo 'Nothing to import';
+			}
 		}
 	}
 
@@ -267,14 +295,23 @@ 
 					}
 				}
 				fclose($handle);
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+			} elseif ($globalDebug) {
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
+			}
+		} elseif ($globalDebug) {
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+		}
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
+		if (empty($result) && $globalDebug) {
+			echo 'Nothing to update';
+		}
 		foreach ($result as $file => $md5) {
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
+			} elseif ($globalDebug) {
+				echo 'Download '.$file.' failed';
+			}
 		}
 	}
 
@@ -291,13 +328,17 @@ 
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 
-		if (empty($crash)) return false;
+		if (empty($crash)) {
+			return false;
+		}
 		if (!$new) {
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
 			$sthd = $Connection->db->prepare($query_delete);
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
@@ -312,7 +353,9 @@ 
 					return $value === "" ? NULL : $value;
 				}, $cr);
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					if (strpos($cr['registration'],'-') === FALSE) {
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					}
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -321,13 +364,19 @@ 
 						$sth->execute($query_values);
 						if ($cr['date'] > time()-(30*86400)) {
 							if (empty($Image->getSpotterImage($cr['registration']))) {
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
+								if ($globalDebug) {
+									echo "\t".'Get image for '.$cr['registration'].'...';
+								}
 								$Image->addSpotterImage($cr['registration']);
-								if ($globalDebug) echo "\t".'Done'."\n";
+								if ($globalDebug) {
+									echo "\t".'Done'."\n";
+								}
 							}
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
+						if ($cr['title'] == '') {
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
+						}
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
 					}
 				}
@@ -336,9 +385,13 @@ 
 					$Connection->db->beginTransaction();
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack();
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			echo $e->getMessage();
 		}
 		$sth_check->closeCursor();
@@ -377,8 +430,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_accidents_update() {

require/class.Source.php

Braces +15 added lines, -5 removed lines

@@ -7,7 +7,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (Source)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Source)');
+		}
 	}
 
 	public function getAllLocationInfo() {
@@ -72,7 +74,9 @@ 
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
 		}
 		$query .= " ORDER BY last_seen DESC";
-		if ($limit) $query .= " LIMIT 400";
+		if ($limit) {
+			$query .= " LIMIT 400";
+		}
 		$query_values = array(':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
@@ -111,7 +115,9 @@ 
 	}
 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -123,7 +129,9 @@ 
 	}
 
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -146,7 +154,9 @@ 
 	}
 
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {

require/class.SpotterArchive.php

Braces +40 added lines, -14 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (SpotterArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (SpotterArchive)');
+		}
 	}
 
 	/**
@@ -27,7 +29,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -116,8 +120,11 @@ 
 			}
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -131,10 +138,17 @@ 
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
+		if ($airline_type === NULL) {
+			$airline_type ='';
+		}
 	
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -630,7 +644,9 @@ 
 		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -846,7 +862,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($date_array[1] != "")
 		{                
 			$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -1112,9 +1130,13 @@ 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1158,9 +1180,13 @@ 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

require/class.TrackerArchive.php

Braces +37 added lines, -13 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (TrackerArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (TrackerArchive)');
+		}
 	}
 
 	/**
@@ -27,7 +29,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -73,8 +77,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -88,9 +95,14 @@ 
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
 			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
 		// Route is not added in tracker_archive
 		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
@@ -592,7 +604,9 @@ 
 		    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -810,7 +824,9 @@ 
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+	    } else {
+	    	$offset = '+00:00';
+	    }
 
 
 	    if ($date_array[1] != "")
@@ -1086,9 +1102,13 @@ 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1132,9 +1152,13 @@ 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

require/class.MarineArchive.php

Braces +37 added lines, -13 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (MarineArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (MarineArchive)');
+		}
 	}
 
 	/**
@@ -27,7 +29,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -73,8 +77,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -88,9 +95,14 @@ 
 		if ($over_country == '') {
 			$Marine = new Marine($this->db);
 			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
 		
 		//$country = $over_country;
 		// Route is not added in marine_archive
@@ -598,7 +610,9 @@ 
 		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -816,7 +830,9 @@ 
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+	    } else {
+	    	$offset = '+00:00';
+	    }
 
 
 	    if ($date_array[1] != "")
@@ -1092,9 +1108,13 @@ 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1138,9 +1158,13 @@ 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

require/class.ATC.php

Braces +20 added lines, -7 removed lines

@@ -7,7 +7,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (ATC)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ATC)');
+		}
 	}
 
 	/**
@@ -20,20 +22,27 @@ 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
+					if (isset($source['source'])) {
+						$filter['source'][] = $source['source'];
+					}
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -90,7 +99,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -106,7 +117,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {

require/class.MarineLive.php

Braces +113 added lines, -38 removed lines

@@ -8,7 +8,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (MarineLive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (MarineLive)');
+		}
 	}
 
 
@@ -30,7 +32,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -77,8 +81,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -119,9 +126,13 @@ 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
 			}
 		}
-		if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC';
+		if ($orderby_query == '') {
+			$orderby_query= ' ORDER BY date DESC';
+		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate";
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -146,7 +157,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0";
@@ -187,48 +200,72 @@ 
 		}
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
+		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') {
+			$globalMap3DMarinesLimit = '300';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = 'SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id,marine_archive.type, marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine 
 				    WHERE latitude <> '0' AND longitude <> '0' 
 				    ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = "SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.type,marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine WHERE latitude <> '0' AND longitude <> '0' ";
 				$query .= "ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		}
 		try {
@@ -253,7 +290,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 		} else {
@@ -281,7 +320,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Marine = new Marine($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -289,7 +330,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
 		} else {
@@ -309,7 +352,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 		$Marine = new Marine($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter,true,true);
 
 		if (is_array($coord)) {
@@ -317,7 +362,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		/*
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
@@ -526,11 +573,15 @@ 
 		//$query  = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -625,7 +676,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -905,7 +958,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -913,7 +968,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 
 		if ($heading != '')
@@ -922,7 +979,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -930,9 +989,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -953,12 +1016,20 @@ 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
 		
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
+            	if ($arrival_date == '') {
+            		$arrival_date = NULL;
+            	}
             	$query = '';
 		if ($globalArchive) {
-			if ($globalDebug) echo '-- Delete previous data -- ';
+			if ($globalDebug) {
+				echo '-- Delete previous data -- ';
+			}
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';
 		}
 		$query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
@@ -974,10 +1045,14 @@ 
 		}
 		
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-			if ($globalDebug) echo '(Add to Marine archive : ';
+			if ($globalDebug) {
+				echo '(Add to Marine archive : ';
+			}
 			$MarineArchive = new MarineArchive($this->db);
 			$result =  $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country);
-			if ($globalDebug) echo $result.')';
+			if ($globalDebug) {
+				echo $result.')';
+			}
 		}
 		return "success";
 	}