Ysurac / FlightAirMap

live-santa-geojson.php

Braces +5 added lines, -2 removed lines

@@ -8,8 +8,11 @@
 }
 header('Content-Type: text/javascript');
 $timearray = array();
-if (isset($_GET['now'])) $begin = time();
-else $begin = strtotime(date("Y").'-12-24T02:00:00Z');
+if (isset($_GET['now'])) {
+	$begin = time();
+} else {
+	$begin = strtotime(date("Y").'-12-24T02:00:00Z');
+}
 for ($i =0; $i <= 288; $i++) {
 	$timearray[] = ($begin + $i*300)*1000;
 }

airport-detailed.php

Braces +10 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -46,7 +46,9 @@ 
 			$METAR = new METAR();
 			$metar_info = $METAR->getMETAR($airport_icao);
 			//print_r($metar_info);
-			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
+			if (isset($metar_info[0]['metar'])) {
+				$metar_parse = $METAR->parse($metar_info[0]['metar']);
+			}
             		//print_r($metar_parse);
 		}
 		
@@ -60,7 +62,9 @@ 
 		print '<option></option>';
 		$Stats = new Stats();
 		$airport_names = $Stats->getAllAirportNames();
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+		if (empty($airport_names)) {
+			$airport_names = $Spotter->getAllAirportNames();
+		}
 		ksort($airport_names);
 		foreach($airport_names as $airport_name)
 		{
@@ -102,7 +106,9 @@ 
 			// Use spotter also
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (count($all_data) > 0) {
 				print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 

require/class.Scheduler.php

Braces +164 added lines, -56 removed lines

@@ -123,7 +123,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	public function checkSchedule($ident) {
@@ -159,7 +161,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym');
 		$json = $Common->getData($url);
 	
@@ -186,7 +190,9 @@ 
 			*/
 		
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -201,7 +207,9 @@ 
 		date_default_timezone_set($globalTimezone);
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign;
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -214,7 +222,9 @@ 
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -225,7 +235,9 @@ 
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/";
 		$post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}';
 		$headers = array('Content-Type: application/json','Content-Length: ' . strlen($post));
@@ -239,8 +251,12 @@ 
 				$departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'};
 				$arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'};
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -251,7 +267,9 @@ 
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.world-of-swiss.com/fr/routenetwork.json";
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -271,8 +289,12 @@ 
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 	
 	/**
@@ -286,12 +308,18 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalBritishAirwaysKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalBritishAirwaysKey == '') {
+			return array();
+		}
 		$url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json";
 		$headers = array('Client-Key: '.$globalBritishAirwaysKey);
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
@@ -300,7 +328,9 @@ 
 			$departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -314,19 +344,27 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') {
+			return array();
+		}
 		$url = "https://api.lufthansa.com/v1/oauth/token";
 		$post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials');
 		$data = $Common->getData($url,'post',$post);
 		$parsed_data = json_decode($data);
-		if (!isset($parsed_data->{'access_token'})) return array();
+		if (!isset($parsed_data->{'access_token'})) {
+			return array();
+		}
 		$token = $parsed_data->{'access_token'};
 		
 		$url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d');
 		$headers = array('Authorization: Bearer '.$token,'Accept: application/json');
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'};
@@ -334,7 +372,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -348,14 +388,20 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalTransaviaKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalTransaviaKey == '') {
+			return array();
+		}
 		$url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		//$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		$headers = array('apikey: '.$globalTransaviaKey);
 		$json = $Common->getData($url,'get','',$headers);
 		//echo 'result : '.$json;
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
@@ -364,7 +410,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -375,7 +423,9 @@ 
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp";
 		$data = $Common->getData($url);
 		$table = $Common->table2array($data);
@@ -396,7 +446,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
 		$url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB";
 		$data = $Common->getData($url);
@@ -406,8 +458,11 @@ 
 			$DepartureAirportIata = str_replace('flightOri=','',$result[0]);
 			preg_match('/flightDest=[A-Z]{3}/',$data,$result);
 			$ArrivalAirportIata = str_replace('flightDest=','',$result[0]);
-			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
-			else return array();
+			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') {
+				return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
+			} else {
+				return array();
+			}
 		}
 		return array();
 	}
@@ -422,7 +477,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "https://www.iberia.com/web/flightDetail.do";
 		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
 		$data = $Common->getData($url,'post',$post);
@@ -439,7 +496,9 @@ 
 				$arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
 					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
+				} else {
+					$arrivalTime = substr($arrivalTime,0,5);
+				}
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
 			}
 		}
@@ -457,7 +516,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y');
 		$data = $Common->getData($url);
 		if ($data != '') {
@@ -473,7 +534,9 @@ 
 					$departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5);
 					$arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5);
 					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance');
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 			
 
@@ -493,7 +556,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -517,7 +582,9 @@ 
 		$check_date = new Datetime($date);
 		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
@@ -607,7 +674,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -639,11 +708,15 @@ 
 				$airline_icao = substr($callsign, 0, 3);
 			} 
 		}
-		if ($airline_icao == '') return array();
+		if ($airline_icao == '') {
+			return array();
+		}
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -686,7 +759,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://fr.flightaware.com/live/flight/".$callsign;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -739,11 +814,15 @@ 
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
-		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) return array();
+		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) {
+			return array();
+		}
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
@@ -752,7 +831,9 @@ 
 			$ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
 			$arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -766,7 +847,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -795,7 +878,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://www.airberlin.com/en-US/site/aims.php";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier);
 		$data = $Common->getData($url,'post',$post);
 		//echo $data;
@@ -805,11 +890,19 @@ 
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			if (isset($flight[5][4])) $departureTime = $flight[5][4];
-			else $departureTime = '';
-			if (isset($flight[5][2])) $departureAirport = $flight[5][2];
-			else $departureAirport = '';
-		} else return array();
+			if (isset($flight[5][4])) {
+				$departureTime = $flight[5][4];
+			} else {
+				$departureTime = '';
+			}
+			if (isset($flight[5][2])) {
+				$departureAirport = $flight[5][2];
+			} else {
+				$departureAirport = '';
+			}
+		} else {
+			return array();
+		}
 		$post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -822,10 +915,14 @@ 
 			    $arrivalTime = '';
 			    $arrivalAirport = '';
 			}
-		} else return array();
+		} else {
+			return array();
+		}
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';
 		$json = $Common->getData($url);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$airports = $parsed_json->{'suggestList'};
 		if (count($airports) > 0) {
@@ -840,7 +937,9 @@ 
 		}
 		if (isset($DepartureAirportIata)) {
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 
@@ -848,7 +947,9 @@ 
 	public function fetchSchedule($ident,$date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch;
 		//$Common = new Common();
-		if (!$globalSchedulesFetch) return array();
+		if (!$globalSchedulesFetch) {
+			return array();
+		}
 		$airline_icao = '';
 		if (!is_numeric(substr($ident, 0, 3)))
 		{
@@ -1076,14 +1177,21 @@ 
 				default:
 					// Randomly use a generic function to get hours
 					if (strlen($airline_icao) == 2) {
-						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+						if (!isset($globalSchedulesSources)) {
+							$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+						}
 						if (count($globalSchedulesSources) > 0) {
 							$rand = mt_rand(0,count($globalSchedulesSources)-1);
 							$source = $globalSchedulesSources[$rand];
-							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
-							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);
+							if ($source == 'flightmapper') {
+								return $this->getFlightMapper($ident);
+							} elseif ($source == 'costtotravel') {
+								return $this->getCostToTravel($ident);
+							}
 							//elseif ($source == 'flightradar24') return $this->getFlightRadar24($ident,$date);
-							elseif ($source == 'flightaware') return $this->getFlightAware($ident);
+							elseif ($source == 'flightaware') {
+								return $this->getFlightAware($ident);
+							}
 						}
 					}
 			}

require/class.NOTAM.php

Braces +208 added lines, -88 removed lines

@@ -1015,8 +1015,11 @@ 
 		$data = file_get_contents($filename);
 		preg_match_all("/%%(.+?)%%/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 	public function getAllNOTAMbyScope($scope) {
 		global $globalDBdriver;
@@ -1053,7 +1056,9 @@ 
 				$minlong = $maxlong;
 				$maxlong = $tmplong;
 			}
-		} else return array();
+		} 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()';
 		} else {
@@ -1077,7 +1082,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * 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';
 		} else {
@@ -1104,8 +1111,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0])) return $all[0];
-		else return array();
+		if (isset($all[0])) {
+			return $all[0];
+		} 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) {
@@ -1183,7 +1193,9 @@ 
 					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']);
+						}
 					}
 				}
 			}
@@ -1196,7 +1208,9 @@ 
 			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']);
+				}
 			}
 		}
 	}
@@ -1208,11 +1222,15 @@ 
 		foreach (array_chunk($allairports,20) as $airport) {
 			$airports_icao = array();
 			foreach($airport as $icao) {
-				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
+				if (isset($icao['icao'])) {
+					$airports_icao[] = $icao['icao'];
+				}
 			}
 			$airport_icao = implode(',',$airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			if (count($alldata) > 0) {
 				foreach ($alldata as $initial_data) {
 					//print_r($initial_data);
@@ -1221,14 +1239,23 @@ 
 					if (isset($data['ref'])) {
 						$notamref = $this->getNOTAMbyRef($data['ref']);
 						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']);
+							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']);
+							}
 						}
 					}
 				}
-			} else echo 'Error on download. Nothing matches for '.$airport_icao."\n";
-			if ($globalTransaction) $this->db->commit();
+			} else {
+				echo 'Error on download. Nothing matches for '.$airport_icao."\n";
+			}
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
 			sleep(5);
 		}
 	}
@@ -1241,8 +1268,11 @@ 
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 
 	public function parse($data) {
@@ -1265,89 +1295,145 @@ 
 					$rules = str_split($matches[3]);
 					foreach ($rules as $rule) {
 						if ($rule == 'I') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR';
-							else $result['rules'] = 'IFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/IFR';
+							} else {
+								$result['rules'] = 'IFR';
+							}
 						} elseif ($rule == 'V') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR';
-							else $result['rules'] = 'VFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/VFR';
+							} else {
+								$result['rules'] = 'VFR';
+							}
 						} elseif ($rule == 'K') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
 					$attentions = str_split($matches[4]);
 					foreach ($attentions as $attention) {
 						if ($attention == 'N') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention';
-							else $result['rules'] = 'Immediate attention';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Immediate attention';
+							} else {
+								$result['rules'] = 'Immediate attention';
+							}
 						} elseif ($attention == 'B') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance';
-							else $result['rules'] = 'Operational significance';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Operational significance';
+							} else {
+								$result['rules'] = 'Operational significance';
+							}
 						} elseif ($attention == 'O') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations';
-							else $result['rules'] = 'Flight operations';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Flight operations';
+							} else {
+								$result['rules'] = 'Flight operations';
+							}
 						} elseif ($attention == 'M') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc';
-							else $result['rules'] = 'Misc';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Misc';
+							} else {
+								$result['rules'] = 'Misc';
+							}
 						} elseif ($attention == 'K') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
-					if ($matches[5] == 'A') $result['scope'] = 'Airport warning';
-					elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning';
-					elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning';
-					elseif ($matches[5] == 'K') $result['scope'] = 'Checklist';
-					elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning';
-					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
+					if ($matches[5] == 'A') {
+						$result['scope'] = 'Airport warning';
+					} elseif ($matches[5] == 'E') {
+						$result['scope'] = 'Enroute warning';
+					} elseif ($matches[5] == 'W') {
+						$result['scope'] = 'Navigation warning';
+					} elseif ($matches[5] == 'K') {
+						$result['scope'] = 'Checklist';
+					} elseif ($matches[5] == 'AE') {
+						$result['scope'] = 'Airport/Enroute warning';
+					} 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');
-					if ($matches[9] == 'S') $latitude = -$latitude;
+					if ($matches[9] == 'S') {
+						$latitude = -$latitude;
+					}
 					$longitude = $Common->convertDec($matches[10],'longitude');
-					if ($matches[11] == 'W') $longitude = -$longitude;
+					if ($matches[11] == 'W') {
+						$longitude = -$longitude;
+					}
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
 					$result['radius'] = intval($matches[12]);
-				} else echo 'ERROR : '.$line."\n";
-			}
-			elseif (preg_match('#A\) (.*)#',$line,$matches)) {
+				} else {
+					echo 'ERROR : '.$line."\n";
+				}
+			} elseif (preg_match('#A\) (.*)#',$line,$matches)) {
 				$result['icao'] = $matches[1];
-			}
-			elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_begin'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
 				$result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-				if ($matches[6] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[6] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[6] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[6] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
 				$result['date_end'] = '2030/12/20 12:00';
-				if ($matches[1] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[1] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#E\) (.*)#',$line,$matches)) {
+				if ($matches[1] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[1] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#E\) (.*)#',$line,$matches)) {
 				$rtext = array();
 				$text = explode(' ',$matches[1]);
 				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);
-					else $rtext[] = $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);
+					} else {
+						$rtext[] = $word;
+					}
 				}
 				$result['text'] = implode(' ',$rtext);
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
@@ -1355,7 +1441,9 @@ 
 			} 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] == 'NOTAMN') {
+					$result['type'] = 'new';
+				}
 				if ($matches[1] == 'NOTAMC') {
 					$result['type'] = 'cancel';
 					$result['ref_cancelled'] = $text[2];
@@ -1377,69 +1465,101 @@ 
 		switch ($code[1]) {
 			case 'A':
 				$result = 'Airspace organization ';
-				if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp];
+				if (isset($this->code_airspace[$code_fp])) {
+					$result .= $this->code_airspace[$code_fp];
+				}
 				break;
 			case 'C':
 				$result = 'Communications and radar facilities ';
-				if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp];
+				if (isset($this->code_comradar[$code_fp])) {
+					$result .= $this->code_comradar[$code_fp];
+				}
 				break;
 			case 'F':
 				$result = 'Facilities and services ';
-				if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp];
+				if (isset($this->code_facilities[$code_fp])) {
+					$result .= $this->code_facilities[$code_fp];
+				}
 				break;
 			case 'I':
 				$result = 'Instrument and Microwave Landing System ';
-				if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp];
+				if (isset($this->code_instrumentlanding[$code_fp])) {
+					$result .= $this->code_instrumentlanding[$code_fp];
+				}
 				break;
 			case 'L':
 				$result = 'Lighting facilities ';
-				if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp];
+				if (isset($this->code_lightingfacilities[$code_fp])) {
+					$result .= $this->code_lightingfacilities[$code_fp];
+				}
 				break;
 			case 'M':
 				$result = 'Movement and landing areas ';
-				if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp];
+				if (isset($this->code_movementareas[$code_fp])) {
+					$result .= $this->code_movementareas[$code_fp];
+				}
 				break;
 			case 'N':
 				$result = 'Terminal and En Route Navigation Facilities ';
-				if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp];
+				if (isset($this->code_terminalfacilities[$code_fp])) {
+					$result .= $this->code_terminalfacilities[$code_fp];
+				}
 				break;
 			case 'O':
 				$result = 'Other information ';
-				if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp];
+				if (isset($this->code_information[$code_fp])) {
+					$result .= $this->code_information[$code_fp];
+				}
 				break;
 			case 'P':
 				$result = 'Air Traffic procedures ';
-				if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp];
+				if (isset($this->code_airtraffic[$code_fp])) {
+					$result .= $this->code_airtraffic[$code_fp];
+				}
 				break;
 			case 'R':
 				$result = 'Navigation Warnings: Airspace Restrictions ';
-				if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp];
+				if (isset($this->code_navigationw[$code_fp])) {
+					$result .= $this->code_navigationw[$code_fp];
+				}
 				break;
 			case 'S':
 				$result = 'Air Traffic and VOLMET Services ';
-				if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp];
+				if (isset($this->code_volmet[$code_fp])) {
+					$result .= $this->code_volmet[$code_fp];
+				}
 				break;
 			case 'W':
 				$result = 'Navigation Warnings: Warnings ';
-				if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp];
+				if (isset($this->code_warnings[$code_fp])) {
+					$result .= $this->code_warnings[$code_fp];
+				}
 				break;
 		}
 		switch ($code[3]) {
 			case 'A':
 				// Availability
-				if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp];
+				if (isset($this->code_sp_availabity[$code_sp])) {
+					$result .= ' '.$this->code_sp_availabity[$code_sp];
+				}
 				break;
 			case 'C':
 				// Changes
-				if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp];
+				if (isset($this->code_sp_changes[$code_sp])) {
+					$result .= ' '.$this->code_sp_changes[$code_sp];
+				}
 				break;
 			case 'H':
 				// Hazardous conditions
-				if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp];
+				if (isset($this->code_sp_hazardous[$code_sp])) {
+					$result .= ' '.$this->code_sp_hazardous[$code_sp];
+				}
 				break;
 			case 'L':
 				// Limitations
-				if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp];
+				if (isset($this->code_sp_limitations[$code_sp])) {
+					$result .= ' '.$this->code_sp_limitations[$code_sp];
+				}
 				break;
 			case 'X':
 				// Other Information

require/libs/simple_html_dom.php

Braces +193 added lines, -101 removed lines

@@ -159,8 +159,9 @@ 
 		if ($show_attr && count($this->attr)>0)
 		{
 			echo '(';
-			foreach ($this->attr as $k=>$v)
-				echo "[$k]=>\"".$this->$k.'", ';
+			foreach ($this->attr as $k=>$v) {
+							echo "[$k]=>\"".$this->$k.'", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -218,8 +219,7 @@ 
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
 			$string .= $node->_[HDOM_INFO_INNER] . "'";
-		}
-		else
+		} else
 		{
 			$string .= ' NULL ';
 		}
@@ -233,8 +233,7 @@ 
 		{
 			echo $string;
 			return;
-		}
-		else
+		} else
 		{
 			return $string;
 		}
@@ -320,12 +319,17 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent===null) {
+			return null;
+		}
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
-			++$idx;
-		if (--$idx<0) return null;
+		while ($idx<$count && $this!==$this->parent->children[$idx]) {
+					++$idx;
+		}
+		if (--$idx<0) {
+			return null;
+		}
 		return $this->parent->children[$idx];
 	}
 
@@ -354,12 +358,17 @@ 
 	// get dom node's inner html
 	function innertext()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '';
-		foreach ($this->nodes as $n)
-			$ret .= $n->outertext();
+		foreach ($this->nodes as $n) {
+					$ret .= $n->outertext();
+		}
 		return $ret;
 	}
 
@@ -380,7 +389,9 @@ 
 			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag==='root') {
+			return $this->innertext();
+		}
 
 		// trigger callback
 		if ($this->dom && $this->dom->callback!==null)
@@ -388,8 +399,12 @@ 
 			call_user_func_array($this->dom->callback, array($this));
 		}
 
-		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_OUTER])) {
+			return $this->_[HDOM_INFO_OUTER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		// render begin tag
 		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
@@ -418,23 +433,30 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-			$ret .= '</'.$this->tag.'>';
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) {
+					$ret .= '</'.$this->tag.'>';
+		}
 		return $ret;
 	}
 
 	// get dom node's plain text
 	function text()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
 		switch ($this->nodetype)
 		{
 			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script')===0) {
+			return '';
+		}
+		if (strcasecmp($this->tag, 'style')===0) {
+			return '';
+		}
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -470,7 +492,9 @@ 
 	function makeup()
 	{
 		// text, comment, unknown
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '<'.$this->tag;
 		$i = -1;
@@ -480,14 +504,15 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
-				continue;
+			if ($val===null || $val===false) {
+							continue;
+			}
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
-				$ret .= $key;
-			else {
+			if ($val===true) {
+							$ret .= $key;
+			} else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
 				{
 					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
@@ -506,7 +531,9 @@ 
 	function find($selector, $idx=null, $lowercase=false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count=count($selectors))===0) {
+			return array();
+		}
 		$found_keys = array();
 
 		// find each selector
@@ -514,8 +541,12 @@ 
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
-			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+			if (($levle=count($selectors[$c]))===0) {
+				return array();
+			}
+			if (!isset($this->_[HDOM_INFO_BEGIN])) {
+				return array();
+			}
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
@@ -545,12 +576,16 @@ 
 		ksort($found_keys);
 
 		$found = array();
-		foreach ($found_keys as $k=>$v)
-			$found[] = $this->dom->nodes[$k];
+		foreach ($found_keys as $k=>$v) {
+					$found[] = $this->dom->nodes[$k];
+		}
 
 		// return nth-element or array
-		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		if (is_null($idx)) {
+			return $found;
+		} else if ($idx<0) {
+			$idx = count($found) + $idx;
+		}
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
@@ -595,8 +630,9 @@ 
 			$pass = true;
 
 			if ($tag==='*' && !$key) {
-				if (in_array($node, $this->children, true))
-					$ret[$i] = 1;
+				if (in_array($node, $this->children, true)) {
+									$ret[$i] = 1;
+				}
 				continue;
 			}
 
@@ -605,9 +641,13 @@ 
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) {
+						$pass=false;
+					}
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) {
+						$pass=false;
+					}
 				}
 			}
 			// compare value
@@ -640,13 +680,19 @@ 
 							} else {
 								$check = $this->match($exp, $val, $k);
 							}
-							if ($check) break;
+							if ($check) {
+								break;
+							}
 						}
 					}
 				}
-				if (!$check) $pass = false;
+				if (!$check) {
+					$pass = false;
+				}
+			}
+			if ($pass) {
+				$ret[$i] = 1;
 			}
-			if ($pass) $ret[$i] = 1;
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
@@ -696,9 +742,13 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') {
+				continue;
+			}
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1]==='tbody') {
+				continue;
+			}
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 			if (!empty($m[2])) {$key='id'; $val=$m[2];}
@@ -718,8 +768,9 @@ 
 				$result = array();
 			}
 		}
-		if (count($result)>0)
-			$selectors[] = $result;
+		if (count($result)>0) {
+					$selectors[] = $result;
+		}
 		return $selectors;
 	}
 
@@ -748,7 +799,9 @@ 
 		{
 			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 			case 'innertext':
-				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+				if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+				}
 				return $this->_[HDOM_INFO_INNER] = $value;
 		}
 		if (!isset($this->attr[$name]))
@@ -772,8 +825,9 @@ 
 	}
 
 	function __unset($name) {
-		if (isset($this->attr[$name]))
-			unset($this->attr[$name]);
+		if (isset($this->attr[$name])) {
+					unset($this->attr[$name]);
+		}
 	}
 
 	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
@@ -800,8 +854,7 @@ 
 			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
 			{
 				$converted_text = $text;
-			}
-			else
+			} else
 			{
 				$converted_text = iconv($sourceCharset, $targetCharset, $text);
 			}
@@ -839,19 +892,31 @@ 
 			$c=ord($str[$i]);
 			if($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
-				else return false;
-				if(($i+$bits) > $len) return false;
+				if(($c >= 254)) {
+					return false;
+				} elseif($c >= 252) {
+					$bits=6;
+				} elseif($c >= 248) {
+					$bits=5;
+				} elseif($c >= 240) {
+					$bits=4;
+				} elseif($c >= 224) {
+					$bits=3;
+				} elseif($c >= 192) {
+					$bits=2;
+				} else {
+					return false;
+				}
+				if(($i+$bits) > $len) {
+					return false;
+				}
 				while($bits > 1)
 				{
 					$i++;
 					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					if($b < 128 || $b > 191) {
+						return false;
+					}
 					$bits--;
 				}
 			}
@@ -1035,8 +1100,7 @@ 
 			if (preg_match("/^http:\/\//i",$str) || is_file($str))
 			{
 				$this->load_file($str);
-			}
-			else
+			} else
 			{
 				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
 			}
@@ -1118,7 +1182,9 @@ 
 	function save($filepath='')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath!=='') {
+			file_put_contents($filepath, $ret, LOCK_EX);
+		}
 		return $ret;
 	}
 
@@ -1134,7 +1200,10 @@ 
 	{
 		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+		if (isset($this->children)) {
+			foreach ($this->children as $n) {$n->clear();
+		}
+		$n = null;}
 		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
 		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
 		unset($this->doc);
@@ -1178,7 +1247,9 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size>0) {
+			$this->char = $this->doc[0];
+		}
 	}
 
 	// parse html content
@@ -1232,8 +1303,7 @@ 
 					if ($success)
 					{
 						$charset = $matches[1];
-					}
-					else
+					} else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
 						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
@@ -1296,8 +1366,9 @@ 
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
-				$tag = substr($tag, 0, $pos);
+			if (($pos = strpos($tag, ' '))!==false) {
+							$tag = substr($tag, 0, $pos);
+			}
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
@@ -1309,23 +1380,26 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
-						if ($this->parent->parent) $this->parent = $this->parent->parent;
+						if ($this->parent->parent) {
+							$this->parent = $this->parent->parent;
+						}
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+				} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower)
 					{
@@ -1333,18 +1407,19 @@ 
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				} else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
+				} else {
+									return $this->as_text_node($tag);
 				}
-				else
-					return $this->as_text_node($tag);
 			}
 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
-			if ($this->parent->parent) $this->parent = $this->parent->parent;
+			if ($this->parent->parent) {
+				$this->parent = $this->parent->parent;
+			}
 
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1367,7 +1442,9 @@ 
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, true);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1389,7 +1466,9 @@ 
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, false);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1455,22 +1534,26 @@ 
 			if ($name!=='/' && $name!=='') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
-				if ($this->lowercase) $name = strtolower($name);
+				if ($this->lowercase) {
+					$name = strtolower($name);
+				}
 				if ($this->char==='=') {
 					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
-				}
-				else {
+				} else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char!='>') {
+						$this->char = $this->doc[--$this->pos];
+					}
+					// prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
+			} else {
+							break;
 			}
-			else
-				break;
 		} while ($this->char!=='>' && $this->char!=='/');
 
 		$this->link_nodes($node, true);
@@ -1481,11 +1564,12 @@ 
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
-		}
-		else
+		} else
 		{
 			// reset parent
-			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+				$this->parent = $node;
+			}
 		}
 		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 
@@ -1571,7 +1655,9 @@ 
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		if ($len===0) {
+			return '';
+		}
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1586,7 +1672,9 @@ 
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
 			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
@@ -1595,7 +1683,9 @@ 
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos===$this->pos) {
+			return '';
+		}
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
@@ -1604,7 +1694,9 @@ 
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		$start = $this->pos;
 		while (1)
@@ -1617,7 +1709,9 @@ 
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos===$this->pos) {
+				return '';
+			}
 
 			if ($this->doc[$pos-1]==='\\') {
 				$start = $pos+1;
@@ -1674,14 +1768,12 @@ 
 				if (isset($this->noise[$key]))
 				{
 					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
-				}
-				else
+				} else
 				{
 					// do this to prevent an infinite loop.
 					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
 				}
-			}
-			else
+			} else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
 				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);

require/class.SBS.php

Braces +223 added lines, -77 removed lines

@@ -7,9 +7,13 @@ 
 	//echo $buffer."\n";
 	$data = array();
 	$typehex = substr($buffer,0,1);
-	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-	else $hex = substr($buffer,1,-1);
+	if ($typehex == '*' || $typehex == ':') {
+		$hex = substr($buffer,1,-1);
+	} elseif ($typehex == '@' || $typehex == '%') {
+		$hex = substr($buffer,13,-13);
+	} else {
+		$hex = substr($buffer,1,-1);
+	}
 	$bin = gmp_strval( gmp_init($hex,16), 2);
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 	if (strlen($hex) == 28) {
@@ -52,8 +56,9 @@ 
 		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
 		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
 		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
-		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+		    if ($oe == 0) {
+		    	$this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+		    } elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -62,8 +67,12 @@ 
 			$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
 			$lat_even = (360.0/60)*($j%60+$cprlat_even);
 			$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
-			if ($lat_even >= 270) $lat_even = $lat_even - 360;
-			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
+			if ($lat_even >= 270) {
+				$lat_even = $lat_even - 360;
+			}
+			if ($lat_odd >= 270) {
+				$lat_odd = $lat_odd - 360;
+			}
 			// check latitude zone
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 			    if ($this::$latlon[$icao]['created'] > time()) {
@@ -71,7 +80,9 @@ 
 				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
 				$lat = $lat_even;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) {
+					$lon = $lon -360;
+				}
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 				    $data['latitude'] = $lat;
@@ -82,14 +93,18 @@ 
 				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
 				$lat = $lat_odd;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) {
+					$lon = $lon -360;
+				}
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 				    $data['latitude'] = $lat;
 				    $data['longitude'] = $lon;
 				}
 			    }
-			} else echo "Not cprNL";
+			} else {
+				echo "Not cprNL";
+			}
 			unset($this::$latlon[$icao]);
 		    }
 		} elseif ($tc == 19) {
@@ -98,11 +113,17 @@ 
 		    $v_ew = intval(substr($bin,46,10),2);
 		    $v_ns_dir = intval(substr($bin,56,1));
 		    $v_ns = intval(substr($bin,57,10),2);
-		    if ($v_ew_dir) $v_ew = -1*$v_ew;
-		    if ($v_ns_dir) $v_ns = -1*$v_ns;
+		    if ($v_ew_dir) {
+		    	$v_ew = -1*$v_ew;
+		    }
+		    if ($v_ns_dir) {
+		    	$v_ns = -1*$v_ns;
+		    }
 		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
 		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-		    if ($heading <0) $heading = $heading+360;
+		    if ($heading <0) {
+		    	$heading = $heading+360;
+		    }
 		    $data['speed'] = $speed;
 		    $data['heading'] = $heading;
 		}
@@ -117,72 +138,194 @@ 
 
 	public function cprNL($lat) {
 	//Lookup table to convert the latitude to index.
-	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
-	if ($lat < 10.47047130) return 59;
-	if ($lat < 14.82817437) return 58;
-	if ($lat < 18.18626357) return 57;
-	if ($lat < 21.02939493) return 56;
-	if ($lat < 23.54504487) return 55;
-	if ($lat < 25.82924707) return 54;
-	if ($lat < 27.93898710) return 53;
-	if ($lat < 29.91135686) return 52;
-	if ($lat < 31.77209708) return 51;
-	if ($lat < 33.53993436) return 50;
-	if ($lat < 35.22899598) return 49;
-	if ($lat < 36.85025108) return 48;
-	if ($lat < 38.41241892) return 47;
-	if ($lat < 39.92256684) return 46;
-	if ($lat < 41.38651832) return 45;
-	if ($lat < 42.80914012) return 44;
-	if ($lat < 44.19454951) return 43;
-	if ($lat < 45.54626723) return 42;
-	if ($lat < 46.86733252) return 41;
-	if ($lat < 48.16039128) return 40;
-	if ($lat < 49.42776439) return 39;
-	if ($lat < 50.67150166) return 38;
-	if ($lat < 51.89342469) return 37;
-	if ($lat < 53.09516153) return 36;
-	if ($lat < 54.27817472) return 35;
-	if ($lat < 55.44378444) return 34;
-	if ($lat < 56.59318756) return 33;
-	if ($lat < 57.72747354) return 32;
-	if ($lat < 58.84763776) return 31;
-	if ($lat < 59.95459277) return 30;
-	if ($lat < 61.04917774) return 29;
-	if ($lat < 62.13216659) return 28;
-	if ($lat < 63.20427479) return 27;
-	if ($lat < 64.26616523) return 26;
-	if ($lat < 65.31845310) return 25;
-	if ($lat < 66.36171008) return 24;
-	if ($lat < 67.39646774) return 23;
-	if ($lat < 68.42322022) return 22;
-	if ($lat < 69.44242631) return 21;
-	if ($lat < 70.45451075) return 20;
-	if ($lat < 71.45986473) return 19;
-	if ($lat < 72.45884545) return 18;
-	if ($lat < 73.45177442) return 17;
-	if ($lat < 74.43893416) return 16;
-	if ($lat < 75.42056257) return 15;
-	if ($lat < 76.39684391) return 14;
-	if ($lat < 77.36789461) return 13;
-	if ($lat < 78.33374083) return 12;
-	if ($lat < 79.29428225) return 11;
-	if ($lat < 80.24923213) return 10;
-	if ($lat < 81.19801349) return 9;
-	if ($lat < 82.13956981) return 8;
-	if ($lat < 83.07199445) return 7;
-	if ($lat < 83.99173563) return 6;
-	if ($lat < 84.89166191) return 5;
-	if ($lat < 85.75541621) return 4;
-	if ($lat < 86.53536998) return 3;
-	if ($lat < 87.00000000) return 2;
+	if ($lat < 0) {
+		$lat = -$lat;
+	}
+	// Table is simmetric about the equator.
+	if ($lat < 10.47047130) {
+		return 59;
+	}
+	if ($lat < 14.82817437) {
+		return 58;
+	}
+	if ($lat < 18.18626357) {
+		return 57;
+	}
+	if ($lat < 21.02939493) {
+		return 56;
+	}
+	if ($lat < 23.54504487) {
+		return 55;
+	}
+	if ($lat < 25.82924707) {
+		return 54;
+	}
+	if ($lat < 27.93898710) {
+		return 53;
+	}
+	if ($lat < 29.91135686) {
+		return 52;
+	}
+	if ($lat < 31.77209708) {
+		return 51;
+	}
+	if ($lat < 33.53993436) {
+		return 50;
+	}
+	if ($lat < 35.22899598) {
+		return 49;
+	}
+	if ($lat < 36.85025108) {
+		return 48;
+	}
+	if ($lat < 38.41241892) {
+		return 47;
+	}
+	if ($lat < 39.92256684) {
+		return 46;
+	}
+	if ($lat < 41.38651832) {
+		return 45;
+	}
+	if ($lat < 42.80914012) {
+		return 44;
+	}
+	if ($lat < 44.19454951) {
+		return 43;
+	}
+	if ($lat < 45.54626723) {
+		return 42;
+	}
+	if ($lat < 46.86733252) {
+		return 41;
+	}
+	if ($lat < 48.16039128) {
+		return 40;
+	}
+	if ($lat < 49.42776439) {
+		return 39;
+	}
+	if ($lat < 50.67150166) {
+		return 38;
+	}
+	if ($lat < 51.89342469) {
+		return 37;
+	}
+	if ($lat < 53.09516153) {
+		return 36;
+	}
+	if ($lat < 54.27817472) {
+		return 35;
+	}
+	if ($lat < 55.44378444) {
+		return 34;
+	}
+	if ($lat < 56.59318756) {
+		return 33;
+	}
+	if ($lat < 57.72747354) {
+		return 32;
+	}
+	if ($lat < 58.84763776) {
+		return 31;
+	}
+	if ($lat < 59.95459277) {
+		return 30;
+	}
+	if ($lat < 61.04917774) {
+		return 29;
+	}
+	if ($lat < 62.13216659) {
+		return 28;
+	}
+	if ($lat < 63.20427479) {
+		return 27;
+	}
+	if ($lat < 64.26616523) {
+		return 26;
+	}
+	if ($lat < 65.31845310) {
+		return 25;
+	}
+	if ($lat < 66.36171008) {
+		return 24;
+	}
+	if ($lat < 67.39646774) {
+		return 23;
+	}
+	if ($lat < 68.42322022) {
+		return 22;
+	}
+	if ($lat < 69.44242631) {
+		return 21;
+	}
+	if ($lat < 70.45451075) {
+		return 20;
+	}
+	if ($lat < 71.45986473) {
+		return 19;
+	}
+	if ($lat < 72.45884545) {
+		return 18;
+	}
+	if ($lat < 73.45177442) {
+		return 17;
+	}
+	if ($lat < 74.43893416) {
+		return 16;
+	}
+	if ($lat < 75.42056257) {
+		return 15;
+	}
+	if ($lat < 76.39684391) {
+		return 14;
+	}
+	if ($lat < 77.36789461) {
+		return 13;
+	}
+	if ($lat < 78.33374083) {
+		return 12;
+	}
+	if ($lat < 79.29428225) {
+		return 11;
+	}
+	if ($lat < 80.24923213) {
+		return 10;
+	}
+	if ($lat < 81.19801349) {
+		return 9;
+	}
+	if ($lat < 82.13956981) {
+		return 8;
+	}
+	if ($lat < 83.07199445) {
+		return 7;
+	}
+	if ($lat < 83.99173563) {
+		return 6;
+	}
+	if ($lat < 84.89166191) {
+		return 5;
+	}
+	if ($lat < 85.75541621) {
+		return 4;
+	}
+	if ($lat < 86.53536998) {
+		return 3;
+	}
+	if ($lat < 87.00000000) {
+		return 2;
+	}
 	return 1;
     }
     
     public function cprN($lat,$isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
-	if ($nl > 1) return $nl;
-	else return 1;
+	if ($nl > 1) {
+		return $nl;
+	} else {
+		return 1;
+	}
     }
 
 
@@ -208,10 +351,13 @@ 
 	$checksum = intval(substr($msg,22,6),16);
 
 	for ($j = 0; $j < strlen($bin); $j++) {
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+	    if ($bin[$j]) {
+	    	$crc = $crc^intval($modes_checksum_table[$j],0);
+	    }
 	}
-	if ($crc == $checksum) return true;
-	else {
+	if ($crc == $checksum) {
+		return true;
+	} else {
 	    //echo "**** CRC ERROR ****\n";
 	    return false;
 	}

require/class.Translation.php

Braces +20 added lines, -7 removed lines

@@ -28,16 +28,25 @@ 
             } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
         	//$airline_icao = substr($ident, 0, 3);
         	return $ident;
-            } else return $ident;
-        } else return $ident;
+            } else {
+            	return $ident;
+            }
+        } else {
+        	return $ident;
+        }
         if ($airline_icao == 'AF') {
-            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-            else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+            	$icao = $ident;
+            } else {
+            	$icao = 'AFR'.ltrim(substr($ident,2),'0');
+            }
         } else {
             $identicao = $Spotter->getAllAirlineInfo($airline_icao);
             if (isset($identicao[0])) {
                 $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-            } else $icao = $ident;
+            } else {
+            	$icao = $ident;
+            }
         }
         return $icao;
     }
@@ -56,7 +65,9 @@ 
                 $sth->closeCursor();
                 if (count($row) > 0) {
                         return $row['operator_correct'];
-                } else return $ident;
+                } else {
+                	return $ident;
+                }
         }
 
        public function addOperator($ident,$correct_ident,$source) {
@@ -85,7 +96,9 @@ 
     	    global $globalTranslationSources, $globalTranslationFetch;
     	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
     	    $globalTranslationSources = array();
-    	    if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+    	    if (!isset($globalTranslationFetch)) {
+    	    	$globalTranslationFetch = TRUE;
+    	    }
     	    //echo "Check Translation for ".$ident."...";
     	    $correct = $this->getOperator($ident);
     	    if ($correct != '' && $correct != $ident) {

airline-statistics-time.php

Braces +4 added lines, -3 removed lines

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

registration-detailed.php

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];