Inspection of "Fix NOTAM import" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( e82944...fd6580 )

by Yannick

created 2017-06-09 15:43 UTC

Status

Spacing +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -982,7 +982,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1000,19 +1000,19 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 	public function getAllNOTAMtext() {
-		$query  = 'SELECT full_notam FROM notam';
+		$query = 'SELECT full_notam FROM notam';
 		$query_values = array();
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1021,13 +1021,13 @@  discard block
 block discarded – undo
 	public function createNOTAMtextFile($filename) {
 		$allnotam_result = $this->getAllNOTAMtext();
 		$notamtext = '';
-		foreach($allnotam_result as $notam) {
+		foreach ($allnotam_result as $notam) {
 			$notamtext .= '%%'."\n";
 			$notamtext .= $notam['full_notam'];
 			$notamtext .= "\n".'%%'."\n";
 		}
 		//$allnotam = implode('\n%%%%\n',$allnotam_result);
-		file_put_contents($filename,$notamtext);
+		file_put_contents($filename, $notamtext);
 	}
 	public function parseNOTAMtextFile($filename) {
 		$data = file_get_contents($filename);
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1057,10 +1057,10 @@  discard block
 block discarded – undo
 	public function getAllNOTAMbyCoord($coord) {
 		global $globalDBdriver;
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$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);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$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);
 			if ($minlat > $maxlat) {
 				$tmplat = $minlat;
 				$minlat = $maxlat;
@@ -1082,19 +1082,19 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllNOTAMbyCoordScope($coord,$scope) {
+	public function getAllNOTAMbyCoordScope($coord, $scope) {
 		global $globalDBdriver;
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$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);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$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();
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1118,7 +1118,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1126,13 +1126,13 @@  discard block
 block discarded – undo
 		else return array();
 	}
 
-	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
+	public function addNOTAM($ref, $title, $type, $fir, $code, $rules, $scope, $lower_limit, $upper_limit, $center_latitude, $center_longitude, $radius, $date_begin, $date_end, $permanent, $text, $full_notam) {
 		$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
-		$query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
+		$query_values = array(':ref' => $ref, ':title' => $title, ':type' => $type, ':fir' => $fir, ':code' => $code, ':rules' => $rules, ':scope' => $scope, ':lower_limit' => $lower_limit, ':upper_limit' => $upper_limit, ':center_latitude' => $center_latitude, ':center_longitude' => $center_longitude, ':radius' => $radius, ':date_begin' => $date_begin, ':date_end' => $date_end, ':permanent' => $permanent, ':text' => $text, ':full_notam' => $full_notam);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1158,7 +1158,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1177,7 +1177,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1194,14 +1194,14 @@  discard block
 block discarded – undo
 	public function updateNOTAM() {
 		global $globalNOTAMAirports;
 		if (isset($globalNOTAMAirports) && is_array($globalNOTAMAirports) && count($globalNOTAMAirports) > 0) {
-			foreach (array_chunk($globalNOTAMAirports,10) as $airport) {
-				$airport_icao = implode(',',$airport);
+			foreach (array_chunk($globalNOTAMAirports, 10) as $airport) {
+				$airport_icao = implode(',', $airport);
 				$alldata = $this->downloadNOTAM($airport_icao);
 				if (count($alldata) > 0) {
 					foreach ($alldata as $initial_data) {
 						$data = $this->parse($initial_data);
 						$notamref = $this->getNOTAMbyRef($data['ref']);
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						if (count($notamref) == 0) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 					}
 				}
 			}
@@ -1214,7 +1214,7 @@  discard block
 block discarded – undo
 			foreach ($alldata as $initial_data) {
 				$data = $this->parse($initial_data);
 				$notamref = $this->getNOTAMbyRef($data['ref']);
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 			}
 		}
 	}
@@ -1223,12 +1223,12 @@  discard block
 block discarded – undo
 		global $globalTransaction;
 		$Spotter = new Spotter();
 		$allairports = $Spotter->getAllAirportInfo();
-		foreach (array_chunk($allairports,20) as $airport) {
+		foreach (array_chunk($allairports, 20) as $airport) {
 			$airports_icao = array();
-			foreach($airport as $icao) {
+			foreach ($airport as $icao) {
 				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
 			}
-			$airport_icao = implode(',',$airports_icao);
+			$airport_icao = implode(',', $airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
 			if ($globalTransaction) $this->db->beginTransaction();
 			if (count($alldata) > 0) {
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
 						if (count($notamref) == 0) {
 							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
 							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'], '', '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 						}
 					}
 				}
@@ -1255,7 +1255,7 @@  discard block
 block discarded – undo
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		//$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=DOMESTIC&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
-		$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
+		$url = str_replace('{icao}', $icao, 'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
@@ -1272,9 +1272,9 @@  discard block
 block discarded – undo
 		$result['permanent'] = '';
 		$result['date_begin'] = NULL;
 		$result['date_end'] = NULL;
-		$data = str_ireplace(array("\r","\n",'\r','\n'),' ',$data);
+		$data = str_ireplace(array("\r", "\n", '\r', '\n'), ' ', $data);
 		//echo $data."\n";
-		$data = preg_split('#\s(?=([A-Z]\)\s))#',$data);
+		$data = preg_split('#\s(?=([A-Z]\)\s))#', $data);
 		//print_r($data);
 		$q = false;
 		$a = false;
@@ -1283,9 +1283,9 @@  discard block
 block discarded – undo
 		$e = false;
 		foreach ($data as $line) {
 			$line = trim($line);
-			if (preg_match('#(^|\s)Q\) (.*)#',$line,$matches) && $q === false) {
-				$line = str_replace(' ','',$line);
-				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#',$line,$matches)) {
+			if (preg_match('#(^|\s)Q\) (.*)#', $line, $matches) && $q === false) {
+				$line = str_replace(' ', '', $line);
+				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#', $line, $matches)) {
 				//if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#',$line,$matches)) {
 					//print_r($matches);
 					$result['fir'] = $matches[1];
@@ -1331,9 +1331,9 @@  discard block
 block discarded – undo
 					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
 					$result['lower_limit'] = $matches[6];
 					$result['upper_limit'] = $matches[7];
-					$latitude = $Common->convertDec($matches[8],'latitude');
+					$latitude = $Common->convertDec($matches[8], 'latitude');
 					if ($matches[9] == 'S') $latitude = -$latitude;
-					$longitude = $Common->convertDec($matches[10],'longitude');
+					$longitude = $Common->convertDec($matches[10], 'longitude');
 					if ($matches[11] == 'W') $longitude = -$longitude;
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
@@ -1345,24 +1345,24 @@  discard block
 block discarded – undo
 					echo "Can't parse : ".$line."\n";
 				}
 			}
-			elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
+			elseif (preg_match('#(^|\s)A\) (.*)#', $line, $matches) && $a === false) {
 				$result['icao'] = $matches[2];
 				$a = true;
 			}
-			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
+			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#', $line, $matches) && $b === false) {
 				if ($matches[1] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
 				$b = true;
 			}
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#', $line, $matches) && $c === false) {
 				if ($matches[2] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
 				$result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#', $line, $matches) && $c === false) {
 				if ($matches[2] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
@@ -1372,7 +1372,7 @@  discard block
 block discarded – undo
 				else $result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#', $line, $matches) && $c === false) {
 				$result['date_end'] = '2030/12/20 12:00';
 				if ($matches[2] == 'EST') $result['estimated'] = 1;
 				else $result['estimated'] = 0;
@@ -1380,20 +1380,20 @@  discard block
 block discarded – undo
 				else $result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
+			elseif (preg_match('#(^|\s)E\) (.*)#', $line, $matches) && $e === false) {
 				$rtext = array();
-				$text = explode(' ',$matches[2]);
+				$text = explode(' ', $matches[2]);
 				foreach ($text as $word) {
 					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
+					elseif (ctype_digit(strval(substr($word, 3))) && isset($this->abbr[substr($word, 0, 3)])) $rtext[] = strtoupper($this->abbr[substr($word, 0, 3)]).' '.substr($word, 3);
 					else $rtext[] = $word;
 				}
-				$result['text'] = implode(' ',$rtext);
+				$result['text'] = implode(' ', $rtext);
 				$e = true;
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
 			//} elseif (preg_match('#G\) (.*)#',$line,$matches)) {
-			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
-				$text = explode(' ',$line);
+			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#', $line, $matches)) {
+				$text = explode(' ', $line);
 				$result['ref'] = $text[0];
 				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
 				if ($matches[1] == 'NOTAMC') {

Please login to merge, or discard this patch.

		@@ -982,7 +982,7 @@ discard block
		block discarded – undo
982	982	try {
983	983	$sth = $this->db->prepare($query);
984	984	$sth->execute($query_values);
985		- } catch(PDOException $e) {
	985	+ } catch (PDOException $e) {
986	986	echo "error : ".$e->getMessage();
987	987	}
988	988	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -1000,19 +1000,19 @@ discard block
		block discarded – undo
1000	1000	try {
1001	1001	$sth = $this->db->prepare($query);
1002	1002	$sth->execute($query_values);
1003		- } catch(PDOException $e) {
	1003	+ } catch (PDOException $e) {
1004	1004	echo "error : ".$e->getMessage();
1005	1005	}
1006	1006	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1007	1007	return $all;
1008	1008	}
1009	1009	public function getAllNOTAMtext() {
1010		- $query = 'SELECT full_notam FROM notam';
	1010	+ $query = 'SELECT full_notam FROM notam';
1011	1011	$query_values = array();
1012	1012	try {
1013	1013	$sth = $this->db->prepare($query);
1014	1014	$sth->execute($query_values);
1015		- } catch(PDOException $e) {
	1015	+ } catch (PDOException $e) {
1016	1016	echo "error : ".$e->getMessage();
1017	1017	}
1018	1018	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -1021,13 +1021,13 @@ discard block
		block discarded – undo
1021	1021	public function createNOTAMtextFile($filename) {
1022	1022	$allnotam_result = $this->getAllNOTAMtext();
1023	1023	$notamtext = '';
1024		- foreach($allnotam_result as $notam) {
	1024	+ foreach ($allnotam_result as $notam) {
1025	1025	$notamtext .= '%%'."\n";
1026	1026	$notamtext .= $notam['full_notam'];
1027	1027	$notamtext .= "\n".'%%'."\n";
1028	1028	}
1029	1029	//$allnotam = implode('\n%%%%\n',$allnotam_result);
1030		- file_put_contents($filename,$notamtext);
	1030	+ file_put_contents($filename, $notamtext);
1031	1031	}
1032	1032	public function parseNOTAMtextFile($filename) {
1033	1033	$data = file_get_contents($filename);
		@@ -1048,7 +1048,7 @@ discard block
		block discarded – undo
1048	1048	try {
1049	1049	$sth = $this->db->prepare($query);
1050	1050	$sth->execute($query_values);
1051		- } catch(PDOException $e) {
	1051	+ } catch (PDOException $e) {
1052	1052	echo "error : ".$e->getMessage();
1053	1053	}
1054	1054	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -1057,10 +1057,10 @@ discard block
		block discarded – undo
1057	1057	public function getAllNOTAMbyCoord($coord) {
1058	1058	global $globalDBdriver;
1059	1059	if (is_array($coord)) {
1060		- $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1061		- $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1062		- $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1063		- $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
	1060	+ $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1061	+ $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1062	+ $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1063	+ $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1064	1064	if ($minlat > $maxlat) {
1065	1065	$tmplat = $minlat;
1066	1066	$minlat = $maxlat;
		@@ -1082,19 +1082,19 @@ discard block
		block discarded – undo
1082	1082	try {
1083	1083	$sth = $this->db->prepare($query);
1084	1084	$sth->execute($query_values);
1085		- } catch(PDOException $e) {
	1085	+ } catch (PDOException $e) {
1086	1086	echo "error : ".$e->getMessage();
1087	1087	}
1088	1088	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1089	1089	return $all;
1090	1090	}
1091		- public function getAllNOTAMbyCoordScope($coord,$scope) {
	1091	+ public function getAllNOTAMbyCoordScope($coord, $scope) {
1092	1092	global $globalDBdriver;
1093	1093	if (is_array($coord)) {
1094		- $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1095		- $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1096		- $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1097		- $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
	1094	+ $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1095	+ $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1096	+ $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
	1097	+ $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1098	1098	} else return array();
1099	1099	if ($globalDBdriver == 'mysql') {
1100	1100	$query = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
		@@ -1106,7 +1106,7 @@ discard block
		block discarded – undo
1106	1106	try {
1107	1107	$sth = $this->db->prepare($query);
1108	1108	$sth->execute($query_values);
1109		- } catch(PDOException $e) {
	1109	+ } catch (PDOException $e) {
1110	1110	echo "error : ".$e->getMessage();
1111	1111	}
1112	1112	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -1118,7 +1118,7 @@ discard block
		block discarded – undo
1118	1118	try {
1119	1119	$sth = $this->db->prepare($query);
1120	1120	$sth->execute($query_values);
1121		- } catch(PDOException $e) {
	1121	+ } catch (PDOException $e) {
1122	1122	return "error : ".$e->getMessage();
1123	1123	}
1124	1124	$all = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -1126,13 +1126,13 @@ discard block
		block discarded – undo
1126	1126	else return array();
1127	1127	}
1128	1128
1129		- public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
	1129	+ public function addNOTAM($ref, $title, $type, $fir, $code, $rules, $scope, $lower_limit, $upper_limit, $center_latitude, $center_longitude, $radius, $date_begin, $date_end, $permanent, $text, $full_notam) {
1130	1130	$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
1131		- $query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
	1131	+ $query_values = array(':ref' => $ref, ':title' => $title, ':type' => $type, ':fir' => $fir, ':code' => $code, ':rules' => $rules, ':scope' => $scope, ':lower_limit' => $lower_limit, ':upper_limit' => $upper_limit, ':center_latitude' => $center_latitude, ':center_longitude' => $center_longitude, ':radius' => $radius, ':date_begin' => $date_begin, ':date_end' => $date_end, ':permanent' => $permanent, ':text' => $text, ':full_notam' => $full_notam);
1132	1132	try {
1133	1133	$sth = $this->db->prepare($query);
1134	1134	$sth->execute($query_values);
1135		- } catch(PDOException $e) {
	1135	+ } catch (PDOException $e) {
1136	1136	return "error : ".$e->getMessage();
1137	1137	}
1138	1138	}
		@@ -1143,7 +1143,7 @@ discard block
		block discarded – undo
1143	1143	try {
1144	1144	$sth = $this->db->prepare($query);
1145	1145	$sth->execute($query_values);
1146		- } catch(PDOException $e) {
	1146	+ } catch (PDOException $e) {
1147	1147	return "error : ".$e->getMessage();
1148	1148	}
1149	1149	}
		@@ -1158,7 +1158,7 @@ discard block
		block discarded – undo
1158	1158	try {
1159	1159	$sth = $this->db->prepare($query);
1160	1160	$sth->execute($query_values);
1161		- } catch(PDOException $e) {
	1161	+ } catch (PDOException $e) {
1162	1162	return "error : ".$e->getMessage();
1163	1163	}
1164	1164	}
		@@ -1168,7 +1168,7 @@ discard block
		block discarded – undo
1168	1168	try {
1169	1169	$sth = $this->db->prepare($query);
1170	1170	$sth->execute($query_values);
1171		- } catch(PDOException $e) {
	1171	+ } catch (PDOException $e) {
1172	1172	return "error : ".$e->getMessage();
1173	1173	}
1174	1174	}
		@@ -1177,7 +1177,7 @@ discard block
		block discarded – undo
1177	1177	try {
1178	1178	$sth = $this->db->prepare($query);
1179	1179	$sth->execute();
1180		- } catch(PDOException $e) {
	1180	+ } catch (PDOException $e) {
1181	1181	return "error : ".$e->getMessage();
1182	1182	}
1183	1183	}
		@@ -1186,7 +1186,7 @@ discard block
		block discarded – undo
1186	1186	try {
1187	1187	$sth = $this->db->prepare($query);
1188	1188	$sth->execute();
1189		- } catch(PDOException $e) {
	1189	+ } catch (PDOException $e) {
1190	1190	return "error : ".$e->getMessage();
1191	1191	}
1192	1192	}
		@@ -1194,14 +1194,14 @@ discard block
		block discarded – undo
1194	1194	public function updateNOTAM() {
1195	1195	global $globalNOTAMAirports;
1196	1196	if (isset($globalNOTAMAirports) && is_array($globalNOTAMAirports) && count($globalNOTAMAirports) > 0) {
1197		- foreach (array_chunk($globalNOTAMAirports,10) as $airport) {
1198		- $airport_icao = implode(',',$airport);
	1197	+ foreach (array_chunk($globalNOTAMAirports, 10) as $airport) {
	1198	+ $airport_icao = implode(',', $airport);
1199	1199	$alldata = $this->downloadNOTAM($airport_icao);
1200	1200	if (count($alldata) > 0) {
1201	1201	foreach ($alldata as $initial_data) {
1202	1202	$data = $this->parse($initial_data);
1203	1203	$notamref = $this->getNOTAMbyRef($data['ref']);
1204		- if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
	1204	+ if (count($notamref) == 0) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1205	1205	}
1206	1206	}
1207	1207	}
		@@ -1214,7 +1214,7 @@ discard block
		block discarded – undo
1214	1214	foreach ($alldata as $initial_data) {
1215	1215	$data = $this->parse($initial_data);
1216	1216	$notamref = $this->getNOTAMbyRef($data['ref']);
1217		- if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
	1217	+ if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1218	1218	}
1219	1219	}
1220	1220	}
		@@ -1223,12 +1223,12 @@ discard block
		block discarded – undo
1223	1223	global $globalTransaction;
1224	1224	$Spotter = new Spotter();
1225	1225	$allairports = $Spotter->getAllAirportInfo();
1226		- foreach (array_chunk($allairports,20) as $airport) {
	1226	+ foreach (array_chunk($allairports, 20) as $airport) {
1227	1227	$airports_icao = array();
1228		- foreach($airport as $icao) {
	1228	+ foreach ($airport as $icao) {
1229	1229	if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
1230	1230	}
1231		- $airport_icao = implode(',',$airports_icao);
	1231	+ $airport_icao = implode(',', $airports_icao);
1232	1232	$alldata = $this->downloadNOTAM($airport_icao);
1233	1233	if ($globalTransaction) $this->db->beginTransaction();
1234	1234	if (count($alldata) > 0) {
		@@ -1241,7 +1241,7 @@ discard block
		block discarded – undo
1241	1241	if (count($notamref) == 0) {
1242	1242	if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
1243	1243	if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
1244		- elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
	1244	+ elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'], '', '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1245	1245	}
1246	1246	}
1247	1247	}
		@@ -1255,7 +1255,7 @@ discard block
		block discarded – undo
1255	1255	date_default_timezone_set("UTC");
1256	1256	$Common = new Common();
1257	1257	//$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=DOMESTIC&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
1258		- $url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
	1258	+ $url = str_replace('{icao}', $icao, 'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
1259	1259	$data = $Common->getData($url);
1260	1260	preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
1261	1261	//print_r($matches);
		@@ -1272,9 +1272,9 @@ discard block
		block discarded – undo
1272	1272	$result['permanent'] = '';
1273	1273	$result['date_begin'] = NULL;
1274	1274	$result['date_end'] = NULL;
1275		- $data = str_ireplace(array("\r","\n",'\r','\n'),' ',$data);
	1275	+ $data = str_ireplace(array("\r", "\n", '\r', '\n'), ' ', $data);
1276	1276	//echo $data."\n";
1277		- $data = preg_split('#\s(?=([A-Z]\)\s))#',$data);
	1277	+ $data = preg_split('#\s(?=([A-Z]\)\s))#', $data);
1278	1278	//print_r($data);
1279	1279	$q = false;
1280	1280	$a = false;
		@@ -1283,9 +1283,9 @@ discard block
		block discarded – undo
1283	1283	$e = false;
1284	1284	foreach ($data as $line) {
1285	1285	$line = trim($line);
1286		- if (preg_match('#(^\|\s)Q\) (.*)#',$line,$matches) && $q === false) {
1287		- $line = str_replace(' ','',$line);
1288		- if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV\|I\|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N\|S)([0-9]{5})(E\|W)([0-9]{3}\|)#',$line,$matches)) {
	1286	+ if (preg_match('#(^\|\s)Q\) (.*)#', $line, $matches) && $q === false) {
	1287	+ $line = str_replace(' ', '', $line);
	1288	+ if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV\|I\|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N\|S)([0-9]{5})(E\|W)([0-9]{3}\|)#', $line, $matches)) {
1289	1289	//if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV\|I\|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N\|S)([0-9]{5})(E\|W)([0-9]{3})#',$line,$matches)) {
1290	1290	//print_r($matches);
1291	1291	$result['fir'] = $matches[1];
		@@ -1331,9 +1331,9 @@ discard block
		block discarded – undo
1331	1331	elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
1332	1332	$result['lower_limit'] = $matches[6];
1333	1333	$result['upper_limit'] = $matches[7];
1334		- $latitude = $Common->convertDec($matches[8],'latitude');
	1334	+ $latitude = $Common->convertDec($matches[8], 'latitude');
1335	1335	if ($matches[9] == 'S') $latitude = -$latitude;
1336		- $longitude = $Common->convertDec($matches[10],'longitude');
	1336	+ $longitude = $Common->convertDec($matches[10], 'longitude');
1337	1337	if ($matches[11] == 'W') $longitude = -$longitude;
1338	1338	$result['latitude'] = $latitude;
1339	1339	$result['longitude'] = $longitude;
		@@ -1345,24 +1345,24 @@ discard block
		block discarded – undo
1345	1345	echo "Can't parse : ".$line."\n";
1346	1346	}
1347	1347	}
1348		- elseif (preg_match('#(^\|\s)A\) (.*)#',$line,$matches) && $a === false) {
	1348	+ elseif (preg_match('#(^\|\s)A\) (.*)#', $line, $matches) && $a === false) {
1349	1349	$result['icao'] = $matches[2];
1350	1350	$a = true;
1351	1351	}
1352		- elseif (preg_match('#(^\|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
	1352	+ elseif (preg_match('#(^\|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#', $line, $matches) && $b === false) {
1353	1353	if ($matches[1] > 50) $year = '19'.$matches[2];
1354	1354	else $year = '20'.$matches[2];
1355	1355	$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1356	1356	$b = true;
1357	1357	}
1358		- elseif (preg_match('#(^\|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
	1358	+ elseif (preg_match('#(^\|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#', $line, $matches) && $c === false) {
1359	1359	if ($matches[2] > 50) $year = '19'.$matches[2];
1360	1360	else $year = '20'.$matches[2];
1361	1361	$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1362	1362	$result['permanent'] = 0;
1363	1363	$c = true;
1364	1364	}
1365		- elseif (preg_match('#(^\|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST\|PERM)$#',$line,$matches) && $c === false) {
	1365	+ elseif (preg_match('#(^\|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST\|PERM)$#', $line, $matches) && $c === false) {
1366	1366	if ($matches[2] > 50) $year = '19'.$matches[2];
1367	1367	else $year = '20'.$matches[2];
1368	1368	$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
		@@ -1372,7 +1372,7 @@ discard block
		block discarded – undo
1372	1372	else $result['permanent'] = 0;
1373	1373	$c = true;
1374	1374	}
1375		- elseif (preg_match('#(^\|\s)C\) (EST\|PERM)$#',$line,$matches) && $c === false) {
	1375	+ elseif (preg_match('#(^\|\s)C\) (EST\|PERM)$#', $line, $matches) && $c === false) {
1376	1376	$result['date_end'] = '2030/12/20 12:00';
1377	1377	if ($matches[2] == 'EST') $result['estimated'] = 1;
1378	1378	else $result['estimated'] = 0;
		@@ -1380,20 +1380,20 @@ discard block
		block discarded – undo
1380	1380	else $result['permanent'] = 0;
1381	1381	$c = true;
1382	1382	}
1383		- elseif (preg_match('#(^\|\s)E\) (.*)#',$line,$matches) && $e === false) {
	1383	+ elseif (preg_match('#(^\|\s)E\) (.*)#', $line, $matches) && $e === false) {
1384	1384	$rtext = array();
1385		- $text = explode(' ',$matches[2]);
	1385	+ $text = explode(' ', $matches[2]);
1386	1386	foreach ($text as $word) {
1387	1387	if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
1388		- elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
	1388	+ elseif (ctype_digit(strval(substr($word, 3))) && isset($this->abbr[substr($word, 0, 3)])) $rtext[] = strtoupper($this->abbr[substr($word, 0, 3)]).' '.substr($word, 3);
1389	1389	else $rtext[] = $word;
1390	1390	}
1391		- $result['text'] = implode(' ',$rtext);
	1391	+ $result['text'] = implode(' ', $rtext);
1392	1392	$e = true;
1393	1393	//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
1394	1394	//} elseif (preg_match('#G\) (.*)#',$line,$matches)) {
1395		- } elseif (preg_match('#(NOTAMN\|NOTAMR\|NOTAMC)#',$line,$matches)) {
1396		- $text = explode(' ',$line);
	1395	+ } elseif (preg_match('#(NOTAMN\|NOTAMR\|NOTAMC)#', $line, $matches)) {
	1396	+ $text = explode(' ', $line);
1397	1397	$result['ref'] = $text[0];
1398	1398	if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
1399	1399	if ($matches[1] == 'NOTAMC') {

Ysurac / FlightAirMap

Push — master ( e82944...fd6580 )

Status

Category

Spacing +54 added lines, -54 removed lines patch added patch discarded remove patch