Completed
Push — master ( e82944...fd6580 )
by Yannick
08:03
created
require/class.NOTAM.php 2 patches
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove 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') {
Please login to merge, or discard this patch.
Braces   +210 added lines, -89 removed lines patch added patch discarded remove patch
@@ -1033,8 +1033,11 @@  discard block
 block discarded – undo
1033 1033
 		$data = file_get_contents($filename);
1034 1034
 		preg_match_all("/%%(.+?)%%/is", $data, $matches);
1035 1035
 		//print_r($matches);
1036
-		if (isset($matches[1])) return $matches[1];
1037
-		else return array();
1036
+		if (isset($matches[1])) {
1037
+			return $matches[1];
1038
+		} else {
1039
+			return array();
1040
+		}
1038 1041
 	}
1039 1042
 	public function getAllNOTAMbyScope($scope) {
1040 1043
 		global $globalDBdriver;
@@ -1071,7 +1074,9 @@  discard block
 block discarded – undo
1071 1074
 				$minlong = $maxlong;
1072 1075
 				$maxlong = $tmplong;
1073 1076
 			}
1074
-		} else return array();
1077
+		} else {
1078
+			return array();
1079
+		}
1075 1080
 		if ($globalDBdriver == 'mysql') {
1076 1081
 			$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()';
1077 1082
 		} else {
@@ -1095,7 +1100,9 @@  discard block
 block discarded – undo
1095 1100
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1096 1101
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1097 1102
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1098
-		} else return array();
1103
+		} else {
1104
+			return array();
1105
+		}
1099 1106
 		if ($globalDBdriver == 'mysql') {
1100 1107
 			$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';
1101 1108
 		} else {
@@ -1122,8 +1129,11 @@  discard block
 block discarded – undo
1122 1129
 			return "error : ".$e->getMessage();
1123 1130
 		}
1124 1131
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1125
-		if (isset($all[0])) return $all[0];
1126
-		else return array();
1132
+		if (isset($all[0])) {
1133
+			return $all[0];
1134
+		} else {
1135
+			return array();
1136
+		}
1127 1137
 	}
1128 1138
 
1129 1139
 	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) {
@@ -1201,7 +1211,9 @@  discard block
 block discarded – undo
1201 1211
 					foreach ($alldata as $initial_data) {
1202 1212
 						$data = $this->parse($initial_data);
1203 1213
 						$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']);
1214
+						if (count($notamref) == 0) {
1215
+							$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']);
1216
+						}
1205 1217
 					}
1206 1218
 				}
1207 1219
 			}
@@ -1214,7 +1226,9 @@  discard block
 block discarded – undo
1214 1226
 			foreach ($alldata as $initial_data) {
1215 1227
 				$data = $this->parse($initial_data);
1216 1228
 				$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']);
1229
+				if (!isset($notamref['notam_id'])) {
1230
+					$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']);
1231
+				}
1218 1232
 			}
1219 1233
 		}
1220 1234
 	}
@@ -1226,11 +1240,15 @@  discard block
 block discarded – undo
1226 1240
 		foreach (array_chunk($allairports,20) as $airport) {
1227 1241
 			$airports_icao = array();
1228 1242
 			foreach($airport as $icao) {
1229
-				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
1243
+				if (isset($icao['icao'])) {
1244
+					$airports_icao[] = $icao['icao'];
1245
+				}
1230 1246
 			}
1231 1247
 			$airport_icao = implode(',',$airports_icao);
1232 1248
 			$alldata = $this->downloadNOTAM($airport_icao);
1233
-			if ($globalTransaction) $this->db->beginTransaction();
1249
+			if ($globalTransaction) {
1250
+				$this->db->beginTransaction();
1251
+			}
1234 1252
 			if (count($alldata) > 0) {
1235 1253
 				foreach ($alldata as $initial_data) {
1236 1254
 					//print_r($initial_data);
@@ -1239,14 +1257,23 @@  discard block
 block discarded – undo
1239 1257
 					if (isset($data['ref'])) {
1240 1258
 						$notamref = $this->getNOTAMbyRef($data['ref']);
1241 1259
 						if (count($notamref) == 0) {
1242
-							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
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']);
1260
+							if (isset($data['ref_replaced'])) {
1261
+								$this->deleteNOTAMbyRef($data['ref_replaced']);
1262
+							}
1263
+							if (isset($data['ref_cancelled'])) {
1264
+								$this->deleteNOTAMbyRef($data['ref_cancelled']);
1265
+							} elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) {
1266
+								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']);
1267
+							}
1245 1268
 						}
1246 1269
 					}
1247 1270
 				}
1248
-			} else echo 'Error on download. Nothing matches for '.$airport_icao."\n";
1249
-			if ($globalTransaction) $this->db->commit();
1271
+			} else {
1272
+				echo 'Error on download. Nothing matches for '.$airport_icao."\n";
1273
+			}
1274
+			if ($globalTransaction) {
1275
+				$this->db->commit();
1276
+			}
1250 1277
 			sleep(5);
1251 1278
 		}
1252 1279
 	}
@@ -1259,8 +1286,11 @@  discard block
 block discarded – undo
1259 1286
 		$data = $Common->getData($url);
1260 1287
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
1261 1288
 		//print_r($matches);
1262
-		if (isset($matches[1])) return $matches[1];
1263
-		else return array();
1289
+		if (isset($matches[1])) {
1290
+			return $matches[1];
1291
+		} else {
1292
+			return array();
1293
+		}
1264 1294
 	}
1265 1295
 
1266 1296
 	public function parse($data) {
@@ -1294,99 +1324,156 @@  discard block
 block discarded – undo
1294 1324
 					$rules = str_split($matches[3]);
1295 1325
 					foreach ($rules as $rule) {
1296 1326
 						if ($rule == 'I') {
1297
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR';
1298
-							else $result['rules'] = 'IFR';
1327
+							if (isset($result['rules'])) {
1328
+								$result['rules'] = $result['rules'].'/IFR';
1329
+							} else {
1330
+								$result['rules'] = 'IFR';
1331
+							}
1299 1332
 						} elseif ($rule == 'V') {
1300
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR';
1301
-							else $result['rules'] = 'VFR';
1333
+							if (isset($result['rules'])) {
1334
+								$result['rules'] = $result['rules'].'/VFR';
1335
+							} else {
1336
+								$result['rules'] = 'VFR';
1337
+							}
1302 1338
 						} elseif ($rule == 'K') {
1303
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist';
1304
-							else $result['rules'] = 'Checklist';
1339
+							if (isset($result['rules'])) {
1340
+								$result['rules'] = $result['rules'].'/Checklist';
1341
+							} else {
1342
+								$result['rules'] = 'Checklist';
1343
+							}
1305 1344
 						}
1306 1345
 					}
1307 1346
 					$attentions = str_split($matches[4]);
1308 1347
 					foreach ($attentions as $attention) {
1309 1348
 						if ($attention == 'N') {
1310
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention';
1311
-							else $result['rules'] = 'Immediate attention';
1349
+							if (isset($result['attention'])) {
1350
+								$result['attention'] = $result['attention'].' / Immediate attention';
1351
+							} else {
1352
+								$result['rules'] = 'Immediate attention';
1353
+							}
1312 1354
 						} elseif ($attention == 'B') {
1313
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance';
1314
-							else $result['rules'] = 'Operational significance';
1355
+							if (isset($result['attention'])) {
1356
+								$result['attention'] = $result['attention'].' / Operational significance';
1357
+							} else {
1358
+								$result['rules'] = 'Operational significance';
1359
+							}
1315 1360
 						} elseif ($attention == 'O') {
1316
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations';
1317
-							else $result['rules'] = 'Flight operations';
1361
+							if (isset($result['attention'])) {
1362
+								$result['attention'] = $result['attention'].' / Flight operations';
1363
+							} else {
1364
+								$result['rules'] = 'Flight operations';
1365
+							}
1318 1366
 						} elseif ($attention == 'M') {
1319
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc';
1320
-							else $result['rules'] = 'Misc';
1367
+							if (isset($result['attention'])) {
1368
+								$result['attention'] = $result['attention'].' / Misc';
1369
+							} else {
1370
+								$result['rules'] = 'Misc';
1371
+							}
1321 1372
 						} elseif ($attention == 'K') {
1322
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist';
1323
-							else $result['rules'] = 'Checklist';
1373
+							if (isset($result['attention'])) {
1374
+								$result['attention'] = $result['attention'].' / Checklist';
1375
+							} else {
1376
+								$result['rules'] = 'Checklist';
1377
+							}
1324 1378
 						}
1325 1379
 					}
1326
-					if ($matches[5] == 'A') $result['scope'] = 'Airport warning';
1327
-					elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning';
1328
-					elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning';
1329
-					elseif ($matches[5] == 'K') $result['scope'] = 'Checklist';
1330
-					elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning';
1331
-					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
1380
+					if ($matches[5] == 'A') {
1381
+						$result['scope'] = 'Airport warning';
1382
+					} elseif ($matches[5] == 'E') {
1383
+						$result['scope'] = 'Enroute warning';
1384
+					} elseif ($matches[5] == 'W') {
1385
+						$result['scope'] = 'Navigation warning';
1386
+					} elseif ($matches[5] == 'K') {
1387
+						$result['scope'] = 'Checklist';
1388
+					} elseif ($matches[5] == 'AE') {
1389
+						$result['scope'] = 'Airport/Enroute warning';
1390
+					} elseif ($matches[5] == 'AW') {
1391
+						$result['scope'] = 'Airport/Navigation warning';
1392
+					}
1332 1393
 					$result['lower_limit'] = $matches[6];
1333 1394
 					$result['upper_limit'] = $matches[7];
1334 1395
 					$latitude = $Common->convertDec($matches[8],'latitude');
1335
-					if ($matches[9] == 'S') $latitude = -$latitude;
1396
+					if ($matches[9] == 'S') {
1397
+						$latitude = -$latitude;
1398
+					}
1336 1399
 					$longitude = $Common->convertDec($matches[10],'longitude');
1337
-					if ($matches[11] == 'W') $longitude = -$longitude;
1400
+					if ($matches[11] == 'W') {
1401
+						$longitude = -$longitude;
1402
+					}
1338 1403
 					$result['latitude'] = $latitude;
1339 1404
 					$result['longitude'] = $longitude;
1340
-					if ($matches[12] != '') $result['radius'] = intval($matches[12]);
1341
-					else $result['radius'] = 0;
1405
+					if ($matches[12] != '') {
1406
+						$result['radius'] = intval($matches[12]);
1407
+					} else {
1408
+						$result['radius'] = 0;
1409
+					}
1342 1410
 					$q = true;
1343 1411
 				} elseif ($globalDebug) {
1344 1412
 					echo 'NOTAM error : '.$result['full_notam']."\n";
1345 1413
 					echo "Can't parse : ".$line."\n";
1346 1414
 				}
1347
-			}
1348
-			elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
1415
+			} elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
1349 1416
 				$result['icao'] = $matches[2];
1350 1417
 				$a = true;
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) {
1353
-				if ($matches[1] > 50) $year = '19'.$matches[2];
1354
-				else $year = '20'.$matches[2];
1418
+			} elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
1419
+				if ($matches[1] > 50) {
1420
+					$year = '19'.$matches[2];
1421
+				} else {
1422
+					$year = '20'.$matches[2];
1423
+				}
1355 1424
 				$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1356 1425
 				$b = true;
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) {
1359
-				if ($matches[2] > 50) $year = '19'.$matches[2];
1360
-				else $year = '20'.$matches[2];
1426
+			} elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
1427
+				if ($matches[2] > 50) {
1428
+					$year = '19'.$matches[2];
1429
+				} else {
1430
+					$year = '20'.$matches[2];
1431
+				}
1361 1432
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1362 1433
 				$result['permanent'] = 0;
1363 1434
 				$c = true;
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) {
1366
-				if ($matches[2] > 50) $year = '19'.$matches[2];
1367
-				else $year = '20'.$matches[2];
1435
+			} 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) {
1436
+				if ($matches[2] > 50) {
1437
+					$year = '19'.$matches[2];
1438
+				} else {
1439
+					$year = '20'.$matches[2];
1440
+				}
1368 1441
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1369
-				if ($matches[7] == 'EST') $result['estimated'] = 1;
1370
-				else $result['estimated'] = 0;
1371
-				if ($matches[7] == 'PERM') $result['permanent'] = 1;
1372
-				else $result['permanent'] = 0;
1442
+				if ($matches[7] == 'EST') {
1443
+					$result['estimated'] = 1;
1444
+				} else {
1445
+					$result['estimated'] = 0;
1446
+				}
1447
+				if ($matches[7] == 'PERM') {
1448
+					$result['permanent'] = 1;
1449
+				} else {
1450
+					$result['permanent'] = 0;
1451
+				}
1373 1452
 				$c = true;
1374
-			}
1375
-			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
1453
+			} elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
1376 1454
 				$result['date_end'] = '2030/12/20 12:00';
1377
-				if ($matches[2] == 'EST') $result['estimated'] = 1;
1378
-				else $result['estimated'] = 0;
1379
-				if ($matches[2] == 'PERM') $result['permanent'] = 1;
1380
-				else $result['permanent'] = 0;
1455
+				if ($matches[2] == 'EST') {
1456
+					$result['estimated'] = 1;
1457
+				} else {
1458
+					$result['estimated'] = 0;
1459
+				}
1460
+				if ($matches[2] == 'PERM') {
1461
+					$result['permanent'] = 1;
1462
+				} else {
1463
+					$result['permanent'] = 0;
1464
+				}
1381 1465
 				$c = true;
1382
-			}
1383
-			elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
1466
+			} elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
1384 1467
 				$rtext = array();
1385 1468
 				$text = explode(' ',$matches[2]);
1386 1469
 				foreach ($text as $word) {
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);
1389
-					else $rtext[] = $word;
1470
+					if (isset($this->abbr[$word])) {
1471
+						$rtext[] = strtoupper($this->abbr[$word]);
1472
+					} elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) {
1473
+						$rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
1474
+					} else {
1475
+						$rtext[] = $word;
1476
+					}
1390 1477
 				}
1391 1478
 				$result['text'] = implode(' ',$rtext);
1392 1479
 				$e = true;
@@ -1395,7 +1482,9 @@  discard block
 block discarded – undo
1395 1482
 			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
1396 1483
 				$text = explode(' ',$line);
1397 1484
 				$result['ref'] = $text[0];
1398
-				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
1485
+				if ($matches[1] == 'NOTAMN') {
1486
+					$result['type'] = 'new';
1487
+				}
1399 1488
 				if ($matches[1] == 'NOTAMC') {
1400 1489
 					$result['type'] = 'cancel';
1401 1490
 					$result['ref_cancelled'] = $text[2];
@@ -1417,69 +1506,101 @@  discard block
 block discarded – undo
1417 1506
 		switch ($code[1]) {
1418 1507
 			case 'A':
1419 1508
 				$result = 'Airspace organization ';
1420
-				if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp];
1509
+				if (isset($this->code_airspace[$code_fp])) {
1510
+					$result .= $this->code_airspace[$code_fp];
1511
+				}
1421 1512
 				break;
1422 1513
 			case 'C':
1423 1514
 				$result = 'Communications and radar facilities ';
1424
-				if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp];
1515
+				if (isset($this->code_comradar[$code_fp])) {
1516
+					$result .= $this->code_comradar[$code_fp];
1517
+				}
1425 1518
 				break;
1426 1519
 			case 'F':
1427 1520
 				$result = 'Facilities and services ';
1428
-				if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp];
1521
+				if (isset($this->code_facilities[$code_fp])) {
1522
+					$result .= $this->code_facilities[$code_fp];
1523
+				}
1429 1524
 				break;
1430 1525
 			case 'I':
1431 1526
 				$result = 'Instrument and Microwave Landing System ';
1432
-				if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp];
1527
+				if (isset($this->code_instrumentlanding[$code_fp])) {
1528
+					$result .= $this->code_instrumentlanding[$code_fp];
1529
+				}
1433 1530
 				break;
1434 1531
 			case 'L':
1435 1532
 				$result = 'Lighting facilities ';
1436
-				if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp];
1533
+				if (isset($this->code_lightingfacilities[$code_fp])) {
1534
+					$result .= $this->code_lightingfacilities[$code_fp];
1535
+				}
1437 1536
 				break;
1438 1537
 			case 'M':
1439 1538
 				$result = 'Movement and landing areas ';
1440
-				if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp];
1539
+				if (isset($this->code_movementareas[$code_fp])) {
1540
+					$result .= $this->code_movementareas[$code_fp];
1541
+				}
1441 1542
 				break;
1442 1543
 			case 'N':
1443 1544
 				$result = 'Terminal and En Route Navigation Facilities ';
1444
-				if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp];
1545
+				if (isset($this->code_terminalfacilities[$code_fp])) {
1546
+					$result .= $this->code_terminalfacilities[$code_fp];
1547
+				}
1445 1548
 				break;
1446 1549
 			case 'O':
1447 1550
 				$result = 'Other information ';
1448
-				if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp];
1551
+				if (isset($this->code_information[$code_fp])) {
1552
+					$result .= $this->code_information[$code_fp];
1553
+				}
1449 1554
 				break;
1450 1555
 			case 'P':
1451 1556
 				$result = 'Air Traffic procedures ';
1452
-				if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp];
1557
+				if (isset($this->code_airtraffic[$code_fp])) {
1558
+					$result .= $this->code_airtraffic[$code_fp];
1559
+				}
1453 1560
 				break;
1454 1561
 			case 'R':
1455 1562
 				$result = 'Navigation Warnings: Airspace Restrictions ';
1456
-				if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp];
1563
+				if (isset($this->code_navigationw[$code_fp])) {
1564
+					$result .= $this->code_navigationw[$code_fp];
1565
+				}
1457 1566
 				break;
1458 1567
 			case 'S':
1459 1568
 				$result = 'Air Traffic and VOLMET Services ';
1460
-				if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp];
1569
+				if (isset($this->code_volmet[$code_fp])) {
1570
+					$result .= $this->code_volmet[$code_fp];
1571
+				}
1461 1572
 				break;
1462 1573
 			case 'W':
1463 1574
 				$result = 'Navigation Warnings: Warnings ';
1464
-				if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp];
1575
+				if (isset($this->code_warnings[$code_fp])) {
1576
+					$result .= $this->code_warnings[$code_fp];
1577
+				}
1465 1578
 				break;
1466 1579
 		}
1467 1580
 		switch ($code[3]) {
1468 1581
 			case 'A':
1469 1582
 				// Availability
1470
-				if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp];
1583
+				if (isset($this->code_sp_availabity[$code_sp])) {
1584
+					$result .= ' '.$this->code_sp_availabity[$code_sp];
1585
+				}
1471 1586
 				break;
1472 1587
 			case 'C':
1473 1588
 				// Changes
1474
-				if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp];
1589
+				if (isset($this->code_sp_changes[$code_sp])) {
1590
+					$result .= ' '.$this->code_sp_changes[$code_sp];
1591
+				}
1475 1592
 				break;
1476 1593
 			case 'H':
1477 1594
 				// Hazardous conditions
1478
-				if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp];
1595
+				if (isset($this->code_sp_hazardous[$code_sp])) {
1596
+					$result .= ' '.$this->code_sp_hazardous[$code_sp];
1597
+				}
1479 1598
 				break;
1480 1599
 			case 'L':
1481 1600
 				// Limitations
1482
-				if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp];
1601
+				if (isset($this->code_sp_limitations[$code_sp])) {
1602
+					$result .= ' '.$this->code_sp_limitations[$code_sp];
1603
+				}
1483 1604
 				break;
1484 1605
 			case 'X':
1485 1606
 				// Other Information
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     <?php }; if (isset($globalTracker) && $globalTracker) { ?><td><div id="ibxtracker"><h4><?php echo _("Trackers Detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
46 46
 </tr></table></div>
47 47
 <?php
48
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
48
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
49 49
 
50 50
 ?>
51 51
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
66 66
 <?php
67 67
 	}
68
-    }
68
+	}
69 69
 ?>
70 70
 
71 71
 <div id="sidebar" class="sidebar collapsed">
@@ -76,34 +76,34 @@  discard block
 block discarded – undo
76 76
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
77 77
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
78 78
 <?php
79
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
79
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
80 80
 	if (isset($globalArchive) && $globalArchive == TRUE) {
81 81
 ?>
82 82
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
83 83
 <?php
84 84
 	}
85
-    }
85
+	}
86 86
 ?>
87 87
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
88 88
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
89 89
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
90 90
 <?php
91
-    if (isset($globalMap3D) && $globalMap3D) {
91
+	if (isset($globalMap3D) && $globalMap3D) {
92 92
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
93 93
 ?>
94 94
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
95 95
 <?php
96
-        } else {
97
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
96
+		} else {
97
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
98 98
 ?>
99 99
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
100 100
 <?php
101
-	    }
101
+		}
102 102
 ?>
103 103
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
104 104
 <?php
105 105
 	}
106
-    }
106
+	}
107 107
 ?>
108 108
     </ul>
109 109
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 ?>
179 179
         </div>
180 180
 <?php
181
-    if (isset($globalArchive) && $globalArchive == TRUE) {
181
+	if (isset($globalArchive) && $globalArchive == TRUE) {
182 182
 ?>
183 183
         <div class="sidebar-pane" id="archive">
184 184
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	    </form>
239 239
 	</div>
240 240
 <?php
241
-    }
241
+	}
242 242
 ?>
243 243
         <div class="sidebar-pane" id="settings">
244 244
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -249,56 +249,56 @@  discard block
 block discarded – undo
249 249
 			    <?php
250 250
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
251 251
 				else $MapType = $_COOKIE['MapType'];
252
-			    ?>
252
+				?>
253 253
 			    <?php
254 254
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
255
-			    ?>
255
+				?>
256 256
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
257 257
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
258 258
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
259 259
 			    <?php
260 260
 				}
261
-			    ?>
261
+				?>
262 262
 			    <?php
263
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
-			    ?>
263
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
+				?>
265 265
 			    <?php
266
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
-			    ?>
266
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
+				?>
268 268
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
269 269
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
270 270
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
271 271
 			    <?php
272
-				    }
273
-			    ?>
272
+					}
273
+				?>
274 274
 			    <?php
275
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
-			    ?>
275
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
+				?>
277 277
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
278 278
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
279 279
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
280 280
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
281 281
 			    <?php
282
-				    }
283
-			    ?>
282
+					}
283
+				?>
284 284
 			    <?php
285
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
-			    ?>
285
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
+				?>
287 287
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
288 288
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
289 289
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
290 290
 			    <?php
291
-				    }
292
-			    ?>
291
+					}
292
+				?>
293 293
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
294 294
 			    <?php
295 295
 				}
296
-			    ?>
296
+				?>
297 297
 			    <?php
298
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
298
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
299 299
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
300 300
 					else $MapBoxId = $_COOKIE['MapTypeId'];
301
-			    ?>
301
+				?>
302 302
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
303 303
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
304 304
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
313 313
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
314 314
 			    <?php
315
-				    }
316
-			    ?>
315
+					}
316
+				?>
317 317
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
318 318
 			</select>
319 319
 		    </li>
320 320
 <?php
321
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
321
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
322 322
 ?>
323 323
 		    <li><?php echo _("Type of Terrain:"); ?>
324 324
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -328,10 +328,10 @@  discard block
 block discarded – undo
328 328
 			</select>
329 329
 		    </li>
330 330
 <?php
331
-    }
331
+	}
332 332
 ?>
333 333
 <?php
334
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
334
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
335 335
 ?>
336 336
 		    
337 337
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -340,76 +340,76 @@  discard block
 block discarded – undo
340 340
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
341 341
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
342 342
 <?php
343
-    }
343
+	}
344 344
 ?>
345 345
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
346 346
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
347 347
 <?php
348
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
348
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
349 349
 ?>
350 350
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
351 351
 <?php
352
-    }
353
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
352
+	}
353
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
354 354
 ?>
355 355
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
356 356
 <?php
357
-    }
357
+	}
358 358
 ?>
359 359
 
360 360
 		    <?php
361 361
 			if (function_exists('array_column')) {
362
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
363
-		    ?>
362
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
363
+			?>
364 364
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
365 365
 		    <?php
366
-			    }
366
+				}
367 367
 			} elseif (isset($globalSources)) {
368
-			    $dispolar = false;
369
-			    foreach ($globalSources as $testsource) {
370
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
371
-			    }
372
-			    if ($dispolar) {
373
-		    ?>
368
+				$dispolar = false;
369
+				foreach ($globalSources as $testsource) {
370
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
371
+				}
372
+				if ($dispolar) {
373
+			?>
374 374
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
375 375
 		    <?php
376
-			    }
377
-		        }
378
-		    ?>
376
+				}
377
+				}
378
+			?>
379 379
 <?php
380
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
380
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
381 381
 ?>
382 382
 
383 383
 		    <?php
384 384
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
385
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
386
-		    ?>
385
+					if (extension_loaded('gd') && function_exists('gd_info')) {
386
+			?>
387 387
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
388 388
 		    <?php 
389 389
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
390
-		    ?>
390
+			?>
391 391
 		    <li><?php echo _("Aircraft icon color:"); ?>
392 392
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
393 393
 		    </li>
394 394
 		    <?php
395 395
 				}
396
-			    }
397
-		        }
398
-		    ?>
396
+				}
397
+				}
398
+			?>
399 399
 		    <?php
400 400
 			if (isset($globalMarine) && $globalMarine === TRUE) {
401
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
402
-		    ?>
401
+				if (extension_loaded('gd') && function_exists('gd_info')) {
402
+			?>
403 403
 		    <li><?php echo _("Marine icon color:"); ?>
404 404
 			<input type="color" name="marinecolor" id="html5colorpicker" onchange="iconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
405 405
 		    </li>
406 406
 		    <?php
407
-			    }
408
-		        }
409
-		    ?>
407
+				}
408
+				}
409
+			?>
410 410
 		    <?php
411 411
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
412
-		    ?>
412
+			?>
413 413
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
414 414
 			<div class="range">
415 415
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -418,9 +418,9 @@  discard block
 block discarded – undo
418 418
 		    </li>
419 419
 		    <?php
420 420
 			}
421
-		    ?>
421
+			?>
422 422
 <?php
423
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
423
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
424 424
 ?>
425 425
 <?php
426 426
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 		    </li>
442 442
 <?php
443 443
 	}
444
-    }
444
+	}
445 445
 ?>
446 446
 		    <li><?php echo _("Distance unit:"); ?>
447 447
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -474,19 +474,19 @@  discard block
 block discarded – undo
474 474
 		    <ul>
475 475
 		    <?php
476 476
 			if (!isset($globalAircraft) || $globalAircraft) {
477
-		    ?>
477
+			?>
478 478
 		    <?php
479 479
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
480
-		    ?>
480
+			?>
481 481
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
482 482
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
483 483
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
484 484
 		    <?php
485 485
 			}
486
-		    ?>
486
+			?>
487 487
 		    <?php
488 488
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
489
-		    ?>
489
+			?>
490 490
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
491 491
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
492 492
 			<?php } ?>
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
 			<?php } ?>
496 496
 		    <?php
497 497
 			}
498
-		    ?>
498
+			?>
499 499
 		    <li><?php echo _("Display airlines:"); ?>
500 500
 		    <br/>
501 501
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -515,14 +515,14 @@  discard block
 block discarded – undo
515 515
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
516 516
 					}
517 517
 				}
518
-			    ?>
518
+				?>
519 519
 			</select>
520 520
 		    </li>
521 521
 		    <?php
522 522
 			$Spotter = new Spotter();
523 523
 			$allalliancenames = $Spotter->getAllAllianceNames();
524 524
 			if (!empty($allalliancenames)) {
525
-		    ?>
525
+			?>
526 526
 		    <li><?php echo _("Display alliance:"); ?>
527 527
 		    <br/>
528 528
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -536,18 +536,18 @@  discard block
 block discarded – undo
536 536
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
537 537
 					}
538 538
 				}
539
-			    ?>
539
+				?>
540 540
 			</select>
541 541
 		    </li>
542 542
 		    <?php
543 543
 			}
544
-		    ?>
544
+			?>
545 545
 		    <?php
546 546
 			}
547
-		    ?>
547
+			?>
548 548
 		    <?php
549 549
 			if (isset($globalAPRS) && $globalAPRS) {
550
-		    ?>
550
+			?>
551 551
 		    <li><?php echo _("Display APRS sources name:"); ?>
552 552
 			<select class="selectpicker" multiple onchange="sources(this);">
553 553
 			    <?php
@@ -559,18 +559,18 @@  discard block
 block discarded – undo
559 559
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
560 560
 					}
561 561
 				}
562
-			    ?>
562
+				?>
563 563
 			</select>
564 564
 		    </li>
565 565
 		    <?php
566 566
 			}
567
-		    ?>
567
+			?>
568 568
 		    <?php
569 569
 			if (!isset($globalAircraft) && $globalAircraft) {
570
-		    ?>
570
+			?>
571 571
 		    <?php
572 572
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
573
-		    ?>
573
+			?>
574 574
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
575 575
 			<select class="selectpicker" onchange="airlinestype(this);">
576 576
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -581,14 +581,14 @@  discard block
 block discarded – undo
581 581
 		    </li>
582 582
 		    <?php
583 583
 			}
584
-		    ?>
584
+			?>
585 585
 		    <li>
586 586
 			<?php echo _("Display flight with ident:"); ?>
587 587
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
588 588
 		    </li>
589 589
 		    <?php
590 590
 			}
591
-		    ?>
591
+			?>
592 592
 		</ul>
593 593
 	    </form>
594 594
 	    <form method="post">
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	    </form>
598 598
     	</div>
599 599
 <?php
600
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
600
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
601 601
 ?>
602 602
         <div class="sidebar-pane" id="satellites">
603 603
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -637,14 +637,14 @@  discard block
 block discarded – undo
637 637
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
638 638
 					}
639 639
 				}
640
-			    ?>
640
+				?>
641 641
 			</select>
642 642
 		    </li>
643 643
 		</ul>
644 644
 	    </form>
645 645
 	</div>
646 646
 <?php
647
-    }
647
+	}
648 648
 ?>
649 649
     </div>
650 650
 </div>
Please login to merge, or discard this patch.