Ysurac / FlightAirMap

require/class.Scheduler.php

Braces +164 added lines, -56 removed lines

@@ -122,7 +122,9 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	public function checkSchedule($ident) {
@@ -157,7 +159,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);
 	
@@ -184,7 +188,9 @@ 
 			*/
 		
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -199,7 +205,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);
@@ -212,7 +220,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();
+		}
 	}
 
 	/**
@@ -223,7 +233,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));
@@ -237,8 +249,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();
+		}
 	}
 
 	/**
@@ -249,7 +265,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);
@@ -269,8 +287,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();
+		}
 	}
 	
 	/**
@@ -284,12 +306,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) {
@@ -298,7 +326,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();
+		}
 	}
 
 	/**
@@ -312,19 +342,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'};
@@ -332,7 +370,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();
+		}
 	}
 
 	/**
@@ -346,14 +386,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])) {
@@ -362,7 +408,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();
+		}
 	}
 
 	/**
@@ -373,7 +421,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);
@@ -394,7 +444,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);
@@ -404,8 +456,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();
 	}
@@ -420,7 +475,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);
@@ -437,7 +494,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');
 			}
 		}
@@ -455,7 +514,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 != '') {
@@ -471,7 +532,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();
+				}
 			}
 			
 
@@ -491,7 +554,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);
@@ -515,7 +580,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;
@@ -605,7 +672,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 != '') {
@@ -637,11 +706,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);
@@ -684,7 +757,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);
@@ -737,11 +812,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;
@@ -750,7 +829,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();
+		}
 	}
 
 	/**
@@ -764,7 +845,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);
@@ -793,7 +876,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;
@@ -803,11 +888,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 != '') {
@@ -820,10 +913,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) {
@@ -838,7 +935,9 @@ 
 		}
 		if (isset($DepartureAirportIata)) {
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 
@@ -846,7 +945,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)))
 		{
@@ -1074,14 +1175,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);
+							}
 						}
 					}
 			}

Spacing +170 added lines, -170 removed lines

@@ -24,9 +24,9 @@ 
 	/ @param String $source source of data
 	*/
 	
-	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
+	public function addSchedule($ident, $departure_airport_icao, $departure_airport_time, $arrival_airport_icao, $arrival_airport_time, $source = 'website') {
 		date_default_timezone_set('UTC');
-		$date = date("Y-m-d H:i:s",time());
+		$date = date("Y-m-d H:i:s", time());
 	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
 	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
 	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
@@ -34,69 +34,69 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time);
 			} else {
 			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
 				//$query = 'UPDATE schedule SET date_lastseen = :date WHERE ident = :ident';
 				$query = 'UPDATE routes SET date_lastseen = :date WHERE CallSign = :ident';
-				$query_values = array(':ident' => $ident,':date' => $date);
+				$query_values = array(':ident' => $ident, ':date' => $date);
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
 			$query = 'INSERT INTO  routes (CallSign,FromAirport_ICAO, FromAirport_Time, ToAirport_ICAO, ToAirport_Time,date_added,source)  VALUES (:ident,:departure_airport_icao,:departure_airport_time,:arrival_airport_icao,:arrival_airport_time,:date,:source)';
-			$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+			$query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -105,10 +105,10 @@ 
 
 	public function getSchedule($ident) {
 	        $Translation = new Translation($this->db);
-	        $operator = $Translation->checkTranslation($ident,false);
+	        $operator = $Translation->checkTranslation($ident, false);
 	        if ($ident != $operator) {
 	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :operator OR CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
+	    		$query_values = array(':ident' => $ident, 'operator' => $operator);
 	    	} else {
 		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :ident LIMIT 1";
 	    		$query_values = array(':ident' => $ident);
@@ -116,7 +116,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -140,7 +140,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -155,16 +155,16 @@ 
 	* @param String $carrier IATA code
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
+	private function getAirFrance($callsign, $date = 'NOW', $carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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);
 	
 		$parsed_json = json_decode($json);
-		if (property_exists($parsed_json,'errors') === false) {
+		if (property_exists($parsed_json, 'errors') === false) {
 			//$originLong = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originLong'};
 			$originShort = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originShort'};
 			//$departureDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'departureDateMedium'};
@@ -174,9 +174,9 @@ 
 			//$arrivalDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalDateMedium'};
 			$arrivalTime = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalTime'};
 
-			preg_match('/\((.*?)\)/',$originShort,$originiata);
+			preg_match('/\((.*?)\)/', $originShort, $originiata);
 			$DepartureAirportIata = $originiata[1];
-			preg_match('/\((.*?)\)/',$destinationShort,$destinationiata);
+			preg_match('/\((.*?)\)/', $destinationShort, $destinationiata);
 			$ArrivalAirportIata = $destinationiata[1];
 
 			/*
@@ -185,7 +185,7 @@ 
 			$arrivalTime = gmdate('H:i',strtotime($arrivalTime));
 			*/
 		
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airfrance');
 		} else return array();
 	}
 
@@ -200,8 +200,8 @@ 
 		$Common = new Common();
 		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();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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);
@@ -213,7 +213,7 @@ 
 			$departureTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fstd'};
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_easyjet');
 		} else return array();
 	}
 
@@ -224,12 +224,12 @@ 
 	*/
 	private function getRyanair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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));
-		$json = $Common->getData($url,'post',$post,$headers);
+		$headers = array('Content-Type: application/json', 'Content-Length: '.strlen($post));
+		$json = $Common->getData($url, 'post', $post, $headers);
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'flightInfo'})) {
 			$flights = $parsed_json->{'flightInfo'};
@@ -238,7 +238,7 @@ 
 				$ArrivalAirportIata = $parsed_json->{'flightInfo'}[0]->{'arrivalAirport'}->{'iata'}; //name
 				$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');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
 			} else return array();
 		} else return array();
 	}
@@ -250,8 +250,8 @@ 
 	*/
 	private function getSwiss($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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);
@@ -265,12 +265,12 @@ 
 				if ($flight->{'no'} == "Vol LX ".$numvol) {
 					$DepartureAirportIata = $flight->{'from'}->{'code'}; //city
 					$ArrivalAirportIata = $flight->{'to'}->{'code'}; //city
-					$departureTime = substr($flight->{'from'}->{'hour'},0,5);
-					$arrivalTime = substr($flight->{'to'}->{'hour'},0,5);
+					$departureTime = substr($flight->{'from'}->{'hour'},0, 5);
+					$arrivalTime = substr($flight->{'to'}->{'hour'},0, 5);
 				}
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_swiss');
 			} else return array();
 		} else return array();
 	}
@@ -285,21 +285,21 @@ 
 		global $globalBritishAirwaysKey;
 		$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();
+		$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();
 		$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);
+		$json = $Common->getData($url, 'get', '', $headers);
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'DepartureAirport'};
 			$ArrivalAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ArrivalAirport'};
-			$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');
+			$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();
 	}
 
@@ -313,27 +313,27 @@ 
 		global $globalLufthansaKey;
 		$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();
+		$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();
 		$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);
+		$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();
 		$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);
+		$headers = array('Authorization: Bearer '.$token, 'Accept: application/json');
+		$json = $Common->getData($url, 'get', '', $headers);
 		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'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			$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');
+			$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();
 	}
 
@@ -347,23 +347,23 @@ 
 		global $globalTransaviaKey;
 		$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();
+		$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();
 		$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);
+		$json = $Common->getData($url, 'get', '', $headers);
 		//echo 'result : '.$json;
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
 			$DepartureAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'departureAirport'}->{'locationCode'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
 			$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');
+			$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();
 	}
 
@@ -374,14 +374,14 @@ 
 	*/
 	public function getTunisair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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);
 		foreach ($table as $flight) {
-			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d',$numvol)) {
-				return array('DepartureAirportIATA' => $flight[2],'DepartureTime' => str_replace('.',':',$flight[5]),'ArrivalAirportIATA' => $flight[3],'ArrivalTime' => str_replace('.',':',$flight[6]),'Source' => 'website_tunisair');
+			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d', $numvol)) {
+				return array('DepartureAirportIATA' => $flight[2], 'DepartureTime' => str_replace('.', ':', $flight[5]), 'ArrivalAirportIATA' => $flight[3], 'ArrivalTime' => str_replace('.', ':', $flight[6]), 'Source' => 'website_tunisair');
 			}
 		}
 		return array();
@@ -392,21 +392,21 @@ 
 	* @param String $callsign The callsign
 	* @return Flight departure and arrival airports and time
 	*/
-	public function getVueling($callsign,$date = 'NOW') {
+	public function getVueling($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		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);
-		$data=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$data));
+		$data = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $data));
 		if ($data != '') {
-			preg_match('/flightOri=[A-Z]{3}/',$data,$result);
-			$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');
+			preg_match('/flightOri=[A-Z]{3}/', $data, $result);
+			$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();
 		}
 		return array();
@@ -420,27 +420,27 @@ 
 	*/
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$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);
+		$post = array('numvuelo' => $numvol, 'fecha' => $check_date->format('Ymd'), 'airlineID' => 'IB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (count($table) > 0) {
 				$flight = $table;
-				preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-				preg_match('/([A-Z]{3})/',$flight[5][0],$ArrivalAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[5][0], $ArrivalAirportIataMatch);
 				$DepartureAirportIata = $DepartureAirportIataMatch[0];
 				$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-				$departureTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[3][2]))),0,5);
-				$arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1])));
+				$departureTime = substr(trim(str_replace(' lunes', '', str_replace(' ', '', $flight[3][2]))), 0, 5);
+				$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);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
+					$arrivalTime = substr(trim(str_replace(' lunes', '', str_replace(' ', '', $flight[5][2]))), 0, 5);
+				} else $arrivalTime = substr($arrivalTime, 0, 5);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_iberia');
 			}
 		}
 		return array();
@@ -453,11 +453,11 @@ 
 	* @return Flight departure and arrival airports and time
 	*/
 
-	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
+	private function getStarAlliance($callsign, $date = 'NOW', $carrier = '') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$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 != '') {
@@ -466,13 +466,13 @@ 
 				$flight = $table;
 				//print_r($table);
 				if (isset($flight[25]) && isset($flight[29])) {
-					preg_match('/([A-Z]{3})/',$flight[25][1],$DepartureAirportIataMatch);
-					preg_match('/([A-Z]{3})/',$flight[25][3],$ArrivalAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][1], $DepartureAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][3], $ArrivalAirportIataMatch);
 					$DepartureAirportIata = $DepartureAirportIataMatch[0];
 					$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-					$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');
+					$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();
 			}
 			
@@ -490,10 +490,10 @@ 
 	*/
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$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();
+		$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();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -501,7 +501,7 @@ 
 			$ArrivalAirportIata = '';
 			$departureTime = $table[4];
 			$arrivalTime = $table[5];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_alitalia');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_alitalia');
 		}
 	}
 
@@ -513,21 +513,21 @@ 
 	*/
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$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";
+		$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;
-		    $parsed_json = json_decode($data,true);
+		    $parsed_json = json_decode($data, true);
 		    if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
-			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
-			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
+			$departureTime = date('H:i', strtotime($parsed_json[0]['ScheduledDepatureDate']));
+			$arrivalTime = date('H:i', strtotime($parsed_json[0]['ScheduledArrivalDate']));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_brussels');
 		    }
 		}
 	}
@@ -604,21 +604,21 @@ 
 	*/
 	private function getFlyTap($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
+		$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();
-		$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 (!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 != '') {
 			$table = $Common->table2array($data);
-			$departureTime = trim(substr($table[15][0],0,5));
-			$arrivalTime = trim(substr($table[35][0],0,5));
-			preg_match('/([A-Z]{3})/',$table[11][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$table[31][0],$ArrivalAirportIataMatch);
+			$departureTime = trim(substr($table[15][0], 0, 5));
+			$arrivalTime = trim(substr($table[35][0], 0, 5));
+			preg_match('/([A-Z]{3})/', $table[11][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $table[31][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flytap');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flytap');
 		}
 		return array();
 	}
@@ -640,10 +640,10 @@ 
 			} 
 		}
 		if ($airline_icao == '') return array();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
+		$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);
@@ -653,13 +653,13 @@ 
 				$darr = '';
 				$ahour = '';
 				$aarr = '';
-				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
+				$n = sscanf($sched, '%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])', $dhour, $darr, $ahour, $aarr);
 				if ($n == 7) {
 				    $departureTime = $dhour;
 				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+				    $DepartureAirportIata = str_replace(array('(', ')'), '', $darr);
+				    $ArrivalAirportIata = str_replace(array('(', ')'), '', $aarr);
+				    return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -683,20 +683,20 @@ 
 			} 
 		}
 		*/
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://fr.flightaware.com/live/flight/".$callsign;
+		$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);
 			if (isset($table[11][0])) {
-				$departureTime = str_replace('h',':',substr($table[5][0],0,5));
-				$arrivalTime = str_replace('h',':',substr($table[5][1],0,5));
+				$departureTime = str_replace('h', ':', substr($table[5][0], 0, 5));
+				$arrivalTime = str_replace('h', ':', substr($table[5][1], 0, 5));
 				echo $table[3][0];
-				sscanf($table[3][0],'%*[^(] (%3[A-Z] / %*4[A-Z])',$DepartureAirportIata);
-				sscanf($table[3][1],'%*[^(] (%3[A-Z] / %*4[A-Z])',$ArrivalAirportIata);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightaware');
+				sscanf($table[3][0], '%*[^(] (%3[A-Z] / %*4[A-Z])', $DepartureAirportIata);
+				sscanf($table[3][1], '%*[^(] (%3[A-Z] / %*4[A-Z])', $ArrivalAirportIata);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightaware');
 			}
 		}
 		return array();
@@ -709,7 +709,7 @@ 
 	*/
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
-		$url= "http://www.costtotravel.com/flight-number/".$callsign;
+		$url = "http://www.costtotravel.com/flight-number/".$callsign;
 		//$check_date = new Datetime($date);
 		//if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
@@ -717,11 +717,11 @@ 
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (isset($table[11][1])) {
-				$departureTime = substr($table[11][1],0,5);
-				$arrivalTime = substr($table[17][1],0,5);
-				$DepartureAirportIata = substr($table[13][1],0,3);
-				$ArrivalAirportIata = substr($table[15][1],0,3);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_costtotravel');
+				$departureTime = substr($table[11][1], 0, 5);
+				$arrivalTime = substr($table[17][1], 0, 5);
+				$DepartureAirportIata = substr($table[13][1], 0, 3);
+				$ArrivalAirportIata = substr($table[15][1], 0, 3);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_costtotravel');
 			}
 		}
 		return array();
@@ -733,13 +733,13 @@ 
 	* @param String $date date we want flight number info
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirCanada($callsign,$date = 'NOW') {
+	private function getAirCanada($callsign, $date = 'NOW') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		$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();
+		$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();
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
@@ -747,11 +747,11 @@ 
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
-			$departureTime = date('H:i',strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
+			$departureTime = date('H:i', strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			$arrival = $dom->getElementsByTagName('ArrivalStationInfo')->item(0);
 			$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');
+			$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();
 	}
 
@@ -763,21 +763,21 @@ 
 	*/
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$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();
+		$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();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$flight[21][0],$ArrivalAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[21][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
 			$departureTime = $flight[5][1];
 			$arrivalTime = $flight[23][1];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_vietnamairlines');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_vietnamairlines');
 		}
 	}
 
@@ -788,16 +788,16 @@ 
 	* @param String $carrier airline code
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
+	private function getAirBerlin($callsign, $date = 'NOW', $carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		//AB = airberlin, HG/NLY = NIKI, 4T/BHP = Belair 
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$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();
-		$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);
+		$url = "http://www.airberlin.com/en-US/site/aims.php";
+		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;
 		$DepartureAirportIata = '';
 		$ArrivalAirportIata = '';
@@ -810,8 +810,8 @@ 
 			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);
+		$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 != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
@@ -839,13 +839,13 @@ 
 			}
 		}
 		if (isset($DepartureAirportIata)) {
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airberlin');
 		} else return array();
 	}
 
 
 	
-	public function fetchSchedule($ident,$date = 'NOW') {
+	public function fetchSchedule($ident, $date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch;
 		//$Common = new Common();
 		if (!$globalSchedulesFetch) return array();
@@ -915,7 +915,7 @@ 
 				// Brussels Airlines
 				case "BEL":
 				case "SN":
-					return $this->getBrussels($ident,$date);
+					return $this->getBrussels($ident, $date);
 /*
 				// Copa Airlines
 				case "CMP":
@@ -1000,17 +1000,17 @@ 
 				// Air France
 				case "AF":
 				case "AFR":
-					return $this->getAirFrance($ident,$date,'AF');
+					return $this->getAirFrance($ident, $date, 'AF');
 				// HOP
 				case "A5":
 				case "HOP":
-					return $this->getAirFrance($ident,$date,'A5');
+					return $this->getAirFrance($ident, $date, 'A5');
 				// EasyJet
 				case "U2":
 				case "DS":
 				case "EZY":
 				case "EZS":
-					return $this->getEasyJet($ident,$date);
+					return $this->getEasyJet($ident, $date);
 				// Ryanair
 				case "FR":
 				case "RYR":
@@ -1060,25 +1060,25 @@ 
 					return $this->getIberia($ident);
 				// Vietnam Airlines
 				case "HVN":
-					return $this->getVietnamAirlines($ident,$date);
+					return $this->getVietnamAirlines($ident, $date);
 				// Air Berlin
 				case "AB":
 				case "BER":
-					return $this->getAirBerlin($ident,$date,'AB');
+					return $this->getAirBerlin($ident, $date, 'AB');
 				// NIKI
 				case "HG":
 				case "NLY":
-					return $this->getAirBerlin($ident,$date,'HG');
+					return $this->getAirBerlin($ident, $date, 'HG');
 				// BelAir
 				case "4T":
 				case "BHP":
-					return $this->getAirBerlin($ident,$date,'4T');
+					return $this->getAirBerlin($ident, $date, '4T');
 				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);
+							$rand = mt_rand(0, count($globalSchedulesSources) - 1);
 							$source = $globalSchedulesSources[$rand];
 							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
 							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);

Indentation +160 added lines, -160 removed lines

@@ -8,29 +8,29 @@ 
 
 class Schedule {
 	protected $cookies = array();
-        public $db;
+		public $db;
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-        }
+		}
 	
 	/**
-	* Add schedule data to database
-	* @param String $ident aircraft ident
-	* @param String $departure_airport_icao departure airport icao
-	* @param String $departure_airport_time departure airport time
-	* @param String $arrival_airport_icao arrival airport icao
-	* @param String $arrival_airport_time arrival airport time
+	 * Add schedule data to database
+	 * @param String $ident aircraft ident
+	 * @param String $departure_airport_icao departure airport icao
+	 * @param String $departure_airport_time departure airport time
+	 * @param String $arrival_airport_icao arrival airport icao
+	 * @param String $arrival_airport_time arrival airport time
 	/ @param String $source source of data
-	*/
+	 */
 	
 	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
 		date_default_timezone_set('UTC');
 		$date = date("Y-m-d H:i:s",time());
-	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
-	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
-	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
-	        $query_values = array(':ident' => $ident);
+			//if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
+			//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
+			$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -39,18 +39,18 @@ 
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			} else {
-			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
@@ -61,17 +61,17 @@ 
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				}
 				 try {
 					$sth = $this->db->prepare($query);
@@ -104,15 +104,15 @@ 
 	}
 
 	public function getSchedule($ident) {
-	        $Translation = new Translation($this->db);
-	        $operator = $Translation->checkTranslation($ident,false);
-	        if ($ident != $operator) {
-	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
-	    	} else {
-		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident);
-	    	}
+			$Translation = new Translation($this->db);
+			$operator = $Translation->checkTranslation($ident,false);
+			if ($ident != $operator) {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident,'operator' => $operator);
+			} else {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+			}
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -128,15 +128,15 @@ 
 
 	public function checkSchedule($ident) {
 		global $globalDBdriver;
-	        //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
-	        if ($globalDBdriver == 'mysql') {
+			//$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident 
 			AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL)
 			     OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) LIMIT 1";
 		}
-	        $query_values = array(':ident' => $ident);
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -149,12 +149,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air France
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier IATA code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air France
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier IATA code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -190,11 +190,11 @@ 
 	}
 
 	/**
-	* Get flight info from EasyJet
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from EasyJet
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getEasyJet($callsign, $date = 'NOW') {
 		global $globalTimezone;
 		$Common = new Common();
@@ -218,10 +218,10 @@ 
 	}
 
 	/**
-	* Get flight info from Ryanair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Ryanair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -244,10 +244,10 @@ 
 	}
 
 	/**
-	* Get flight info from Swiss
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Swiss
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -276,11 +276,11 @@ 
 	}
 	
 	/**
-	* Get flight info from British Airways API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from British Airways API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getBritishAirways($callsign, $date = 'NOW') {
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
@@ -304,11 +304,11 @@ 
 	}
 
 	/**
-	* Get flight info from Lutfhansa API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lutfhansa API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getLufthansa($callsign, $date = 'NOW') {
 		global $globalLufthansaKey;
 		$Common = new Common();
@@ -338,11 +338,11 @@ 
 	}
 
 	/**
-	* Get flight info from Transavia API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Transavia API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTransavia($callsign, $date = 'NOW') {
 		global $globalTransaviaKey;
 		$Common = new Common();
@@ -368,10 +368,10 @@ 
 	}
 
 	/**
-	* Get flight info from Tunisair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Tunisair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -388,10 +388,10 @@ 
 	}
 
 	/**
-	* Get flight info from Vueling
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vueling
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getVueling($callsign,$date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -413,11 +413,11 @@ 
 	}
 
 	/**
-	* Get flight info from Iberia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Iberia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -447,11 +447,11 @@ 
 	}
 
 	/**
-	* Get flight info from Star Alliance
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Star Alliance
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
 		$Common = new Common();
@@ -483,11 +483,11 @@ 
 
 
 	/**
-	* Get flight info from Alitalia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Alitalia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -506,11 +506,11 @@ 
 	}
 
 	/**
-	* Get flight info from Brussels airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Brussels airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -520,24 +520,24 @@ 
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
-		    //echo $data;
-		    $parsed_json = json_decode($data,true);
-		    if (isset($parsed_json[0]['FromAirportCode'])) {
+			//echo $data;
+			$parsed_json = json_decode($data,true);
+			if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
 			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
-		    }
+			}
 		}
 	}
 
 	/**
-	* Get flight info from FlightRadar24
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from FlightRadar24
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 /*
 	public function getFlightRadar24($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -566,11 +566,11 @@ 
 	}
   */
 	/**
-	* Get flight info from Lufthansa
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lufthansa
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 /*	private function getLufthansa($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -598,10 +598,10 @@ 
 	}
   */
 	/**
-	* Get flight info from flytap
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flytap
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getFlyTap($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -624,10 +624,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightmapper
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightmapper
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightMapper($callsign) {
 		$Common = new Common();
 		$airline_icao = '';
@@ -655,11 +655,11 @@ 
 				$aarr = '';
 				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
 				if ($n == 7) {
-				    $departureTime = $dhour;
-				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+					$departureTime = $dhour;
+					$arrivalTime = $ahour;
+					$DepartureAirportIata = str_replace(array('(',')'),'',$darr);
+					$ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
+					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -667,10 +667,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightaware
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightaware
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightAware($callsign) {
 		$Common = new Common();
 		/*
@@ -703,10 +703,10 @@ 
 	}
 
 	/**
-	* Get flight info from CostToTravel
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from CostToTravel
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
 		$url= "http://www.costtotravel.com/flight-number/".$callsign;
@@ -728,11 +728,11 @@ 
 	}
 
 	/**
-	* Get flight info from Air Canada
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Canada
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -756,11 +756,11 @@ 
 	}
 
 	/**
-	* Get flight info from Vietnam Airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vietnam Airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -782,12 +782,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air Berlin
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier airline code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Berlin
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier airline code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -816,11 +816,11 @@ 
 			$table = $Common->table2array($data);
 			$flight = $table;
 			if (isset($flight[5][4])) {
-			    $arrivalTime = $flight[5][4];
-			    $arrivalAirport = $flight[5][3];
+				$arrivalTime = $flight[5][4];
+				$arrivalAirport = $flight[5][3];
 			} else {
-			    $arrivalTime = '';
-			    $arrivalAirport = '';
+				$arrivalTime = '';
+				$arrivalAirport = '';
 			}
 		} 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';
@@ -1088,7 +1088,7 @@ 
 					}
 			}
 		}
-	        return array();
+			return array();
 	}
 }
 

require/class.Common.php

Indentation +46 added lines, -46 removed lines

@@ -6,13 +6,13 @@ 
 	//protected $cookies = array();
 	
 	/**
-	* Get data from form result
-	* @param String $url form URL
-	* @param String $type type of submit form method (get or post)
-	* @param String|Array $data values form post method
-	* @param Array $headers header to submit with the form
-	* @return String the result
-	*/
+	 * Get data from form result
+	 * @param String $url form URL
+	 * @param String $type type of submit form method (get or post)
+	 * @param String|Array $data values form post method
+	 * @param Array $headers header to submit with the form
+	 * @return String the result
+	 */
 	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
@@ -67,7 +67,7 @@ 
 				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
 			}
 		} else {
-		    return $result;
+			return $result;
 		}
 	}
 	
@@ -80,10 +80,10 @@ 
 	}
 	
 	/**
-	* Convert a HTML table to an array
-	* @param String $data HTML page
-	* @return Array array of the tables in HTML page
-	*/
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
 	public function table2array($data) {
 		if (!is_string($data)) return array();
 		if ($data == '') return array();
@@ -117,10 +117,10 @@ 
 	}
 	
 	/**
-	* Convert <p> part of a HTML page to an array
-	* @param String $data HTML page
-	* @return Array array of the <p> in HTML page
-	*/
+	 * Convert <p> part of a HTML page to an array
+	 * @param String $data HTML page
+	 * @return Array array of the <p> in HTML page
+	 */
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
@@ -135,14 +135,14 @@ 
 	}
 
 	/**
-	* Give distance between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @param String $unit km else no unit used
-	* @return Float Distance in $unit
-	*/
+	 * Give distance between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @param String $unit km else no unit used
+	 * @return Float Distance in $unit
+	 */
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
@@ -160,11 +160,11 @@ 
 	}
 
 	/**
-	* Check is distance realistic
-	* @param int $timeDifference the time between the reception of both messages
-	* @param float $distance distance covered
-	* @return whether distance is realistic
-	*/
+	 * Check is distance realistic
+	 * @param int $timeDifference the time between the reception of both messages
+	 * @param float $distance distance covered
+	 * @return whether distance is realistic
+	 */
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
@@ -182,7 +182,7 @@ 
 	}
 
 	public function isInteger($input){
-	    return(ctype_digit(strval($input)));
+		return(ctype_digit(strval($input)));
 	}
 
 
@@ -198,11 +198,11 @@ 
 	}
 	
 	/**
-	* Copy folder contents
-	* @param       string   $source    Source path
-	* @param       string   $dest      Destination path
-	* @return      bool     Returns true on success, false on failure
-	*/
+	 * Copy folder contents
+	 * @param       string   $source    Source path
+	 * @param       string   $dest      Destination path
+	 * @return      bool     Returns true on success, false on failure
+	 */
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
@@ -214,20 +214,20 @@ 
 	}
 	
 	/**
-	* Check if an url exist
-	* @param	String $url url to check
-	* @return	bool Return true on succes false on failure
-	*/
+	 * Check if an url exist
+	 * @param	String $url url to check
+	 * @return	bool Return true on succes false on failure
+	 */
 	public function urlexist($url){
 		$headers=get_headers($url);
 		return stripos($headers[0],"200 OK")?true:false;
 	}
 	
 	/**
-	* Convert hexa to string
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa to string
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
@@ -275,9 +275,9 @@ 
 	}
 	
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{

Spacing +56 added lines, -56 removed lines

@@ -13,13 +13,13 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') {
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -29,13 +29,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -47,7 +47,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -58,13 +58,13 @@ 
 		$result = curl_exec($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 		    return $result;
@@ -89,27 +89,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('tr') as $element)
+		$tabledata = array();
+		foreach ($html->find('tr') as $element)
 		{
 			$td = array();
-			foreach( $element->find('th') as $row)
+			foreach ($element->find('th') as $row)
 			{
 				$td [] = trim($row->plaintext);
 			}
-			$td=array_filter($td);
+			$td = array_filter($td);
 			$tabledata[] = $td;
 
 			$td = array();
 			$tdi = array();
-			foreach( $element->find('td') as $row)
+			foreach ($element->find('td') as $row)
 			{
 				$td [] = trim($row->plaintext);
 				$tdi [] = trim($row->innertext);
 			}
-			$td=array_filter($td);
-			$tdi=array_filter($tdi);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -124,8 +124,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -145,11 +145,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -165,7 +165,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -181,12 +181,12 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 	    return(ctype_digit(strval($input)));
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -194,7 +194,7 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
 	/**
@@ -206,8 +206,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -218,9 +218,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ? true : false;
 	}
 	
 	/**
@@ -231,7 +231,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -240,33 +240,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > pi()) {
-			if($dLon > 0) {
-				$dLon = (2 * pi() - $dLon) * -1;
+		if (abs($dLon) > pi()) {
+			if ($dLon > 0) {
+				$dLon = (2*pi() - $dLon)*-1;
 			} else {
-				$dLon = 2 * pi() + $dLon;
+				$dLon = 2*pi() + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 	
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.1) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.1) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -297,34 +297,34 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1) {
 		global $globalMapRefresh;
 		$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
 		$r = 6378;
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -333,7 +333,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 }
 ?>
\ No newline at end of file

Doc Comments +9 added lines, -2 removed lines

@@ -79,6 +79,10 @@ 
 		return strlen($headerLine); // Needed by curl
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $file
+	 */
 	public static function download($url, $file, $referer = '') {
 		$fp = fopen($file, 'w+');
 		$ch = curl_init();
@@ -177,7 +181,7 @@ 
 	* Check is distance realistic
 	* @param int $timeDifference the time between the reception of both messages
 	* @param float $distance distance covered
-	* @return whether distance is realistic
+	* @return boolean distance is realistic
 	*/
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
@@ -200,6 +204,9 @@ 
 	}
 
 
+	/**
+	 * @param string $latlong
+	 */
 	public function convertDec($dms,$latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
@@ -301,7 +308,7 @@ 
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Braces +49 added lines, -18 removed lines

@@ -27,8 +27,11 @@ 
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -74,8 +77,9 @@ 
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		//global $cookies;
 		$cookies = array();
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 
@@ -86,11 +90,15 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
-		if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch);
+		if (curl_errno($ch) && $globalDebug) {
+			echo 'Download error: '.curl_error($ch);
+		}
 		curl_close($ch);
 		fclose($fp);
 	}
@@ -101,10 +109,16 @@ 
 	* @return Array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -139,7 +153,9 @@ 
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -160,7 +176,9 @@ 
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -184,10 +202,16 @@ 
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -247,7 +271,9 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -275,8 +301,11 @@ 
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -312,7 +341,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {

require/class.Connection.php

Doc Comments +16 added lines

@@ -6,6 +6,9 @@ 
 	public $dbs = array();
 	public $latest_schema = 23;
 	
+	/**
+	 * @param string $dbname
+	 */
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
 	    global $globalDBdriver;
 	    if ($dbc === null) {
@@ -131,6 +134,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function tableExists($table)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -180,6 +186,11 @@ 
 	/*
 	* Check if index exist
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $index
+	 */
 	public function indexExists($table,$index)
 	{
 		global $globalDBdriver, $globalDBname;
@@ -225,6 +236,11 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
+
+	/**
+	 * @param string $table
+	 * @param string $name
+	 */
 	public function checkColumnName($table,$name)
 	{
 		$query = "SELECT * FROM ".$table." LIMIT 0";

Braces +77 added lines, -30 removed lines

@@ -64,8 +64,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $globalDBuser;
 				$globalDBSpass = $globalDBpass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			} else {
 				$DBname = 'default';
 				$globalDBSdriver = $globalDBdriver;
@@ -73,8 +76,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $user;
 				$globalDBSpass = $pass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			}
 		} else {
 			$globalDBSdriver = $globalDB[$DBname]['driver'];
@@ -82,11 +88,16 @@ 
 			$globalDBSname = $globalDB[$DBname]['name'];
 			$globalDBSuser = $globalDB[$DBname]['user'];
 			$globalDBSpass = $globalDB[$DBname]['pass'];
-			if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
-			else $globalDBSport = 3306;
+			if (isset($globalDB[$DBname]['port'])) {
+				$globalDBSport = $globalDB[$DBname]['port'];
+			} else {
+				$globalDBSport = 3306;
+			}
 		}
 		// Set number of try to connect to DB
-		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5;
+		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) {
+			$globalDBretry = 5;
+		}
 		$i = 0;
 		while (true) {
 			try {
@@ -95,10 +106,16 @@ 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -112,22 +129,34 @@ 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 				}
 				break;
 			} catch(PDOException $e) {
 				$i++;
-				if (isset($globalDebug) && $globalDebug) echo $e->getMessage()."\n";
+				if (isset($globalDebug) && $globalDebug) {
+					echo $e->getMessage()."\n";
+				}
 				//exit;
-				if ($i > $globalDBretry) return false;
+				if ($i > $globalDBretry) {
+					return false;
+				}
 				//return false;
 			}
 		}
-		if ($DBname === 'default') $this->db = $this->dbs['default'];
+		if ($DBname === 'default') {
+			$this->db = $this->dbs['default'];
+		}
 		return true;
 	}
 
@@ -139,7 +168,9 @@ 
 		} else {
 			$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
 		}
-		if ($this->db == NULL) return false;
+		if ($this->db == NULL) {
+			return false;
+		}
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
@@ -148,21 +179,28 @@ 
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	public function connectionExists()
 	{
 		global $globalDBdriver, $globalDBCheckConnection;
-		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
+		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
+			return true;
+		}
 		$query = "SELECT 1 + 1";
-		if ($this->db === null) return false;
+		if ($this->db === null) {
+			return false;
+		}
 		try {
 			$sum = @$this->db->query($query);
 			if ($sum instanceof \PDOStatement) {
 				$sum = $sum->fetchColumn(0);
-			} else $sum = 0;
+			} else {
+				$sum = 0;
+			}
 			if (intval($sum) !== 2) {
 			     return false;
 			}
@@ -196,8 +234,9 @@ 
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/*
@@ -240,9 +279,12 @@ 
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
-			if ($result['nb'] > 0) return true;
-			else return false;
-/*		} else {
+			if ($result['nb'] > 0) {
+				return true;
+			} else {
+				return false;
+			}
+			/*		} else {
 			$query = "SELECT * FROM ".$table." LIMIT 0";
 			try {
 				$results = $this->db->query($query);
@@ -280,7 +322,9 @@ 
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
 				return $result['value'];
 			}
-		} else return $version;
+		} else {
+			return $version;
+		}
 	}
 	
 	/*
@@ -288,8 +332,11 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+	    if ($this->check_schema_version() == $this->latest_schema) {
+	    	return true;
+	    } else {
+	    	return false;
+	    }
 	}
 
 }

Indentation +23 added lines, -23 removed lines

@@ -7,18 +7,18 @@ 
 	public $latest_schema = 26;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalDBdriver;
-	    if ($dbc === null) {
+		global $globalDBdriver;
+		if ($dbc === null) {
 		if ($this->db === null && $dbname === null) {
-		    if ($user === null && $pass === null) {
+			if ($user === null && $pass === null) {
 			$this->createDBConnection();
-		    } else {
+			} else {
 			$this->createDBConnection(null,$user,$pass);
-		    }
+			}
 		} else {
-		    $this->createDBConnection($dbname);
+			$this->createDBConnection($dbname);
 		}
-	    } elseif ($dbname === null || $dbname === 'default') {
+		} elseif ($dbname === null || $dbname === 'default') {
 		$this->db = $dbc;
 		if ($this->connectionExists() === false) {
 			/*
@@ -28,10 +28,10 @@ 
 			*/
 			$this->createDBConnection();
 		}
-	    } else {
+		} else {
 		//$this->connectionExists();
 		$this->dbs[$dbname] = $dbc;
-	    }
+		}
 	}
 
 	public function db() {
@@ -47,11 +47,11 @@ 
 	}
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -147,7 +147,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -164,14 +164,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -268,8 +268,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 				try {
@@ -289,8 +289,8 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }

Spacing +28 added lines, -28 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 26;
 	
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 	    global $globalDBdriver;
 	    if ($dbc === null) {
 		if ($this->db === null && $dbname === null) {
 		    if ($user === null && $pass === null) {
 			$this->createDBConnection();
 		    } else {
-			$this->createDBConnection(null,$user,$pass);
+			$this->createDBConnection(null, $user, $pass);
 		    }
 		} else {
 		    $this->createDBConnection($dbname);
@@ -91,14 +91,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -108,18 +108,18 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo $e->getMessage()."\n";
 				//exit;
@@ -143,10 +143,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -167,8 +167,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -180,7 +180,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -191,11 +191,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -210,7 +210,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -226,7 +226,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -236,8 +236,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -276,7 +276,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

install/class.update_db.php

Doc Comments +42 added lines

@@ -10,6 +10,9 @@ 
 class update_db {
 	public static $db_sqlite;
 
+	/**
+	 * @param string $file
+	 */
 	public static function download($url, $file, $referer = '') {
 		$fp = fopen($file, 'w+');
 		$ch = curl_init();
@@ -24,6 +27,9 @@ 
 		fclose($fp);
 	}
 
+	/**
+	 * @param string $in_file
+	 */
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
@@ -45,6 +51,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $in_file
+	 */
 	public static function unzip($in_file) {
 		if ($in_file != '' && file_exists($in_file)) {
 			$path = pathinfo(realpath($in_file), PATHINFO_DIRNAME);
@@ -66,6 +75,9 @@ 
 		}
 	}
 	
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
@@ -108,6 +120,10 @@ 
 		}
                 return '';
 	}
+
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
@@ -147,6 +163,9 @@ 
                 return '';
 	}
 	
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_route_skyteam($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
@@ -186,6 +205,10 @@ 
 		}
                 return '';
 	}
+
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -251,6 +274,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_flarmnet($database_file) {
 		global $globalTransaction;
 		$Common = new Common();
@@ -321,6 +347,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_ogn($database_file) {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -389,6 +418,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_owner($database_file,$country = 'F') {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -939,6 +971,10 @@ 
 		return '';
         }
 
+	/**
+	 * @param string $filename
+	 * @param string $tletype
+	 */
 	public static function tle($filename,$tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;
@@ -1071,6 +1107,9 @@ 
 
 	}
 */
+	/**
+	 * @param string $filename
+	 */
 	public static function waypoints($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;
@@ -1118,6 +1157,9 @@ 
 		return '';
         }
 
+	/**
+	 * @param string $filename
+	 */
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;

Indentation +404 added lines, -404 removed lines

@@ -75,38 +75,38 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
-    		update_db::connect_sqlite($database_file);
+			if ($globalDebug) echo " - Add routes to DB -";
+			update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
@@ -117,12 +117,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'oneworld'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'oneworld'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+			if ($globalDebug) echo " - Add routes to DB -";
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
@@ -146,7 +146,7 @@ 
 			}
 			if ($globalTransaction) $Connection->db->commit();
 		}
-                return '';
+				return '';
 	}
 	
 	public static function retrieve_route_skyteam($database_file) {
@@ -158,12 +158,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'skyteam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+			if ($globalDebug) echo " - Add routes to DB -";
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -189,7 +189,7 @@ 
 				return "error : ".$e->getMessage();
 			}
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
@@ -198,27 +198,27 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		update_db::connect_sqlite($database_file);
+			update_db::connect_sqlite($database_file);
 		$query = 'select * from Aircraft';
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
 		
@@ -229,17 +229,17 @@ 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 				if ($values['UserString4'] == 'M') $type = 'military';
 				else $type = null;
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
-				    $sth_dest_owner->execute($query_dest_owner_values);
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+					$sth_dest_owner->execute($query_dest_owner_values);
 				}
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
@@ -250,10 +250,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -265,10 +265,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -278,26 +278,26 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-            			while (!feof($fh)) {
-            				$values = array();
-            				$line = $Common->hex2str(fgets($fh,9999));
+						while (!feof($fh)) {
+							$values = array();
+							$line = $Common->hex2str(fgets($fh,9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = substr($line,0,6);
+							$values['Registration'] = trim(substr($line,69,6));
+							$aircraft_name = trim(substr($line,48,6));
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				//if (count($result) > 0) {
-	            				if (isset($result['icao']) && $result['icao'] != '') {
-	            				    $values['ICAOTypeCode'] = $result['icao'];
-	            				} 
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								//if (count($result) > 0) {
+								if (isset($result['icao']) && $result['icao'] != '') {
+									$values['ICAOTypeCode'] = $result['icao'];
+								} 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -320,10 +320,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -334,10 +334,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -348,24 +348,24 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',',"'");
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',',"'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
-            				$values['ModeS'] = $line[1];
-            				$values['Registration'] = $line[3];
-            				$aircraft_name = $line[2];
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = $line[1];
+							$values['Registration'] = $line[3];
+							$aircraft_name = $line[2];
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -388,10 +388,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -402,10 +402,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -416,95 +416,95 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',','"');
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
-            				$values = array();
-            				//print_r($line);
-            				if ($country == 'F') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[4];
-            				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',','"');
+							$values = array();
+							//print_r($line);
+							if ($country == 'F') {
+								$values['registration'] = $line[0];
+								$values['base'] = $line[4];
+								$values['owner'] = $line[5];
+								if ($line[6] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[3];
-            				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = $line[3];
+								$values['owner'] = $line[2];
+								if ($line[1] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+						$values['cancel'] = '';
 					} elseif ($country == 'HB') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'OK') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[3];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[3];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								if ($line[18] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+						$values['cancel'] = '';
 					} elseif ($country == 'VH') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
-
-					    $values['cancel'] = $line[39];
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[12];
+								if ($line[28] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+
+						$values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'CC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[6];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'HJ') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[8];
+								if ($line[7] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'PP') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[6] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[5] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+						$values['cancel'] = '';
 					} elseif ($country == '8Q') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								if ($line[7] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
@@ -626,20 +626,20 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query_dest = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image_thumb`,`image`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
@@ -705,10 +705,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
@@ -718,10 +718,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$i++;
 /*
 		$query = 'DELETE FROM airport WHERE airport_id IN (SELECT * FROM (SELECT min(a.airport_id) FROM airport a GROUP BY a.icao) x)';
@@ -835,7 +835,7 @@ 
 
 
 
-                return "success";
+				return "success";
 	}
 	
 	public static function translation() {
@@ -851,10 +851,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'translation.csv'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -873,21 +873,21 @@ 
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
-                                                //echo substr($operator, 0, 2)."\n";;
-                                                if (count($airline_array) > 0) {
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
+												//echo substr($operator, 0, 2)."\n";;
+												if (count($airline_array) > 0) {
 							//print_r($airline_array);
 							$operator = $airline_array[0]['icao'].substr($operator,2);
-                                                }
-                                        }
+												}
+										}
 					
 					$operator_correct = $data[3];
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
-                                                if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
-                                            	}
-                                        }
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
+												if (count($airline_array) > 0) {
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+												}
+										}
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -901,7 +901,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function translation_fam() {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -911,10 +911,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -943,7 +943,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function modes_faa() {
 		global $tmp_dir, $globalTransaction;
@@ -951,19 +951,19 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_faa'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_faa'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//$aircrafts_icao = array('7102811' => 'P28R',...
@@ -1001,17 +1001,17 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	public static function modes_fam() {
 		global $tmp_dir, $globalTransaction;
 		$query = "DELETE FROM aircraft_modes WHERE Source = '' OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -1040,7 +1040,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
         
 	public static function owner_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -1048,10 +1048,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$delimiter = "\t";
 		$Connection = new Connection();
@@ -1077,7 +1077,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function routes_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -1085,10 +1085,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -1117,7 +1117,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function tle($filename,$tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1128,10 +1128,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $filename));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
@@ -1166,54 +1166,54 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	/**
-        * Convert a HTML table to an array
-        * @param String $data HTML page
-        * @return Array array of the tables in HTML page
-        */
-        private static function table2array($data) {
-                $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
-                {
-                        $td = array();
-                        foreach( $element->find('th') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                        }
-                        $td=array_filter($td);
-                        $tabledata[] = $td;
-
-                        $td = array();
-                        $tdi = array();
-                        foreach( $element->find('td') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                                $tdi [] = trim($row->innertext);
-                        }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
-                    //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
-                }
-                return(array_filter($tabledata));
-        }
-
-       /**
-        * Get data from form result
-        * @param String $url form URL
-        * @return String the result
-        */
-        private static function getData($url) {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
-                return curl_exec($ch);
-        }
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
+		private static function table2array($data) {
+				$html = str_get_html($data);
+				$tabledata=array();
+				foreach($html->find('tr') as $element)
+				{
+						$td = array();
+						foreach( $element->find('th') as $row)
+						{
+								$td [] = trim($row->plaintext);
+						}
+						$td=array_filter($td);
+						$tabledata[] = $td;
+
+						$td = array();
+						$tdi = array();
+						foreach( $element->find('td') as $row)
+						{
+								$td [] = trim($row->plaintext);
+								$tdi [] = trim($row->innertext);
+						}
+						$td=array_filter($td);
+						$tdi=array_filter($tdi);
+					//    $tabledata[]=array_merge($td,$tdi);
+						$tabledata[]=$td;
+				}
+				return(array_filter($tabledata));
+		}
+
+	   /**
+	    * Get data from form result
+	    * @param String $url form URL
+	    * @return String the result
+	    */
+		private static function getData($url) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
+				return curl_exec($ch);
+		}
 /*
 	public static function waypoints() {
 		$data = update_db::getData('http://www.fallingrain.com/world/FR/waypoints.html');
@@ -1296,7 +1296,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1306,10 +1306,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$header = NULL;
 		$delimiter = ':';
@@ -1333,7 +1333,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function update_airspace() {
 		global $tmp_dir, $globalDBdriver;
@@ -1343,11 +1343,11 @@ 
 			$query = 'DROP TABLE airspace';
 			try {
 				$sth = $Connection->db->prepare($query);
-                    		$sth->execute();
-	                } catch(PDOException $e) {
+							$sth->execute();
+					} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
-	                }
-	        }
+					}
+			}
 
 
 		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
@@ -1402,10 +1402,10 @@ 
 			$query = 'DROP TABLE countries';
 			try {
 				$sth = $Connection->db->prepare($query);
-            	        	$sth->execute();
-	                } catch(PDOException $e) {
-    	                	echo "error : ".$e->getMessage();
-	                }
+							$sth->execute();
+					} catch(PDOException $e) {
+							echo "error : ".$e->getMessage();
+					}
 		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
@@ -1865,11 +1865,11 @@ 
 						$query = 'DROP TABLE airspace';
 						try {
 							$sth = $Connection->db->prepare($query);
-    	    	    					$sth->execute();
-			            		} catch(PDOException $e) {
+										$sth->execute();
+								} catch(PDOException $e) {
 							return "error : ".$e->getMessage();
-		            			}
-		    			}
+								}
+						}
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
 					update_db::insert_airspace_version($airspace_md5);
 				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
@@ -1989,12 +1989,12 @@ 
 		echo $data;
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
-		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
-		    //echo $result;
-		    //var_dump(str_get_html($result));
-		    //print_r(self::table2array($result));
+			//var_dump(file_get_html($tmp_dir.'aircrafts.html'));
+			$fh = fopen($tmp_dir.'aircrafts.html',"r");
+			$result = fread($fh,100000000);
+			//echo $result;
+			//var_dump(str_get_html($result));
+			//print_r(self::table2array($result));
 		}
 
 	}
@@ -2008,10 +2008,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
@@ -2067,8 +2067,8 @@ 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
 					$data['permanent'] = 0;
 				} else {
-				    $data['date_end'] = NULL;
-				    $data['permanent'] = 1;
+					$data['date_end'] = NULL;
+					$data['permanent'] = 1;
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
@@ -2127,13 +2127,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_update() {
@@ -2142,10 +2142,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_airspace_version($version) {
@@ -2153,13 +2153,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return true;
+				else return false;
 	}
 
 
@@ -2169,10 +2169,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_notam_update() {
@@ -2185,13 +2185,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_notam_update() {
@@ -2200,10 +2200,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_airspace_update() {
 		global $globalDBdriver;
@@ -2215,13 +2215,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_airspace_update() {
@@ -2230,10 +2230,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_owner_update() {
@@ -2246,13 +2246,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_owner_update() {
@@ -2261,10 +2261,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_schedules_update() {
 		global $globalDBdriver;
@@ -2276,13 +2276,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_schedules_update() {
@@ -2291,10 +2291,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_tle_update() {
 		global $globalDBdriver;
@@ -2306,13 +2306,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_tle_update() {
@@ -2321,10 +2321,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function delete_duplicatemodes() {
 		global $globalDBdriver;
@@ -2336,10 +2336,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function delete_duplicateowner() {
 		global $globalDBdriver;
@@ -2351,10 +2351,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	
 	public static function update_all() {

Spacing +273 added lines, -273 removed lines

@@ -24,20 +24,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	public static function gunzip($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -61,7 +61,7 @@ 
 		try {
 			self::$db_sqlite = new PDO('sqlite:'.$database);
 			self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -76,7 +76,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -87,7 +87,7 @@ 
 		try {
                         $sth = update_db::$db_sqlite->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
@@ -98,11 +98,11 @@ 
 			if ($globalTransaction) $Connection->db->beginTransaction();
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
-				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
+				$query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
             		}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
@@ -118,26 +118,26 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'oneworld'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
     		if ($globalDebug) echo " - Add routes to DB -";
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			if ($globalTransaction) $Connection->db->beginTransaction();
 			while (!feof($fh)) {
-				$line = fgetcsv($fh,9999,',');
+				$line = fgetcsv($fh, 9999, ',');
 				if ($line[0] != '') {
 					if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) {
 						try {
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld');
 							$sth_dest->execute($query_dest_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							if ($globalTransaction) $Connection->db->rollBack(); 
 							return "error : ".$e->getMessage();
 						}
@@ -159,7 +159,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -167,24 +167,24 @@ 
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				while (!feof($fh)) {
-					$line = fgetcsv($fh,9999,',');
+					$line = fgetcsv($fh, 9999, ',');
 					if ($line[0] != '') {
-						$datebe = explode('  -  ',$line[2]);
+						$datebe = explode('  -  ', $line[2]);
 						if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) {
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam');
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam');
 							$sth_dest->execute($query_dest_values);
 						}
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				if ($globalTransaction) $Connection->db->rollBack(); 
 				return "error : ".$e->getMessage();
 			}
@@ -199,7 +199,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -207,7 +207,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -216,7 +216,7 @@ 
 		try {
                         $sth = update_db::$db_sqlite->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -233,15 +233,15 @@ 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 				if ($values['UserString4'] == 'M') $type = 'military';
 				else $type = null;
-				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
+				$query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+				    $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']);
 				    $sth_dest_owner->execute($query_dest_owner_values);
 				}
             		}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 
@@ -251,7 +251,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
@@ -266,11 +266,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
 		
@@ -280,13 +280,13 @@ 
 				if ($globalTransaction) $Connection->db->beginTransaction();
             			while (!feof($fh)) {
             				$values = array();
-            				$line = $Common->hex2str(fgets($fh,9999));
+            				$line = $Common->hex2str(fgets($fh, 9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
+            				$values['ModeS'] = substr($line, 0, 6);
+            				$values['Registration'] = trim(substr($line, 69, 6));
+            				$aircraft_name = trim(substr($line, 48, 6));
             				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
+            				$aircraft_name_split = explode(' ', $aircraft_name);
             				$search_more = '';
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
@@ -298,20 +298,20 @@ 
 	            				if (isset($result['icao']) && $result['icao'] != '') {
 	            				    $values['ICAOTypeCode'] = $result['icao'];
 	            				} 
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file);
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -321,7 +321,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
@@ -335,11 +335,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
 		
@@ -347,9 +347,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-				$tmp = fgetcsv($fh,9999,',',"'");
+				$tmp = fgetcsv($fh, 9999, ',', "'");
             			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+            				$line = fgetcsv($fh, 9999, ',', "'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
@@ -357,7 +357,7 @@ 
             				$values['Registration'] = $line[3];
             				$aircraft_name = $line[2];
             				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
+            				$aircraft_name_split = explode(' ', $aircraft_name);
             				$search_more = '';
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
@@ -366,20 +366,20 @@ 
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
 	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					//if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file);
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -389,13 +389,13 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
 	}
 
-	public static function retrieve_owner($database_file,$country = 'F') {
+	public static function retrieve_owner($database_file, $country = 'F') {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -403,11 +403,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 		
@@ -415,9 +415,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-				$tmp = fgetcsv($fh,9999,',','"');
+				$tmp = fgetcsv($fh, 9999, ',', '"');
             			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
+            				$line = fgetcsv($fh, 9999, ',', '"');
             				$values = array();
             				//print_r($line);
             				if ($country == 'F') {
@@ -425,7 +425,7 @@ 
             				    $values['base'] = $line[4];
             				    $values['owner'] = $line[5];
             				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -433,7 +433,7 @@ 
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
             				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'HB') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -448,7 +448,7 @@ 
             				    $values['base'] = null;
             				    $values['owner'] = $line[5];
             				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -456,7 +456,7 @@ 
             				    $values['base'] = null;
             				    $values['owner'] = $line[12];
             				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28]));
 
 					    $values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -476,28 +476,28 @@ 
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
             				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
             				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
             				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
             				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
             				    $values['registration'] = $line[0];
@@ -507,12 +507,12 @@ 
 					    $values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
+						$query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -627,7 +627,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -637,7 +637,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -648,7 +648,7 @@ 
 		if ($globalTransaction) $Connection->db->beginTransaction();
   
 		$i = 0;
-		while($row = sparql_fetch_array($result))
+		while ($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
@@ -668,31 +668,31 @@ 
 				$row['image'] = '';
 				$row['image_thumb'] = '';
 			} else {
-				$image = str_replace(' ','_',$row['image']);
+				$image = str_replace(' ', '_', $row['image']);
 				$digest = md5($image);
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image;
-				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder;
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image;
-				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image;
+				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image;
+				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder;
 			}
 			
-			$country = explode('-',$row['country']);
+			$country = explode('-', $row['country']);
 			$row['country'] = $country[0];
 			
 			$row['type'] = trim($row['type']);
-			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) {
+			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) {
 				$row['type'] = 'Military';
 			} elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') {
 				$row['type'] = 'small_airport';
 			}
 			
-			$row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city'])));
-			$query_dest_values = array(':airport_id' => $i, ':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => $row['altitude'],':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']);
+			$row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city'])));
+			$query_dest_values = array(':airport_id' => $i, ':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => $row['altitude'], ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']);
 			//print_r($query_dest_values);
 			
 			try {
 				$sth_dest->execute($query_dest_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			}
@@ -706,7 +706,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -714,12 +714,12 @@ 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
-		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
+		$query_values = array(':airport_id' => $i, ':name' => 'Not available', ':iata' => 'NA', ':icao' => 'NA', ':latitude' => '0', ':longitude' => '0', ':altitude' => '0', ':type' => 'NA', ':city' => 'N/A', ':country' => 'N/A', ':home_link' => '', ':wikipedia_link' => '', ':image' => '', ':image_thumb' => '');
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		$i++;
@@ -737,7 +737,7 @@ 
 		echo "Download data from ourairports.com...\n";
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
-		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
+		update_db::download('http://ourairports.com/data/airports.csv', $out_file);
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
 		echo "Add data from ourairports.com...\n";
 
@@ -748,32 +748,32 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
+				if (!$header) $header = $row;
 				else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
 						$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE `icao` = :icao');
 						$sth->execute(array(':icao' => $data['gps_code']));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					if ($sth->fetchColumn() > 0) {
 						$query = 'UPDATE airport SET `type` = :type WHERE icao = :icao';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':icao' => $data['gps_code'],':type' => $data['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $data['gps_code'], ':type' => $data['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					} else {
 						$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`)
 						    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
-						$query_values = array(':airport_id' => $i, ':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => $data['elevation_ft'],':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']);
+						$query_values = array(':airport_id' => $i, ':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => $data['elevation_ft'], ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']);
 						try {
 							$sth = $Connection->db->prepare($query);
 							$sth->execute($query_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						$i++;
@@ -786,7 +786,7 @@ 
 
 		echo "Download data from another free database...\n";
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
-		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
+		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file);
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
 		update_db::unzip($out_file);
 		$header = NULL;
@@ -798,15 +798,15 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
+				if (!$header) $header = $row;
 				else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4]))));
-					} catch(PDOException $e) {
+						$sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4]))));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -820,15 +820,15 @@ 
 		try {
 			$sth = $Connection->db->prepare("SELECT icao FROM airport WHERE `name` LIKE '%Air Base%'");
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$query2 = 'UPDATE airport SET `type` = :type WHERE icao = :icao';
 			try {
 				$sth2 = $Connection->db->prepare($query2);
-				$sth2->execute(array(':icao' => $row['icao'],':type' => 'military'));
-			} catch(PDOException $e) {
+				$sth2->execute(array(':icao' => $row['icao'], ':type' => 'military'));
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -852,7 +852,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -869,7 +869,7 @@ 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
-				if($i > 12) {
+				if ($i > 12) {
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
@@ -877,7 +877,7 @@ 
                                                 //echo substr($operator, 0, 2)."\n";;
                                                 if (count($airline_array) > 0) {
 							//print_r($airline_array);
-							$operator = $airline_array[0]['icao'].substr($operator,2);
+							$operator = $airline_array[0]['icao'].substr($operator, 2);
                                                 }
                                         }
 					
@@ -885,14 +885,14 @@ 
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
                                                 $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
                                                 if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2);
                                             	}
                                         }
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -912,7 +912,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -932,8 +932,8 @@ 
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -956,7 +956,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -965,7 +965,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -981,8 +981,8 @@ 
 					$query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1';
 					try {
 						$sths = $Connection->db->prepare($query_search);
-						$sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa'));
-					} catch(PDOException $e) {
+						$sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa'));
+					} catch (PDOException $e) {
 						return "error s : ".$e->getMessage();
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
@@ -991,8 +991,8 @@ 
 						$queryi = 'UPDATE aircraft SET mfr = :mfr WHERE icao = :icao';
 						try {
 							$sthi = $Connection->db->prepare($queryi);
-							$sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode']));
-						} catch(PDOException $e) {
+							$sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode']));
+						} catch (PDOException $e) {
 							return "error u : ".$e->getMessage();
 						}
 					} else {
@@ -1000,7 +1000,7 @@ 
 						try {
 							$sthsm = $Connection->db->prepare($query_search_mfr);
 							$sthsm->execute(array(':mfr' => $data[2]));
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error mfr : ".$e->getMessage();
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
@@ -1010,8 +1010,8 @@ 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
-								$sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa'));
-							} catch(PDOException $e) {
+								$sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa'));
+							} catch (PDOException $e) {
 								return "error f : ".$e->getMessage();
 							}
 						}
@@ -1021,13 +1021,13 @@ 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa'));
-						} catch(PDOException $e) {
+							$sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa'));
+						} catch (PDOException $e) {
 							return "error i : ".$e->getMessage();
 						}
 					}
 				}
-				if ($i % 90 == 0) {
+				if ($i%90 == 0) {
 					if ($globalTransaction) $Connection->db->commit();
 					if ($globalTransaction) $Connection->db->beginTransaction();
 				}
@@ -1045,7 +1045,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1065,8 +1065,8 @@ 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1085,7 +1085,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1101,8 +1101,8 @@ 
 					$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						print_r($data);
 						return "error : ".$e->getMessage();
 					}
@@ -1122,7 +1122,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1142,8 +1142,8 @@ 
 					$query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1155,7 +1155,7 @@ 
 		return '';
         }
 
-	public static function tle($filename,$tletype) {
+	public static function tle($filename, $tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;
 		//$Spotter = new Spotter();
@@ -1165,7 +1165,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
@@ -1190,8 +1190,8 @@ 
 					$query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 
@@ -1211,28 +1211,28 @@ 
         */
         private static function table2array($data) {
                 $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
+                $tabledata = array();
+                foreach ($html->find('tr') as $element)
                 {
                         $td = array();
-                        foreach( $element->find('th') as $row)
+                        foreach ($element->find('th') as $row)
                         {
                                 $td [] = trim($row->plaintext);
                         }
-                        $td=array_filter($td);
+                        $td = array_filter($td);
                         $tabledata[] = $td;
 
                         $td = array();
                         $tdi = array();
-                        foreach( $element->find('td') as $row)
+                        foreach ($element->find('td') as $row)
                         {
                                 $td [] = trim($row->plaintext);
                                 $tdi [] = trim($row->innertext);
                         }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
+                        $td = array_filter($td);
+                        $tdi = array_filter($tdi);
                     //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
+                        $tabledata[] = $td;
                 }
                 return(array_filter($tabledata));
         }
@@ -1305,13 +1305,13 @@ 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
-				if($i > 3 && count($row) > 2) {
+				if ($i > 3 && count($row) > 2) {
 					$data = array_values(array_filter($row));
 					$cntdata = count($data);
 					if ($cntdata > 10) {
 						$value = $data[9];
 						
-						for ($i =10;$i < $cntdata;$i++) {
+						for ($i = 10; $i < $cntdata; $i++) {
 							$value .= ' '.$data[$i];
 						}
 						$data[9] = $value;
@@ -1321,8 +1321,8 @@ 
 						$query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
-						} catch(PDOException $e) {
+							$sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					}
@@ -1343,7 +1343,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1355,12 +1355,12 @@ 
 			if ($globalTransaction) $Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(count($row) > 1) {
+				if (count($row) > 1) {
 					$query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')";
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $row[1],':icao' => $row[0]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $row[1], ':icao' => $row[0]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1380,21 +1380,21 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
                     		$sth->execute();
-	                } catch(PDOException $e) {
+	                } catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 	                }
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql');
 		else {
-			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
+			update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql');
 			$query = "CREATE EXTENSION postgis";
-			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
+			$Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']);
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -1407,7 +1407,7 @@ 
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
 		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
+		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
 			if ($globalDebug) echo "Gunzip...";
@@ -1439,14 +1439,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
             	        	$sth->execute();
-	                } catch(PDOException $e) {
+	                } catch (PDOException $e) {
     	                	echo "error : ".$e->getMessage();
 	                }
 		}
 		if ($globalDBdriver == 'mysql') {
-			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
+			update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql');
 		} else {
-			update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql');
+			update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql');
 		}
 		$error = create_db::import_file($tmp_dir.'countries.sql');
 		return $error;
@@ -1459,7 +1459,7 @@ 
 //		update_db::unzip($tmp_dir.'AptNav.zip');
 //		update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz');
 //		update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
-		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
+		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net');
 		update_db::gunzip($tmp_dir.'awy.dat.gz');
 		$error = update_db::waypoints($tmp_dir.'awy.dat');
 		return $error;
@@ -1479,7 +1479,7 @@ 
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
 			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
+				if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
 			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
 		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
 		if ($error != '') {
@@ -1492,7 +1492,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Routes : Download...";
-		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
+		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz');
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
@@ -1508,7 +1508,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
-		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
+		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
@@ -1524,7 +1524,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
-		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
+		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
@@ -1552,7 +1552,7 @@ 
 */
 		if ($globalDebug) echo "Modes : Download...";
 //		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
-		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
+		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
@@ -1572,7 +1572,7 @@ 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes FAA: Download...";
-		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
+		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
 			if ($globalDebug) echo "Unzip...";
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
@@ -1588,7 +1588,7 @@ 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes Flarmnet: Download...";
-		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
+		update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln');
 		if (file_exists($tmp_dir.'data.fln')) {
 			if ($globalDebug) echo "Add to DB...";
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
@@ -1602,7 +1602,7 @@ 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes OGN: Download...";
-		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
+		update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv');
 		if (file_exists($tmp_dir.'ogn.csv')) {
 			if ($globalDebug) echo "Add to DB...";
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
@@ -1617,173 +1617,173 @@ 
 		global $tmp_dir, $globalDebug;
 		
 		if ($globalDebug) echo "Owner France: Download...";
-		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
+		update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F');
 		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		
 		if ($globalDebug) echo "Owner Ireland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
+		update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI');
 		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Switzerland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
+		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB');
 		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Czech Republic: Download...";
-		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
+		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK');
 		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Australia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
+		update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH');
 		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Austria: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
+		update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE');
 		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Chile: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
+		update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC');
 		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Colombia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
+		update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ');
 		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
-		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
+		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7');
 		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Brazil: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
+		update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP');
 		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Cayman Islands: Download...";
-		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
+		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP');
 		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Croatia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
+		update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A');
 		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Luxembourg: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
+		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX');
 		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Maldives: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
+		update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q');
 		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner New Zealand: Download...";
-		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
+		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK');
 		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
-		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
+		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2');
 		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Slovakia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
+		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM');
 		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Ecuador: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
+		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC');
 		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Iceland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
+		update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF');
 		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -1795,7 +1795,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Translation : Download...";
-		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
+		update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip');
 		if (file_exists($tmp_dir.'translation.zip')) {
 			if ($globalDebug) echo "Unzip...";
 			update_db::unzip($tmp_dir.'translation.zip');
@@ -1811,7 +1811,7 @@ 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
+		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz');
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
@@ -1826,7 +1826,7 @@ 
 	public static function update_ModeS_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
+		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz');
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
@@ -1842,9 +1842,9 @@ 
 		global $tmp_dir, $globalDebug, $globalOwner;
 		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
 		if ($globalOwner === TRUE) {
-			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz');
 		} else {
-			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz');
 		}
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
@@ -1860,7 +1860,7 @@ 
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
+		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz');
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
@@ -1879,18 +1879,18 @@ 
 		$error = '';
 		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
 		if ($globalDBdriver == 'mysql') {
-			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		}
 		if (file_exists($tmp_dir.'airspace.sql.gz.md5')) {
-			$airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
+			$airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
 			$airspace_md5 = $airspace_md5_file[0];
 			if (!update_db::check_airspace_version($airspace_md5)) {
 				if ($globalDBdriver == 'mysql') {
-					update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				} else {
-					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if ($globalDebug) echo "Gunzip...";
@@ -1902,7 +1902,7 @@ 
 						try {
 							$sth = $Connection->db->prepare($query);
     	    	    					$sth->execute();
-			            		} catch(PDOException $e) {
+			            		} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 		            			}
 		    			}
@@ -1920,15 +1920,15 @@ 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download TLE : Download...";
-		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
-		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
-		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
+		$alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt',
+		'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt',
+		'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt');
 		foreach ($alltle as $filename) {
 			if ($globalDebug) echo "downloading ".$filename.'...';
-			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
+			update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
 				if ($globalDebug) echo "Add to DB ".$filename."...";
-				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
+				$error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename));
 			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
 			if ($error != '') {
 				echo $error."\n";
@@ -1941,32 +1941,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
+		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
+				update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
+			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -1978,32 +1978,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
+		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
+				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
+			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2026,8 +2026,8 @@ 
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
 		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
+		    $fh = fopen($tmp_dir.'aircrafts.html', "r");
+		    $result = fread($fh, 100000000);
 		    //echo $result;
 		    //var_dump(str_get_html($result));
 		    //print_r(self::table2array($result));
@@ -2045,23 +2045,23 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
-		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
+		update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss');
 		if (file_exists($tmp_dir.'notam.rss')) {
-			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
+			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true);
 			foreach ($notams['channel']['item'] as $notam) {
-				$title = explode(':',$notam['title']);
+				$title = explode(':', $notam['title']);
 				$data['ref'] = trim($title[0]);
 				unset($title[0]);
-				$data['title'] = trim(implode(':',$title));
-				$description = strip_tags($notam['description'],'<pre>');
-				preg_match(':^(.*?)<pre>:',$description,$match);
-				$q = explode('/',$match[1]);
+				$data['title'] = trim(implode(':', $title));
+				$description = strip_tags($notam['description'], '<pre>');
+				preg_match(':^(.*?)<pre>:', $description, $match);
+				$q = explode('/', $match[1]);
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
@@ -2077,30 +2077,30 @@ 
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
 				$latlonrad = $q[7];
-				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
-				$latitude = $Common->convertDec($las,'latitude');
-				$longitude = $Common->convertDec($lns,'longitude');
+				sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius);
+				$latitude = $Common->convertDec($las, 'latitude');
+				$longitude = $Common->convertDec($lns, 'longitude');
 				if ($lac == 'S') $latitude = '-'.$latitude;
 				if ($lnc == 'W') $longitude = '-'.$longitude;
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
 				
-				preg_match(':<pre>(.*?)</pre>:',$description,$match);
+				preg_match(':<pre>(.*?)</pre>:', $description, $match);
 				$data['text'] = $match[1];
-				preg_match(':</pre>(.*?)$:',$description,$match);
+				preg_match(':</pre>(.*?)$:', $description, $match);
 				$fromto = $match[1];
-				preg_match('#FROM:(.*?)TO:#',$fromto,$match);
+				preg_match('#FROM:(.*?)TO:#', $fromto, $match);
 				$fromall = trim($match[1]);
-				preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match);
+				preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match);
 				$from = trim($match[1]);
-				$data['date_begin'] = date("Y-m-d H:i:s",strtotime($from));
-				preg_match('#TO:(.*?)$#',$fromto,$match);
+				$data['date_begin'] = date("Y-m-d H:i:s", strtotime($from));
+				preg_match('#TO:(.*?)$#', $fromto, $match);
 				$toall = trim($match[1]);
-				if (!preg_match(':Permanent:',$toall)) {
-					preg_match('#^(.*?) \((.*?)\)#',$toall,$match);
+				if (!preg_match(':Permanent:', $toall)) {
+					preg_match('#^(.*?) \((.*?)\)#', $toall, $match);
 					$to = trim($match[1]);
-					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
+					$data['date_end'] = date("Y-m-d H:i:s", strtotime($to));
 					$data['permanent'] = 0;
 				} else {
 				    $data['date_end'] = NULL;
@@ -2108,7 +2108,7 @@ 
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
-				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				$NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 				unset($data);
 			} 
 		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
@@ -2131,16 +2131,16 @@ 
 				$Connection = new Connection();
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 		$Common = new Common();
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
-		$airspace_json = json_decode($airspace_lst,true);
+		$airspace_json = json_decode($airspace_lst, true);
 		foreach ($airspace_json['records'] as $airspace) {
 			if ($globalDebug) echo $airspace['name']."...\n";
-			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
+			update_db::download($airspace['uri'], $tmp_dir.$airspace['name']);
 			if (file_exists($tmp_dir.$airspace['name'])) {
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 				//system('recode l9..utf8 '.$tmp_dir.$airspace['name']);
@@ -2164,7 +2164,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2179,7 +2179,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2190,7 +2190,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2206,7 +2206,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2222,7 +2222,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2237,7 +2237,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2252,7 +2252,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2267,7 +2267,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2283,7 +2283,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2298,7 +2298,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2313,7 +2313,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2328,7 +2328,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2343,7 +2343,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2358,7 +2358,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2373,7 +2373,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2388,7 +2388,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}

Braces +828 added lines, -287 removed lines

@@ -16,7 +16,9 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
@@ -27,12 +29,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -53,8 +59,12 @@ 
 			if ($res === TRUE) {
 				$zip->extractTo($path);
 				$zip->close();
-			} else return false;
-		} else return false;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 	
 	public static function connect_sqlite($database) {
@@ -69,7 +79,9 @@ 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -80,7 +92,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
     		update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
@@ -95,15 +109,21 @@ 
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack(); 
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			return "error : ".$e->getMessage();
 		}
                 return '';
@@ -111,7 +131,9 @@ 
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -122,14 +144,18 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (!feof($fh)) {
 				$line = fgetcsv($fh,9999,',');
 				if ($line[0] != '') {
@@ -138,13 +164,17 @@ 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
 							$sth_dest->execute($query_dest_values);
 						} catch(PDOException $e) {
-							if ($globalTransaction) $Connection->db->rollBack(); 
+							if ($globalTransaction) {
+								$Connection->db->rollBack();
+							}
 							return "error : ".$e->getMessage();
 						}
 					}
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
                 return '';
 	}
@@ -152,7 +182,9 @@ 
 	public static function retrieve_route_skyteam($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -163,7 +195,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -172,7 +206,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				while (!feof($fh)) {
 					$line = fgetcsv($fh,9999,',');
 					if ($line[0] != '') {
@@ -183,9 +219,13 @@ 
 						}
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
-				if ($globalTransaction) $Connection->db->rollBack(); 
+				if ($globalTransaction) {
+					$Connection->db->rollBack();
+				}
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -228,11 +268,16 @@ 
 		$sth_dest = $Connection->db->prepare($query_dest);
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-				if ($values['UserString4'] == 'M') $type = 'military';
-				else $type = null;
+				if ($values['UserString4'] == 'M') {
+					$type = 'military';
+				} else {
+					$type = null;
+				}
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -240,7 +285,9 @@ 
 				    $sth_dest_owner->execute($query_dest_owner_values);
 				}
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
@@ -277,7 +324,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
             			while (!feof($fh)) {
             				$values = array();
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -288,7 +337,9 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
@@ -301,7 +352,9 @@ 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
+					if (!isset($values['ICAOTypeCode'])) {
+						$values['ICAOTypeCode'] = 'GLID';
+					}
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
@@ -310,7 +363,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -346,7 +401,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',',"'");
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',',"'");
@@ -359,13 +416,17 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+	            				if (isset($result['icao']) && $result['icao'] != '') {
+	            					$values['ICAOTypeCode'] = $result['icao'];
+	            				}
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -378,7 +439,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -414,7 +477,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',','"');
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',','"');
@@ -424,16 +489,22 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[4];
             				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+            				    if ($line[1] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'HB') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -447,16 +518,22 @@ 
             				    $values['registration'] = $line[3];
             				    $values['base'] = null;
             				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+            				    if ($line[18] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+            				    if ($line[28] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+					    }
 
 					    $values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -475,29 +552,41 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+            				    if ($line[5] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
             				    $values['registration'] = $line[0];
@@ -511,7 +600,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -645,25 +736,45 @@ 
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
   
 		$i = 0;
 		while($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
-			if (!isset($row['iata'])) $row['iata'] = '';
-			if (!isset($row['icao'])) $row['icao'] = '';
-			if (!isset($row['type'])) $row['type'] = '';
-			if (!isset($row['altitude'])) $row['altitude'] = '';
+			if (!isset($row['iata'])) {
+				$row['iata'] = '';
+			}
+			if (!isset($row['icao'])) {
+				$row['icao'] = '';
+			}
+			if (!isset($row['type'])) {
+				$row['type'] = '';
+			}
+			if (!isset($row['altitude'])) {
+				$row['altitude'] = '';
+			}
 			if (isset($row['city_bis'])) {
 				$row['city'] = $row['city_bis'];
 			}
-			if (!isset($row['city'])) $row['city'] = '';
-			if (!isset($row['country'])) $row['country'] = '';
-			if (!isset($row['homepage'])) $row['homepage'] = '';
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
-			if (!isset($row['name'])) continue;
+			if (!isset($row['city'])) {
+				$row['city'] = '';
+			}
+			if (!isset($row['country'])) {
+				$row['country'] = '';
+			}
+			if (!isset($row['homepage'])) {
+				$row['homepage'] = '';
+			}
+			if (!isset($row['wikipedia_page'])) {
+				$row['wikipedia_page'] = '';
+			}
+			if (!isset($row['name'])) {
+				continue;
+			}
 			if (!isset($row['image'])) {
 				$row['image'] = '';
 				$row['image_thumb'] = '';
@@ -699,7 +810,9 @@ 
 
 			$i++;
 		}
-		if ($globalTransaction) $Connection->db->commit();
+		if ($globalTransaction) {
+			$Connection->db->commit();
+		}
 		echo "Delete duplicate rows...\n";
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
 		try {
@@ -711,7 +824,9 @@ 
                 }
 
 
-		if ($globalDebug) echo "Insert Not available Airport...\n";
+		if ($globalDebug) {
+			echo "Insert Not available Airport...\n";
+		}
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
 		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
@@ -738,7 +853,9 @@ 
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		echo "Add data from ourairports.com...\n";
 
 		$header = NULL;
@@ -748,8 +865,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
@@ -787,7 +905,9 @@ 
 		echo "Download data from another free database...\n";
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		update_db::unzip($out_file);
 		$header = NULL;
 		echo "Add data from another free database...\n";
@@ -798,8 +918,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
@@ -974,7 +1095,9 @@ 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -987,7 +1110,9 @@ 
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
 					if (!empty($result_search)) {
-						if ($globalDebug) echo '.';
+						if ($globalDebug) {
+							echo '.';
+						}
 						$queryi = 'UPDATE aircraft SET mfr = :mfr WHERE icao = :icao';
 						try {
 							$sthi = $Connection->db->prepare($queryi);
@@ -1005,8 +1130,12 @@ 
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
 						if (!empty($result_search_mfr)) {
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
+								$data[16] = $data[23];
+							}
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
+								$data[16] = $data[15];
+							}
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
@@ -1017,7 +1146,9 @@ 
 						}
 					}
 					if (strtotime($data[29]) > time()) {
-						if ($globalDebug) echo 'i';
+						if ($globalDebug) {
+							echo 'i';
+						}
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
@@ -1028,13 +1159,19 @@ 
 					}
 				}
 				if ($i % 90 == 0) {
-					if ($globalTransaction) $Connection->db->commit();
-					if ($globalTransaction) $Connection->db->beginTransaction();
+					if ($globalTransaction) {
+						$Connection->db->commit();
+					}
+					if ($globalTransaction) {
+						$Connection->db->beginTransaction();
+					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1058,7 +1195,9 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1073,7 +1212,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1094,7 +1235,9 @@ 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1110,7 +1253,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1135,7 +1280,9 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1150,7 +1297,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1301,7 +1450,9 @@ 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
@@ -1329,7 +1480,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1352,7 +1505,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if(count($row) > 1) {
@@ -1366,7 +1521,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1386,8 +1543,9 @@ 
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
-		else {
+		if ($globalDBdriver == 'mysql') {
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		} else {
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
 			$query = "CREATE EXTENSION postgis";
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1406,20 +1564,30 @@ 
 		global $tmp_dir, $globalDebug;
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "NOTAM from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'notam.txt.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			//$error = create_db::import_file($tmp_dir.'notam.sql');
 			$NOTAM = new NOTAM();
 			$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
-		} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -1473,67 +1641,111 @@ 
 		//if ($globalDebug) echo "IVAO : Download...";
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
 		if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'ivae_feb2013.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
-			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
+			if ($globalDebug) {
+				echo "Copy airlines logos to airlines images directory...";
+			}
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
-			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
-		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
+				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
+					$error = "Failed to copy airlines logo.";
+				}
+			} else {
+				$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_routes() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Routes : Download...";
+		if ($globalDebug) {
+			echo "Routes : Download...";
+		}
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_oneworld() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
+		if ($globalDebug) {
+			echo "Schedules Oneworld : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_skyteam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
+		if ($globalDebug) {
+			echo "Schedules Skyteam : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS() {
@@ -1550,326 +1762,564 @@ 
 			exit;
 		} elseif ($globalDebug) echo "Done\n";
 */
-		if ($globalDebug) echo "Modes : Download...";
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
+		if ($globalDebug) {
+			echo "Modes : Download...";
+		}
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
 		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
-			if ($globalDebug) echo "Unzip...";
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes FAA: Download...";
+		if ($globalDebug) {
+			echo "Modes FAA: Download...";
+		}
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::modes_faa();
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
+		if ($globalDebug) {
+			echo "Modes Flarmnet: Download...";
+		}
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
 		if (file_exists($tmp_dir.'data.fln')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes OGN: Download...";
+		if ($globalDebug) {
+			echo "Modes OGN: Download...";
+		}
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
 		if (file_exists($tmp_dir.'ogn.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_owner() {
 		global $tmp_dir, $globalDebug;
 		
-		if ($globalDebug) echo "Owner France: Download...";
+		if ($globalDebug) {
+			echo "Owner France: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		
-		if ($globalDebug) echo "Owner Ireland: Download...";
+		if ($globalDebug) {
+			echo "Owner Ireland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Switzerland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Switzerland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Czech Republic: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Australia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Australia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Austria: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Austria: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Chile: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Chile: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Colombia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Colombia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Bosnia Herzegobina: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Brazil: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Brazil: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Cayman Islands: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Croatia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Croatia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Luxembourg: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Maldives: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Maldives: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner New Zealand: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner New Zealand: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Papua New Guinea: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Slovakia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Slovakia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Ecuador: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Ecuador: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Iceland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Iceland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation : Download...";
+		if ($globalDebug) {
+			echo "Translation : Download...";
+		}
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
 		if (file_exists($tmp_dir.'translation.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'translation.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::translation();
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Translation from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::translation_fam();
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "ModeS from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::modes_fam();
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_owner_fam() {
 		global $tmp_dir, $globalDebug, $globalOwner;
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "owner from FlightAirMap website : Download...";
+		}
 		if ($globalOwner === TRUE) {
 			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
 		} else {
 			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
 		}
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'owners.tsv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::owner_fam();
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Routes from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::routes_fam();
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -1877,7 +2327,9 @@ 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
 		include_once('class.create_db.php');
 		$error = '';
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airspace from FlightAirMap website : Download...";
+		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
 		} else {
@@ -1893,9 +2345,13 @@ 
 					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
-					if ($globalDebug) echo "Gunzip...";
+					if ($globalDebug) {
+						echo "Gunzip...";
+					}
 					update_db::gunzip($tmp_dir.'airspace.sql.gz');
-					if ($globalDebug) echo "Add to DB...";
+					if ($globalDebug) {
+						echo "Add to DB...";
+					}
 					$Connection = new Connection();
 					if ($Connection->tableExists('airspace')) {
 						$query = 'DROP TABLE airspace';
@@ -1908,31 +2364,47 @@ 
 		    			}
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
 					update_db::insert_airspace_version($airspace_md5);
-				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
+				} else {
+					$error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download TLE : Download...";
+		if ($globalDebug) {
+			echo "Download TLE : Download...";
+		}
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
 		foreach ($alltle as $filename) {
-			if ($globalDebug) echo "downloading ".$filename.'...';
+			if ($globalDebug) {
+				echo "downloading ".$filename.'...';
+			}
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
-				if ($globalDebug) echo "Add to DB ".$filename."...";
+				if ($globalDebug) {
+					echo "Add to DB ".$filename."...";
+				}
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				echo $error."\n";
-			} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
@@ -1940,10 +2412,14 @@ 
 	public static function update_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -1962,25 +2438,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_space_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Space models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -1999,15 +2485,21 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading space model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2050,7 +2542,9 @@ 
                 }
 
 		$error = '';
-		if ($globalDebug) echo "Notam : Download...";
+		if ($globalDebug) {
+			echo "Notam : Download...";
+		}
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
 		if (file_exists($tmp_dir.'notam.rss')) {
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2065,14 +2559,30 @@ 
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
+				if ($ifrvfr == 'IV') {
+					$data['rules'] = 'IFR/VFR';
+				}
+				if ($ifrvfr == 'I') {
+					$data['rules'] = 'IFR';
+				}
+				if ($ifrvfr == 'V') {
+					$data['rules'] = 'VFR';
+				}
+				if ($q[4] == 'A') {
+					$data['scope'] = 'Airport warning';
+				}
+				if ($q[4] == 'E') {
+					$data['scope'] = 'Enroute warning';
+				}
+				if ($q[4] == 'W') {
+					$data['scope'] = 'Navigation warning';
+				}
+				if ($q[4] == 'AE') {
+					$data['scope'] = 'Airport/Enroute warning';
+				}
+				if ($q[4] == 'AW') {
+					$data['scope'] = 'Airport/Navigation warning';
+				}
 				//$data['scope'] = $q[4];
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
@@ -2080,8 +2590,12 @@ 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
 				$latitude = $Common->convertDec($las,'latitude');
 				$longitude = $Common->convertDec($lns,'longitude');
-				if ($lac == 'S') $latitude = '-'.$latitude;
-				if ($lnc == 'W') $longitude = '-'.$longitude;
+				if ($lac == 'S') {
+					$latitude = '-'.$latitude;
+				}
+				if ($lnc == 'W') {
+					$longitude = '-'.$longitude;
+				}
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
@@ -2111,10 +2625,14 @@ 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
 				unset($data);
 			} 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	
@@ -2139,7 +2657,9 @@ 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
 		$airspace_json = json_decode($airspace_lst,true);
 		foreach ($airspace_json['records'] as $airspace) {
-			if ($globalDebug) echo $airspace['name']."...\n";
+			if ($globalDebug) {
+				echo $airspace['name']."...\n";
+			}
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
 			if (file_exists($tmp_dir.$airspace['name'])) {
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -2168,8 +2688,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_update() {
@@ -2194,8 +2717,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 
@@ -2226,8 +2752,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_notam_update() {
@@ -2256,8 +2785,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_airspace_update() {
@@ -2287,8 +2819,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_owner_update() {
@@ -2317,8 +2852,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_schedules_update() {
@@ -2347,8 +2885,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_tle_update() {

require/libs/Predict/Predict.php

Doc Comments +3 added lines, -17 removed lines

@@ -146,20 +146,6 @@ 
 
     /** Predict first pass after a certain time.
      *
-     *  @param Predict_Sat $sat   The satellite data.
-     *  @param Predict_QTH $qth   The observer's location data.
-     *  @param float       $start Starting time.
-     *  @param int         $maxdt The maximum number of days to look ahead (0 for no limit).
-     *
-     *  @return Predict_Pass or NULL if there was an error.
-     *
-     * This function will find the first upcoming pass with AOS no earlier than
-     * t = start and no later than t = (start+maxdt).
-     *
-     *  note For no time limit use maxdt = 0.0
-     *
-     *  note the data in sat will be corrupt (future) and must be refreshed
-     *       by the caller, if the caller will need it later on
      */
     public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
     {
@@ -407,7 +393,7 @@ 
      *  @param Predict_QTH $qth   The observer's location (QTH) data.
      *  @param float       $start The julian date where calculation should start.
      *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The julain date of the next AOS or 0.0 if the satellite has no AOS.
+     *  @return double julain date of the next AOS or 0.0 if the satellite has no AOS.
      *
      * This function finds the time of AOS for the first coming pass taking place
      * no earlier that start.
@@ -563,7 +549,7 @@ 
      *  @param Predict_QTH $qth The QTH observer location data.
      *  @param float       $start The time where calculation should start. (Julian Date)
      *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
+     *  @return double time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
      *
      * This function finds the time of LOS for the first coming pass taking place
      * no earlier that start.
@@ -648,7 +634,7 @@ 
      *  @param Predict_Sat $sat   The satellite to find AOS for.
      *  @param Predict_QTH $qth   The ground station.
      *  @param float       $start Start time, prefereably now.
-     *  @return The time of the previous AOS or 0.0 if the satellite has no AOS.
+     *  @return double time of the previous AOS or 0.0 if the satellite has no AOS.
      *
      * This function can be used to find the AOS time in the past of the
      * current pass.

Indentation +791 added lines, -791 removed lines

@@ -52,824 +52,824 @@
  */
 class Predict
 {
-    const de2ra    =  1.74532925E-2;   /* Degrees to Radians */
-    const pi       =  3.1415926535898; /* Pi */
-    const pio2     =  1.5707963267949; /* Pi/2 */
-    const x3pio2   =  4.71238898;      /* 3*Pi/2 */
-    const twopi    =  6.2831853071796; /* 2*Pi  */
-    const e6a      =  1.0E-6;
-    const tothrd   =  6.6666667E-1;    /* 2/3 */
-    const xj2      =  1.0826158E-3;    /* J2 Harmonic */
-    const xj3      = -2.53881E-6;      /* J3 Harmonic */
-    const xj4      = -1.65597E-6;      /* J4 Harmonic */
-    const xke      =  7.43669161E-2;
-    const xkmper   =  6.378135E3;      /* Earth radius km */
-    const xmnpda   =  1.44E3;          /* Minutes per day */
-    const km2mi    =  0.621371;        /* Kilometers per Mile */
-    const ae       =  1.0;
-    const ck2      =  5.413079E-4;
-    const ck4      =  6.209887E-7;
-    const __f      =  3.352779E-3;
-    const ge       =  3.986008E5;
-    const __s__    =  1.012229;
-    const qoms2t   =  1.880279E-09;
-    const secday   =  8.6400E4;        /* Seconds per day */
-    const omega_E  =  1.0027379;
-    const omega_ER =  6.3003879;
-    const zns      =  1.19459E-5;
-    const c1ss     =  2.9864797E-6;
-    const zes      =  1.675E-2;
-    const znl      =  1.5835218E-4;
-    const c1l      =  4.7968065E-7;
-    const zel      =  5.490E-2;
-    const zcosis   =  9.1744867E-1;
-    const zsinis   =  3.9785416E-1;
-    const zsings   = -9.8088458E-1;
-    const zcosgs   =  1.945905E-1;
-    const zcoshs   =  1;
-    const zsinhs   =  0;
-    const q22      =  1.7891679E-6;
-    const q31      =  2.1460748E-6;
-    const q33      =  2.2123015E-7;
-    const g22      =  5.7686396;
-    const g32      =  9.5240898E-1;
-    const g44      =  1.8014998;
-    const g52      =  1.0508330;
-    const g54      =  4.4108898;
-    const root22   =  1.7891679E-6;
-    const root32   =  3.7393792E-7;
-    const root44   =  7.3636953E-9;
-    const root52   =  1.1428639E-7;
-    const root54   =  2.1765803E-9;
-    const thdt     =  4.3752691E-3;
-    const rho      =  1.5696615E-1;
-    const mfactor  =  7.292115E-5;
-    const __sr__   =  6.96000E5;      /*Solar radius - kilometers (IAU 76)*/
-    const AU       =  1.49597870E8;   /*Astronomical unit - kilometers (IAU 76)*/
-
-    /* visibility constants */
-    const SAT_VIS_NONE     = 0;
-    const SAT_VIS_VISIBLE  = 1;
-    const SAT_VIS_DAYLIGHT = 2;
-    const SAT_VIS_ECLIPSED = 3;
-
-    /* preferences */
-    public $minEle     = 10; // Minimum elevation
-    public $timeRes    = 10; // Pass details: time resolution
-    public $numEntries = 20; // Pass details: number of entries
-    public $threshold  = -6; // Twilight threshold
-
-    /**
-     *  Predict the next pass.
-     *
-     * This function simply wraps the get_pass function using the current time
-     * as parameter.
-     *
-     * Note: the data in sat will be corrupt (future) and must be refreshed
-     *       by the caller, if the caller will need it later on (eg. if the caller
-     *       is GtkSatList).
-     *
-     * @param Predict_Sat $sat   The satellite data.
-     * @param Predict_QTH $qth   The observer data.
-     * @param int         $maxdt The maximum number of days to look ahead.
-     *
-     * @return Predict_Pass Pointer instance or NULL if no pass can be
-     *         found.
-     */
-    public function get_next_pass(Predict_Sat $sat, Predict_QTH $qth, $maxdt)
-    {
-        /* get the current time and call the get_pass function */
-        $now = Predict_Time::get_current_daynum();
-
-        return $this->get_pass($sat, $qth, $now, $maxdt);
-    }
-
-    /** Predict first pass after a certain time.
-     *
-     *  @param Predict_Sat $sat   The satellite data.
-     *  @param Predict_QTH $qth   The observer's location data.
-     *  @param float       $start Starting time.
-     *  @param int         $maxdt The maximum number of days to look ahead (0 for no limit).
-     *
-     *  @return Predict_Pass or NULL if there was an error.
-     *
-     * This function will find the first upcoming pass with AOS no earlier than
-     * t = start and no later than t = (start+maxdt).
-     *
-     *  note For no time limit use maxdt = 0.0
-     *
-     *  note the data in sat will be corrupt (future) and must be refreshed
-     *       by the caller, if the caller will need it later on
-     */
-    public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
-    {
-        $aos = 0.0;    /* time of AOS */
-        $tca = 0.0;    /* time of TCA */
-        $los = 0.0;    /* time of LOS */
-        $dt = 0.0;     /* time diff */
-        $step = 0.0;   /* time step */
-        $t0 = $start;
-        $tres = 0.0;   /* required time resolution */
-        $max_el = 0.0; /* maximum elevation */
-        $pass = null;
-        $detail = null;
-        $done = false;
-        $iter = 0;      /* number of iterations */
-        /* FIXME: watchdog */
-
-        /*copy sat_in to a working structure*/
-        $sat         = clone $sat_in;
-        $sat_working = clone $sat_in;
-
-        /* get time resolution; sat-cfg stores it in seconds */
-        $tres = $this->timeRes / 86400.0;
-
-        /* loop until we find a pass with elevation > SAT_CFG_INT_PRED_MIN_EL
+	const de2ra    =  1.74532925E-2;   /* Degrees to Radians */
+	const pi       =  3.1415926535898; /* Pi */
+	const pio2     =  1.5707963267949; /* Pi/2 */
+	const x3pio2   =  4.71238898;      /* 3*Pi/2 */
+	const twopi    =  6.2831853071796; /* 2*Pi  */
+	const e6a      =  1.0E-6;
+	const tothrd   =  6.6666667E-1;    /* 2/3 */
+	const xj2      =  1.0826158E-3;    /* J2 Harmonic */
+	const xj3      = -2.53881E-6;      /* J3 Harmonic */
+	const xj4      = -1.65597E-6;      /* J4 Harmonic */
+	const xke      =  7.43669161E-2;
+	const xkmper   =  6.378135E3;      /* Earth radius km */
+	const xmnpda   =  1.44E3;          /* Minutes per day */
+	const km2mi    =  0.621371;        /* Kilometers per Mile */
+	const ae       =  1.0;
+	const ck2      =  5.413079E-4;
+	const ck4      =  6.209887E-7;
+	const __f      =  3.352779E-3;
+	const ge       =  3.986008E5;
+	const __s__    =  1.012229;
+	const qoms2t   =  1.880279E-09;
+	const secday   =  8.6400E4;        /* Seconds per day */
+	const omega_E  =  1.0027379;
+	const omega_ER =  6.3003879;
+	const zns      =  1.19459E-5;
+	const c1ss     =  2.9864797E-6;
+	const zes      =  1.675E-2;
+	const znl      =  1.5835218E-4;
+	const c1l      =  4.7968065E-7;
+	const zel      =  5.490E-2;
+	const zcosis   =  9.1744867E-1;
+	const zsinis   =  3.9785416E-1;
+	const zsings   = -9.8088458E-1;
+	const zcosgs   =  1.945905E-1;
+	const zcoshs   =  1;
+	const zsinhs   =  0;
+	const q22      =  1.7891679E-6;
+	const q31      =  2.1460748E-6;
+	const q33      =  2.2123015E-7;
+	const g22      =  5.7686396;
+	const g32      =  9.5240898E-1;
+	const g44      =  1.8014998;
+	const g52      =  1.0508330;
+	const g54      =  4.4108898;
+	const root22   =  1.7891679E-6;
+	const root32   =  3.7393792E-7;
+	const root44   =  7.3636953E-9;
+	const root52   =  1.1428639E-7;
+	const root54   =  2.1765803E-9;
+	const thdt     =  4.3752691E-3;
+	const rho      =  1.5696615E-1;
+	const mfactor  =  7.292115E-5;
+	const __sr__   =  6.96000E5;      /*Solar radius - kilometers (IAU 76)*/
+	const AU       =  1.49597870E8;   /*Astronomical unit - kilometers (IAU 76)*/
+
+	/* visibility constants */
+	const SAT_VIS_NONE     = 0;
+	const SAT_VIS_VISIBLE  = 1;
+	const SAT_VIS_DAYLIGHT = 2;
+	const SAT_VIS_ECLIPSED = 3;
+
+	/* preferences */
+	public $minEle     = 10; // Minimum elevation
+	public $timeRes    = 10; // Pass details: time resolution
+	public $numEntries = 20; // Pass details: number of entries
+	public $threshold  = -6; // Twilight threshold
+
+	/**
+	 *  Predict the next pass.
+	 *
+	 * This function simply wraps the get_pass function using the current time
+	 * as parameter.
+	 *
+	 * Note: the data in sat will be corrupt (future) and must be refreshed
+	 *       by the caller, if the caller will need it later on (eg. if the caller
+	 *       is GtkSatList).
+	 *
+	 * @param Predict_Sat $sat   The satellite data.
+	 * @param Predict_QTH $qth   The observer data.
+	 * @param int         $maxdt The maximum number of days to look ahead.
+	 *
+	 * @return Predict_Pass Pointer instance or NULL if no pass can be
+	 *         found.
+	 */
+	public function get_next_pass(Predict_Sat $sat, Predict_QTH $qth, $maxdt)
+	{
+		/* get the current time and call the get_pass function */
+		$now = Predict_Time::get_current_daynum();
+
+		return $this->get_pass($sat, $qth, $now, $maxdt);
+	}
+
+	/** Predict first pass after a certain time.
+	 *
+	 *  @param Predict_Sat $sat   The satellite data.
+	 *  @param Predict_QTH $qth   The observer's location data.
+	 *  @param float       $start Starting time.
+	 *  @param int         $maxdt The maximum number of days to look ahead (0 for no limit).
+	 *
+	 *  @return Predict_Pass or NULL if there was an error.
+	 *
+	 * This function will find the first upcoming pass with AOS no earlier than
+	 * t = start and no later than t = (start+maxdt).
+	 *
+	 *  note For no time limit use maxdt = 0.0
+	 *
+	 *  note the data in sat will be corrupt (future) and must be refreshed
+	 *       by the caller, if the caller will need it later on
+	 */
+	public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
+	{
+		$aos = 0.0;    /* time of AOS */
+		$tca = 0.0;    /* time of TCA */
+		$los = 0.0;    /* time of LOS */
+		$dt = 0.0;     /* time diff */
+		$step = 0.0;   /* time step */
+		$t0 = $start;
+		$tres = 0.0;   /* required time resolution */
+		$max_el = 0.0; /* maximum elevation */
+		$pass = null;
+		$detail = null;
+		$done = false;
+		$iter = 0;      /* number of iterations */
+		/* FIXME: watchdog */
+
+		/*copy sat_in to a working structure*/
+		$sat         = clone $sat_in;
+		$sat_working = clone $sat_in;
+
+		/* get time resolution; sat-cfg stores it in seconds */
+		$tres = $this->timeRes / 86400.0;
+
+		/* loop until we find a pass with elevation > SAT_CFG_INT_PRED_MIN_EL
             or we run out of time
             FIXME: we should have a safety break
         */
-        while (!$done) {
-            /* Find los of next pass or of current pass */
-            $los = $this->find_los($sat, $qth, $t0, $maxdt); // See if a pass is ongoing
-            $aos = $this->find_aos($sat, $qth, $t0, $maxdt);
-            /* sat_log_log(SAT_LOG_LEVEL_MSG, "%s:%s:%d: found aos %f and los %f for t0=%f", */
-            /*          __FILE__,  */
-            /*          __FUNCTION__, */
-            /*          __LINE__, */
-            /*          aos, */
-            /*          los,  */
-            /*          t0); */
-            if ($aos > $los) {
-                // los is from an currently happening pass, find previous aos
-                $aos = $this->find_prev_aos($sat, $qth, $t0);
-            }
-
-            /* aos = 0.0 means no aos */
-            if ($aos == 0.0) {
-                $done = true;
-            } else if (($maxdt > 0.0) && ($aos > ($start + $maxdt)) ) {
-                /* check whether we are within time limits;
+		while (!$done) {
+			/* Find los of next pass or of current pass */
+			$los = $this->find_los($sat, $qth, $t0, $maxdt); // See if a pass is ongoing
+			$aos = $this->find_aos($sat, $qth, $t0, $maxdt);
+			/* sat_log_log(SAT_LOG_LEVEL_MSG, "%s:%s:%d: found aos %f and los %f for t0=%f", */
+			/*          __FILE__,  */
+			/*          __FUNCTION__, */
+			/*          __LINE__, */
+			/*          aos, */
+			/*          los,  */
+			/*          t0); */
+			if ($aos > $los) {
+				// los is from an currently happening pass, find previous aos
+				$aos = $this->find_prev_aos($sat, $qth, $t0);
+			}
+
+			/* aos = 0.0 means no aos */
+			if ($aos == 0.0) {
+				$done = true;
+			} else if (($maxdt > 0.0) && ($aos > ($start + $maxdt)) ) {
+				/* check whether we are within time limits;
                     maxdt = 0 mean no time limit.
                 */
-                $done = true;
-            } else {
-                //los = find_los (sat, qth, aos + 0.001, maxdt); // +1.5 min later
-                $dt = $los - $aos;
+				$done = true;
+			} else {
+				//los = find_los (sat, qth, aos + 0.001, maxdt); // +1.5 min later
+				$dt = $los - $aos;
 
-                /* get time step, which will give us the max number of entries */
-                $step = $dt / $this->numEntries;
+				/* get time step, which will give us the max number of entries */
+				$step = $dt / $this->numEntries;
 
-                /* but if this is smaller than the required resolution
+				/* but if this is smaller than the required resolution
                     we go with the resolution
                 */
-                if ($step < $tres) {
-                    $step = $tres;
-                }
-
-                /* create a pass_t entry; FIXME: g_try_new in 2.8 */
-                $pass = new Predict_Pass();
-
-                $pass->aos      = $aos;
-                $pass->los      = $los;
-                $pass->max_el   = 0.0;
-                $pass->aos_az   = 0.0;
-                $pass->los_az   = 0.0;
-                $pass->maxel_az = 0.0;
-                $pass->vis      = '---';
-                $pass->satname  = $sat->nickname;
-                $pass->details  = array();
-
-                /* iterate over each time step */
-                for ($t = $pass->aos; $t <= $pass->los; $t += $step) {
-
-                    /* calculate satellite data */
-                    $this->predict_calc($sat, $qth, $t);
-
-                    /* in the first iter we want to store
+				if ($step < $tres) {
+					$step = $tres;
+				}
+
+				/* create a pass_t entry; FIXME: g_try_new in 2.8 */
+				$pass = new Predict_Pass();
+
+				$pass->aos      = $aos;
+				$pass->los      = $los;
+				$pass->max_el   = 0.0;
+				$pass->aos_az   = 0.0;
+				$pass->los_az   = 0.0;
+				$pass->maxel_az = 0.0;
+				$pass->vis      = '---';
+				$pass->satname  = $sat->nickname;
+				$pass->details  = array();
+
+				/* iterate over each time step */
+				for ($t = $pass->aos; $t <= $pass->los; $t += $step) {
+
+					/* calculate satellite data */
+					$this->predict_calc($sat, $qth, $t);
+
+					/* in the first iter we want to store
                         pass->aos_az
                     */
-                    if ($t == $pass->aos) {
-                        $pass->aos_az = $sat->az;
-                        $pass->orbit  = $sat->orbit;
-                    }
-
-                    /* append details to sat->details */
-                    $detail             = new Predict_PassDetail();
-                    $detail->time       = $t;
-                    $detail->pos->x     = $sat->pos->x;
-                    $detail->pos->y     = $sat->pos->y;
-                    $detail->pos->z     = $sat->pos->z;
-                    $detail->pos->w     = $sat->pos->w;
-                    $detail->vel->x     = $sat->vel->x;
-                    $detail->vel->y     = $sat->vel->y;
-                    $detail->vel->z     = $sat->vel->z;
-                    $detail->vel->w     = $sat->vel->w;
-                    $detail->velo       = $sat->velo;
-                    $detail->az         = $sat->az;
-                    $detail->el         = $sat->el;
-                    $detail->range      = $sat->range;
-                    $detail->range_rate = $sat->range_rate;
-                    $detail->lat        = $sat->ssplat;
-                    $detail->lon        = $sat->ssplon;
-                    $detail->alt        = $sat->alt;
-                    $detail->ma         = $sat->ma;
-                    $detail->phase      = $sat->phase;
-                    $detail->footprint  = $sat->footprint;
-                    $detail->orbit      = $sat->orbit;
-                    $detail->vis        = $this->get_sat_vis($sat, $qth, $t);
-
-                    /* also store visibility "bit" */
-                    switch ($detail->vis) {
-                        case self::SAT_VIS_VISIBLE:
-                            $pass->vis[0] = 'V';
-                            break;
-                        case self::SAT_VIS_DAYLIGHT:
-                            $pass->vis[1] = 'D';
-                            break;
-                        case self::SAT_VIS_ECLIPSED:
-                            $pass->vis[2] = 'E';
-                            break;
-                        default:
-                            break;
-                    }
-
-                    // Using an array, no need to prepend and reverse the list
-                    // as gpredict does
-                    $pass->details[] = $detail;
-
-                    // Look up apparent magnitude if this is a visible pass
-                    if ($detail->vis === self::SAT_VIS_VISIBLE) {
-                        $apmag = $sat->calculateApparentMagnitude($t, $qth);
-                        if ($pass->max_apparent_magnitude === null || $apmag < $pass->max_apparent_magnitude) {
-                            $pass->max_apparent_magnitude = $apmag;
-                        }
-                    }
-
-                    /* store elevation if greater than the
+					if ($t == $pass->aos) {
+						$pass->aos_az = $sat->az;
+						$pass->orbit  = $sat->orbit;
+					}
+
+					/* append details to sat->details */
+					$detail             = new Predict_PassDetail();
+					$detail->time       = $t;
+					$detail->pos->x     = $sat->pos->x;
+					$detail->pos->y     = $sat->pos->y;
+					$detail->pos->z     = $sat->pos->z;
+					$detail->pos->w     = $sat->pos->w;
+					$detail->vel->x     = $sat->vel->x;
+					$detail->vel->y     = $sat->vel->y;
+					$detail->vel->z     = $sat->vel->z;
+					$detail->vel->w     = $sat->vel->w;
+					$detail->velo       = $sat->velo;
+					$detail->az         = $sat->az;
+					$detail->el         = $sat->el;
+					$detail->range      = $sat->range;
+					$detail->range_rate = $sat->range_rate;
+					$detail->lat        = $sat->ssplat;
+					$detail->lon        = $sat->ssplon;
+					$detail->alt        = $sat->alt;
+					$detail->ma         = $sat->ma;
+					$detail->phase      = $sat->phase;
+					$detail->footprint  = $sat->footprint;
+					$detail->orbit      = $sat->orbit;
+					$detail->vis        = $this->get_sat_vis($sat, $qth, $t);
+
+					/* also store visibility "bit" */
+					switch ($detail->vis) {
+						case self::SAT_VIS_VISIBLE:
+							$pass->vis[0] = 'V';
+							break;
+						case self::SAT_VIS_DAYLIGHT:
+							$pass->vis[1] = 'D';
+							break;
+						case self::SAT_VIS_ECLIPSED:
+							$pass->vis[2] = 'E';
+							break;
+						default:
+							break;
+					}
+
+					// Using an array, no need to prepend and reverse the list
+					// as gpredict does
+					$pass->details[] = $detail;
+
+					// Look up apparent magnitude if this is a visible pass
+					if ($detail->vis === self::SAT_VIS_VISIBLE) {
+						$apmag = $sat->calculateApparentMagnitude($t, $qth);
+						if ($pass->max_apparent_magnitude === null || $apmag < $pass->max_apparent_magnitude) {
+							$pass->max_apparent_magnitude = $apmag;
+						}
+					}
+
+					/* store elevation if greater than the
                         previously stored one
                     */
-                    if ($sat->el > $max_el) {
-                        $max_el         = $sat->el;
-                        $tca            = $t;
-                        $pass->maxel_az = $sat->az;
-                    }
-
-                    /*     g_print ("TIME: %f\tAZ: %f\tEL: %f (MAX: %f)\n", */
-                    /*           t, sat->az, sat->el, max_el); */
-                }
-
-                /* calculate satellite data */
-                $this->predict_calc($sat, $qth, $pass->los);
-                /* store los_az, max_el and tca */
-                $pass->los_az = $sat->az;
-                $pass->max_el = $max_el;
-                $pass->tca    = $tca;
-
-                /* check whether this pass is good */
-                if ($max_el >= $this->minEle) {
-                    $done = true;
-                } else {
-                    $done = false;
-                    $t0 = $los + 0.014; // +20 min
-                    $pass = null;
-                }
-
-                $iter++;
-            }
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Calculate satellite visibility.
-     *
-     * @param Predict_Sat $sat     The satellite structure.
-     * @param Predict_QTH $qth     The QTH
-     * @param float       $jul_utc The time at which the visibility should be calculated.
-     *
-     * @return int The visiblity constant, 0, 1, 2, or 3 (see above)
-     */
-    public function get_sat_vis(Predict_Sat $sat, Predict_QTH $qth, $jul_utc)
-    {
-        /* gboolean sat_sun_status;
+					if ($sat->el > $max_el) {
+						$max_el         = $sat->el;
+						$tca            = $t;
+						$pass->maxel_az = $sat->az;
+					}
+
+					/*     g_print ("TIME: %f\tAZ: %f\tEL: %f (MAX: %f)\n", */
+					/*           t, sat->az, sat->el, max_el); */
+				}
+
+				/* calculate satellite data */
+				$this->predict_calc($sat, $qth, $pass->los);
+				/* store los_az, max_el and tca */
+				$pass->los_az = $sat->az;
+				$pass->max_el = $max_el;
+				$pass->tca    = $tca;
+
+				/* check whether this pass is good */
+				if ($max_el >= $this->minEle) {
+					$done = true;
+				} else {
+					$done = false;
+					$t0 = $los + 0.014; // +20 min
+					$pass = null;
+				}
+
+				$iter++;
+			}
+		}
+
+		return $pass;
+	}
+
+	/**
+	 * Calculate satellite visibility.
+	 *
+	 * @param Predict_Sat $sat     The satellite structure.
+	 * @param Predict_QTH $qth     The QTH
+	 * @param float       $jul_utc The time at which the visibility should be calculated.
+	 *
+	 * @return int The visiblity constant, 0, 1, 2, or 3 (see above)
+	 */
+	public function get_sat_vis(Predict_Sat $sat, Predict_QTH $qth, $jul_utc)
+	{
+		/* gboolean sat_sun_status;
         gdouble  sun_el;
         gdouble  threshold;
         gdouble  eclipse_depth;
         sat_vis_t vis = SAT_VIS_NONE; */
 
-        $eclipse_depth  = 0.0;
-        $zero_vector    = new Predict_Vector();
-        $obs_geodetic   = new Predict_Geodetic();
-
-        /* Solar ECI position vector  */
-        $solar_vector = new Predict_Vector();
-
-        /* Solar observed az and el vector  */
-        $solar_set = new Predict_ObsSet();
-
-        /* FIXME: could be passed as parameter */
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
-        $obs_geodetic->theta = 0;
-
-        Predict_Solar::Calculate_Solar_Position($jul_utc, $solar_vector);
-        Predict_SGPObs::Calculate_Obs($jul_utc, $solar_vector, $zero_vector, $obs_geodetic, $solar_set);
-
-        if (Predict_Solar::Sat_Eclipsed($sat->pos, $solar_vector, $eclipse_depth)) {
-            /* satellite is eclipsed */
-            $sat_sun_status = false;
-        } else {
-            /* satellite in sunlight => may be visible */
-            $sat_sun_status = true;
-        }
-
-        if ($sat_sun_status) {
-            $sun_el = Predict_Math::Degrees($solar_set->el);
-
-            if ($sun_el <= $this->threshold && $sat->el >= 0.0) {
-                $vis = self::SAT_VIS_VISIBLE;
-            } else {
-                $vis = self::SAT_VIS_DAYLIGHT;
-            }
-        } else {
-            $vis = self::SAT_VIS_ECLIPSED;
-        }
-
-        return $vis;
-    }
-
-    /** Find the AOS time of the next pass.
-     *  @author Alexandru Csete, OZ9AEC
-     *  @author John A. Magliacane, KD2BD
-     *  @param Predict_Sat $sat   The satellite data.
-     *  @param Predict_QTH $qth   The observer's location (QTH) data.
-     *  @param float       $start The julian date where calculation should start.
-     *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The julain date of the next AOS or 0.0 if the satellite has no AOS.
-     *
-     * This function finds the time of AOS for the first coming pass taking place
-     * no earlier that start.
-     * If the satellite is currently within range, the function first calls
-     * find_los to get the next LOS time. Then the calculations are done using
-     * the new start time.
-     *
-     */
-    public function find_aos(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
-    {
-        $t = $start;
-        $aostime = 0.0;
-
-
-        /* make sure current sat values are
+		$eclipse_depth  = 0.0;
+		$zero_vector    = new Predict_Vector();
+		$obs_geodetic   = new Predict_Geodetic();
+
+		/* Solar ECI position vector  */
+		$solar_vector = new Predict_Vector();
+
+		/* Solar observed az and el vector  */
+		$solar_set = new Predict_ObsSet();
+
+		/* FIXME: could be passed as parameter */
+		$obs_geodetic->lon   = $qth->lon * self::de2ra;
+		$obs_geodetic->lat   = $qth->lat * self::de2ra;
+		$obs_geodetic->alt   = $qth->alt / 1000.0;
+		$obs_geodetic->theta = 0;
+
+		Predict_Solar::Calculate_Solar_Position($jul_utc, $solar_vector);
+		Predict_SGPObs::Calculate_Obs($jul_utc, $solar_vector, $zero_vector, $obs_geodetic, $solar_set);
+
+		if (Predict_Solar::Sat_Eclipsed($sat->pos, $solar_vector, $eclipse_depth)) {
+			/* satellite is eclipsed */
+			$sat_sun_status = false;
+		} else {
+			/* satellite in sunlight => may be visible */
+			$sat_sun_status = true;
+		}
+
+		if ($sat_sun_status) {
+			$sun_el = Predict_Math::Degrees($solar_set->el);
+
+			if ($sun_el <= $this->threshold && $sat->el >= 0.0) {
+				$vis = self::SAT_VIS_VISIBLE;
+			} else {
+				$vis = self::SAT_VIS_DAYLIGHT;
+			}
+		} else {
+			$vis = self::SAT_VIS_ECLIPSED;
+		}
+
+		return $vis;
+	}
+
+	/** Find the AOS time of the next pass.
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param Predict_Sat $sat   The satellite data.
+	 *  @param Predict_QTH $qth   The observer's location (QTH) data.
+	 *  @param float       $start The julian date where calculation should start.
+	 *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
+	 *  @return The julain date of the next AOS or 0.0 if the satellite has no AOS.
+	 *
+	 * This function finds the time of AOS for the first coming pass taking place
+	 * no earlier that start.
+	 * If the satellite is currently within range, the function first calls
+	 * find_los to get the next LOS time. Then the calculations are done using
+	 * the new start time.
+	 *
+	 */
+	public function find_aos(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
+	{
+		$t = $start;
+		$aostime = 0.0;
+
+
+		/* make sure current sat values are
             in sync with the time
         */
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        if ($sat->el > 0.0) {
-            $t = $this->find_los($sat, $qth, $start, $maxdt) + 0.014; // +20 min
-        }
-
-        /* invalid time (potentially returned by find_los) */
-        if ($t < 0.1) {
-            return 0.0;
-        }
-
-        /* update satellite data */
-        $this->predict_calc($sat, $qth, $t);
-
-        /* use upper time limit */
-        if ($maxdt > 0.0) {
-
-            /* coarse time steps */
-            while (($sat->el < -1.0) && ($t <= ($start + $maxdt))) {
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while (($aostime == 0.0) && ($t <= ($start + $maxdt))) {
-
-                if (abs($sat->el) < 0.005) {
-                    $aostime = $t;
-                } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
-                    $this->predict_calc($sat, $qth, $t);
-                }
-            }
-        } else {
-            /* don't use upper time limit */
-
-            /* coarse time steps */
-            while ($sat->el < -1.0) {
-
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while ($aostime == 0.0) {
-
-                if (abs($sat->el) < 0.005) {
-                    $aostime = $t;
-                } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
-                    $this->predict_calc($sat, $qth, $t);
-                }
-
-            }
-        }
-
-        return $aostime;
-    }
-
-    /** SGP4SDP4 driver for doing AOS/LOS calculations.
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The QTH observer location data.
-     *  @param float       $t   The time for calculation (Julian Date)
-     *
-     */
-    public function predict_calc(Predict_Sat $sat, Predict_QTH $qth, $t)
-    {
-        $obs_set      = new Predict_ObsSet();
-        $sat_geodetic = new Predict_Geodetic();
-        $obs_geodetic = new Predict_Geodetic();
-
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
-        $obs_geodetic->theta = 0;
-
-        $sat->jul_utc = $t;
-        $sat->tsince = ($sat->jul_utc - $sat->jul_epoch) * self::xmnpda;
-
-        /* call the norad routines according to the deep-space flag */
-        $sgpsdp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
-            $sgpsdp->SDP4($sat, $sat->tsince);
-        } else {
-            $sgpsdp->SGP4($sat, $sat->tsince);
-        }
-
-        Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
-
-        /* get the velocity of the satellite */
-        $sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
-        $sat->velo = $sat->vel->w;
-        Predict_SGPObs::Calculate_Obs($sat->jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
-        Predict_SGPObs::Calculate_LatLonAlt($sat->jul_utc, $sat->pos, $sat_geodetic);
-
-        while ($sat_geodetic->lon < -self::pi) {
-            $sat_geodetic->lon += self::twopi;
-        }
-
-        while ($sat_geodetic->lon > (self::pi)) {
-            $sat_geodetic->lon -= self::twopi;
-        }
-
-        $sat->az = Predict_Math::Degrees($obs_set->az);
-        $sat->el = Predict_Math::Degrees($obs_set->el);
-        $sat->range = $obs_set->range;
-        $sat->range_rate = $obs_set->range_rate;
-        $sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
-        $sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
-        $sat->alt = $sat_geodetic->alt;
-        $sat->ma = Predict_Math::Degrees($sat->phase);
-        $sat->ma *= 256.0 / 360.0;
-        $sat->phase = Predict_Math::Degrees($sat->phase);
-
-        /* same formulas, but the one from predict is nicer */
-        //sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
-        $sat->footprint = 12756.33 * acos(self::xkmper / (self::xkmper + $sat->alt));
-        $age = $sat->jul_utc - $sat->jul_epoch;
-        $sat->orbit = floor(($sat->tle->xno * self::xmnpda / self::twopi +
-                        $age * $sat->tle->bstar * self::ae) * $age +
-                        $sat->tle->xmo / self::twopi) + $sat->tle->revnum - 1;
-    }
-
-    /** Find the LOS time of the next pass.
-     *  @author Alexandru Csete, OZ9AEC
-     *  @author John A. Magliacane, KD2BD
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The QTH observer location data.
-     *  @param float       $start The time where calculation should start. (Julian Date)
-     *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
-     *
-     * This function finds the time of LOS for the first coming pass taking place
-     * no earlier that start.
-     * If the satellite is currently out of range, the function first calls
-     * find_aos to get the next AOS time. Then the calculations are done using
-     * the new start time.
-     * The function has a built-in watchdog to ensure that we don't end up in
-     * lengthy loops.
-     *
-     */
-    public function find_los(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
-    {
-        $t = $start;
-        $lostime = 0.0;
-
-
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos ($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        if ($sat->el < 0.0) {
-            $t = $this->find_aos($sat, $qth, $start, $maxdt) + 0.001; // +1.5 min
-        }
-
-        /* invalid time (potentially returned by find_aos) */
-        if ($t < 0.01) {
-            return 0.0;
-        }
-
-        /* update satellite data */
-        $this->predict_calc($sat, $qth, $t);
-
-        /* use upper time limit */
-        if ($maxdt > 0.0) {
-
-            /* coarse steps */
-            while (($sat->el >= 1.0) && ($t <= ($start + $maxdt))) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while (($lostime == 0.0) && ($t <= ($start + $maxdt)))  {
-
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
-                $this->predict_calc($sat, $qth, $t);
-
-                if (abs($sat->el) < 0.005) {
-                    $lostime = $t;
-                }
-            }
-        } else {
-        /* don't use upper limit */
-
-            /* coarse steps */
-            while ($sat->el >= 1.0) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while ($lostime == 0.0) {
-
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
-                $this->predict_calc($sat, $qth, $t);
-
-                if (abs($sat->el) < 0.005)
-                    $lostime = $t;
-            }
-        }
-
-        return $lostime;
-    }
-
-    /** Find AOS time of current pass.
-     *  @param Predict_Sat $sat   The satellite to find AOS for.
-     *  @param Predict_QTH $qth   The ground station.
-     *  @param float       $start Start time, prefereably now.
-     *  @return The time of the previous AOS or 0.0 if the satellite has no AOS.
-     *
-     * This function can be used to find the AOS time in the past of the
-     * current pass.
-     */
-    public function find_prev_aos(Predict_Sat $sat, Predict_QTH $qth, $start)
-    {
-        $aostime = $start;
-
-        /* make sure current sat values are
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		if ($sat->el > 0.0) {
+			$t = $this->find_los($sat, $qth, $start, $maxdt) + 0.014; // +20 min
+		}
+
+		/* invalid time (potentially returned by find_los) */
+		if ($t < 0.1) {
+			return 0.0;
+		}
+
+		/* update satellite data */
+		$this->predict_calc($sat, $qth, $t);
+
+		/* use upper time limit */
+		if ($maxdt > 0.0) {
+
+			/* coarse time steps */
+			while (($sat->el < -1.0) && ($t <= ($start + $maxdt))) {
+				$t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while (($aostime == 0.0) && ($t <= ($start + $maxdt))) {
+
+				if (abs($sat->el) < 0.005) {
+					$aostime = $t;
+				} else {
+					$t -= $sat->el * sqrt($sat->alt) / 530000.0;
+					$this->predict_calc($sat, $qth, $t);
+				}
+			}
+		} else {
+			/* don't use upper time limit */
+
+			/* coarse time steps */
+			while ($sat->el < -1.0) {
+
+				$t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while ($aostime == 0.0) {
+
+				if (abs($sat->el) < 0.005) {
+					$aostime = $t;
+				} else {
+					$t -= $sat->el * sqrt($sat->alt) / 530000.0;
+					$this->predict_calc($sat, $qth, $t);
+				}
+
+			}
+		}
+
+		return $aostime;
+	}
+
+	/** SGP4SDP4 driver for doing AOS/LOS calculations.
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The QTH observer location data.
+	 *  @param float       $t   The time for calculation (Julian Date)
+	 *
+	 */
+	public function predict_calc(Predict_Sat $sat, Predict_QTH $qth, $t)
+	{
+		$obs_set      = new Predict_ObsSet();
+		$sat_geodetic = new Predict_Geodetic();
+		$obs_geodetic = new Predict_Geodetic();
+
+		$obs_geodetic->lon   = $qth->lon * self::de2ra;
+		$obs_geodetic->lat   = $qth->lat * self::de2ra;
+		$obs_geodetic->alt   = $qth->alt / 1000.0;
+		$obs_geodetic->theta = 0;
+
+		$sat->jul_utc = $t;
+		$sat->tsince = ($sat->jul_utc - $sat->jul_epoch) * self::xmnpda;
+
+		/* call the norad routines according to the deep-space flag */
+		$sgpsdp = Predict_SGPSDP::getInstance($sat);
+		if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+			$sgpsdp->SDP4($sat, $sat->tsince);
+		} else {
+			$sgpsdp->SGP4($sat, $sat->tsince);
+		}
+
+		Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
+
+		/* get the velocity of the satellite */
+		$sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
+		$sat->velo = $sat->vel->w;
+		Predict_SGPObs::Calculate_Obs($sat->jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
+		Predict_SGPObs::Calculate_LatLonAlt($sat->jul_utc, $sat->pos, $sat_geodetic);
+
+		while ($sat_geodetic->lon < -self::pi) {
+			$sat_geodetic->lon += self::twopi;
+		}
+
+		while ($sat_geodetic->lon > (self::pi)) {
+			$sat_geodetic->lon -= self::twopi;
+		}
+
+		$sat->az = Predict_Math::Degrees($obs_set->az);
+		$sat->el = Predict_Math::Degrees($obs_set->el);
+		$sat->range = $obs_set->range;
+		$sat->range_rate = $obs_set->range_rate;
+		$sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
+		$sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
+		$sat->alt = $sat_geodetic->alt;
+		$sat->ma = Predict_Math::Degrees($sat->phase);
+		$sat->ma *= 256.0 / 360.0;
+		$sat->phase = Predict_Math::Degrees($sat->phase);
+
+		/* same formulas, but the one from predict is nicer */
+		//sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
+		$sat->footprint = 12756.33 * acos(self::xkmper / (self::xkmper + $sat->alt));
+		$age = $sat->jul_utc - $sat->jul_epoch;
+		$sat->orbit = floor(($sat->tle->xno * self::xmnpda / self::twopi +
+						$age * $sat->tle->bstar * self::ae) * $age +
+						$sat->tle->xmo / self::twopi) + $sat->tle->revnum - 1;
+	}
+
+	/** Find the LOS time of the next pass.
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The QTH observer location data.
+	 *  @param float       $start The time where calculation should start. (Julian Date)
+	 *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
+	 *  @return The time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
+	 *
+	 * This function finds the time of LOS for the first coming pass taking place
+	 * no earlier that start.
+	 * If the satellite is currently out of range, the function first calls
+	 * find_aos to get the next AOS time. Then the calculations are done using
+	 * the new start time.
+	 * The function has a built-in watchdog to ensure that we don't end up in
+	 * lengthy loops.
+	 *
+	 */
+	public function find_los(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
+	{
+		$t = $start;
+		$lostime = 0.0;
+
+
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos ($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		if ($sat->el < 0.0) {
+			$t = $this->find_aos($sat, $qth, $start, $maxdt) + 0.001; // +1.5 min
+		}
+
+		/* invalid time (potentially returned by find_aos) */
+		if ($t < 0.01) {
+			return 0.0;
+		}
+
+		/* update satellite data */
+		$this->predict_calc($sat, $qth, $t);
+
+		/* use upper time limit */
+		if ($maxdt > 0.0) {
+
+			/* coarse steps */
+			while (($sat->el >= 1.0) && ($t <= ($start + $maxdt))) {
+				$t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while (($lostime == 0.0) && ($t <= ($start + $maxdt)))  {
+
+				$t += $sat->el * sqrt($sat->alt) / 502500.0;
+				$this->predict_calc($sat, $qth, $t);
+
+				if (abs($sat->el) < 0.005) {
+					$lostime = $t;
+				}
+			}
+		} else {
+		/* don't use upper limit */
+
+			/* coarse steps */
+			while ($sat->el >= 1.0) {
+				$t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while ($lostime == 0.0) {
+
+				$t += $sat->el * sqrt($sat->alt) / 502500.0;
+				$this->predict_calc($sat, $qth, $t);
+
+				if (abs($sat->el) < 0.005)
+					$lostime = $t;
+			}
+		}
+
+		return $lostime;
+	}
+
+	/** Find AOS time of current pass.
+	 *  @param Predict_Sat $sat   The satellite to find AOS for.
+	 *  @param Predict_QTH $qth   The ground station.
+	 *  @param float       $start Start time, prefereably now.
+	 *  @return The time of the previous AOS or 0.0 if the satellite has no AOS.
+	 *
+	 * This function can be used to find the AOS time in the past of the
+	 * current pass.
+	 */
+	public function find_prev_aos(Predict_Sat $sat, Predict_QTH $qth, $start)
+	{
+		$aostime = $start;
+
+		/* make sure current sat values are
             in sync with the time
         */
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        while ($sat->el >= 0.0) {
-            $aostime -= 0.0005; // 0.75 min
-            $this->predict_calc($sat, $qth, $aostime);
-        }
-
-        return $aostime;
-    }
-
-    /** Determine whether satellite ever reaches AOS.
-     *  @author John A. Magliacane, KD2BD
-     *  @author Alexandru Csete, OZ9AEC
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The observer's location data
-     *  @return bool true if the satellite will reach AOS, false otherwise.
-     *
-     */
-    public function has_aos(Predict_Sat $sat, Predict_QTH $qth)
-    {
-         $retcode = false;
-
-         /* FIXME */
-         if ($sat->meanmo == 0.0) {
-              $retcode = false;
-         } else {
-
-            /* xincl is already in RAD by select_ephemeris */
-            $lin = $sat->tle->xincl;
-            if ($lin >= self::pio2) {
-                $lin = self::pi - $lin;
-            }
-
-            $sma = 331.25 * exp(log(1440.0 / $sat->meanmo) * (2.0 / 3.0));
-            $apogee = $sma * (1.0 + $sat->tle->eo) - self::xkmper;
-
-            if ((acos(self::xkmper / ($apogee + self::xkmper)) + ($lin)) > abs($qth->lat * self::de2ra)) {
-                $retcode = true;
-            } else {
-                $retcode = false;
-            }
-        }
-
-        return $retcode;
-    }
-
-    /** Predict passes after a certain time.
-     *
-     *
-     * This function calculates num upcoming passes with AOS no earlier
-     * than t = start and not later that t = (start+maxdt). The function will
-     *  repeatedly call get_pass until
-     * the number of predicted passes is equal to num, the time has reached
-     * limit or the get_pass function returns NULL.
-     *
-     * note For no time limit use maxdt = 0.0
-     *
-     * note the data in sat will be corrupt (future) and must be refreshed
-     *      by the caller, if the caller will need it later on (eg. if the caller
-     *      is GtkSatList).
-     *
-     * note Prepending to a singly linked list is much faster than appending.
-     *      Therefore, the elements are prepended whereafter the GSList is
-     *      reversed
-     *
-     *
-     * @param Predict_Sat  $sat The satellite data
-     * @param Predict_QTH  $qth The observer's location data
-     * @param float $start The start julian date
-     * @param int   $maxdt The max # of days to look
-     * @param int   $num   The max # of passes to get
-     * @return array of Predict_Pass instances if found, empty array otherwise
-     */
-    public function get_passes(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt, $num = 0)
-    {
-        $passes = array();
-
-        /* if no number has been specified
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		while ($sat->el >= 0.0) {
+			$aostime -= 0.0005; // 0.75 min
+			$this->predict_calc($sat, $qth, $aostime);
+		}
+
+		return $aostime;
+	}
+
+	/** Determine whether satellite ever reaches AOS.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The observer's location data
+	 *  @return bool true if the satellite will reach AOS, false otherwise.
+	 *
+	 */
+	public function has_aos(Predict_Sat $sat, Predict_QTH $qth)
+	{
+		 $retcode = false;
+
+		 /* FIXME */
+		 if ($sat->meanmo == 0.0) {
+			  $retcode = false;
+		 } else {
+
+			/* xincl is already in RAD by select_ephemeris */
+			$lin = $sat->tle->xincl;
+			if ($lin >= self::pio2) {
+				$lin = self::pi - $lin;
+			}
+
+			$sma = 331.25 * exp(log(1440.0 / $sat->meanmo) * (2.0 / 3.0));
+			$apogee = $sma * (1.0 + $sat->tle->eo) - self::xkmper;
+
+			if ((acos(self::xkmper / ($apogee + self::xkmper)) + ($lin)) > abs($qth->lat * self::de2ra)) {
+				$retcode = true;
+			} else {
+				$retcode = false;
+			}
+		}
+
+		return $retcode;
+	}
+
+	/** Predict passes after a certain time.
+	 *
+	 *
+	 * This function calculates num upcoming passes with AOS no earlier
+	 * than t = start and not later that t = (start+maxdt). The function will
+	 *  repeatedly call get_pass until
+	 * the number of predicted passes is equal to num, the time has reached
+	 * limit or the get_pass function returns NULL.
+	 *
+	 * note For no time limit use maxdt = 0.0
+	 *
+	 * note the data in sat will be corrupt (future) and must be refreshed
+	 *      by the caller, if the caller will need it later on (eg. if the caller
+	 *      is GtkSatList).
+	 *
+	 * note Prepending to a singly linked list is much faster than appending.
+	 *      Therefore, the elements are prepended whereafter the GSList is
+	 *      reversed
+	 *
+	 *
+	 * @param Predict_Sat  $sat The satellite data
+	 * @param Predict_QTH  $qth The observer's location data
+	 * @param float $start The start julian date
+	 * @param int   $maxdt The max # of days to look
+	 * @param int   $num   The max # of passes to get
+	 * @return array of Predict_Pass instances if found, empty array otherwise
+	 */
+	public function get_passes(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt, $num = 0)
+	{
+		$passes = array();
+
+		/* if no number has been specified
             set it to something big */
-        if ($num == 0) {
-            $num = 100;
-        }
+		if ($num == 0) {
+			$num = 100;
+		}
 
-        $t = $start;
+		$t = $start;
 
-        for ($i = 0; $i < $num; $i++) {
-            $pass = $this->get_pass($sat, $qth, $t, $maxdt);
+		for ($i = 0; $i < $num; $i++) {
+			$pass = $this->get_pass($sat, $qth, $t, $maxdt);
 
-            if ($pass != null) {
-                $passes[] = $pass;
-                $t = $pass->los + 0.014; // +20 min
+			if ($pass != null) {
+				$passes[] = $pass;
+				$t = $pass->los + 0.014; // +20 min
 
-                /* if maxdt > 0.0 check whether we have reached t = start+maxdt
+				/* if maxdt > 0.0 check whether we have reached t = start+maxdt
                     if yes finish predictions
                 */
-                if (($maxdt > 0.0) && ($t >= ($start + $maxdt))) {
-                    $i = $num;
-                }
-            } else {
-                /* we can't get any more passes */
-                $i = $num;
-            }
-        }
-
-        return $passes;
-    }
-
-    /**
-     * Filters out visible passes and adds the visible aos, tca, los, and
-     * corresponding az and ele for each.
-     *
-     * @param array $passes The passes returned from get_passes()
-     *
-     * @author Bill Shupp
-     * @return array
-     */
-    public function filterVisiblePasses(array $passes)
-    {
-        $filtered = array();
-
-        foreach ($passes as $result) {
-            // Dummy check
-            if ($result->vis[0] != 'V') {
-                continue;
-            }
-
-            $aos    = false;
-            $aos_az = false;
-            $aos    = false;
-            $tca    = false;
-            $los_az = false;
-            $max_el = 0;
-
-            foreach ($result->details as $detail) {
-                if ($detail->vis != Predict::SAT_VIS_VISIBLE) {
-                    continue;
-                }
-                if ($detail->el < $this->minEle) {
-                    continue;
-                }
-
-                if ($aos == false) {
-                    $aos       = $detail->time;
-                    $aos_az    = $detail->az;
-                    $aos_el    = $detail->el;
-                    $tca       = $detail->time;
-                    $los       = $detail->time;
-                    $los_az    = $detail->az;
-                    $los_el    = $detail->el;
-                    $max_el    = $detail->el;
-                    $max_el_az = $detail->el;
-                    continue;
-                }
-                $los    = $detail->time;
-                $los_az = $detail->az;
-                $los_el = $detail->el;
-
-                if ($detail->el > $max_el) {
-                    $tca       = $detail->time;
-                    $max_el    = $detail->el;
-                    $max_el_az = $detail->az;
-                }
-            }
-
-            if ($aos === false) {
-                // Does not reach minimum elevation, skip
-                continue;
-            }
-
-            $result->visible_aos       = $aos;
-            $result->visible_aos_az    = $aos_az;
-            $result->visible_aos_el    = $aos_el;
-            $result->visible_tca       = $tca;
-            $result->visible_max_el    = $max_el;
-            $result->visible_max_el_az = $max_el_az;
-            $result->visible_los       = $los;
-            $result->visible_los_az    = $los_az;
-            $result->visible_los_el    = $los_el;
-
-            $filtered[] = $result;
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Translates aziumuth degrees to compass direction:
-     *
-     * N (0°), NNE (22.5°), NE (45°), ENE (67.5°), E (90°), ESE (112.5°),
-     * SE (135°), SSE (157.5°), S (180°), SSW (202.5°), SW (225°),
-     * WSW (247.5°), W (270°), WNW (292.5°), NW (315°), NNW (337.5°)
-     *
-     * @param int $az The azimuth in degrees, defaults to 0
-     *
-     * @return string
-     */
-    public function azDegreesToDirection($az = 0)
-    {
-        $i = floor($az / 22.5);
-        $m = (22.5 * (2 * $i + 1)) / 2;
-        $i = ($az >= $m) ? $i + 1 : $i;
-
-        return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i * 3, 3));
-    }
+				if (($maxdt > 0.0) && ($t >= ($start + $maxdt))) {
+					$i = $num;
+				}
+			} else {
+				/* we can't get any more passes */
+				$i = $num;
+			}
+		}
+
+		return $passes;
+	}
+
+	/**
+	 * Filters out visible passes and adds the visible aos, tca, los, and
+	 * corresponding az and ele for each.
+	 *
+	 * @param array $passes The passes returned from get_passes()
+	 *
+	 * @author Bill Shupp
+	 * @return array
+	 */
+	public function filterVisiblePasses(array $passes)
+	{
+		$filtered = array();
+
+		foreach ($passes as $result) {
+			// Dummy check
+			if ($result->vis[0] != 'V') {
+				continue;
+			}
+
+			$aos    = false;
+			$aos_az = false;
+			$aos    = false;
+			$tca    = false;
+			$los_az = false;
+			$max_el = 0;
+
+			foreach ($result->details as $detail) {
+				if ($detail->vis != Predict::SAT_VIS_VISIBLE) {
+					continue;
+				}
+				if ($detail->el < $this->minEle) {
+					continue;
+				}
+
+				if ($aos == false) {
+					$aos       = $detail->time;
+					$aos_az    = $detail->az;
+					$aos_el    = $detail->el;
+					$tca       = $detail->time;
+					$los       = $detail->time;
+					$los_az    = $detail->az;
+					$los_el    = $detail->el;
+					$max_el    = $detail->el;
+					$max_el_az = $detail->el;
+					continue;
+				}
+				$los    = $detail->time;
+				$los_az = $detail->az;
+				$los_el = $detail->el;
+
+				if ($detail->el > $max_el) {
+					$tca       = $detail->time;
+					$max_el    = $detail->el;
+					$max_el_az = $detail->az;
+				}
+			}
+
+			if ($aos === false) {
+				// Does not reach minimum elevation, skip
+				continue;
+			}
+
+			$result->visible_aos       = $aos;
+			$result->visible_aos_az    = $aos_az;
+			$result->visible_aos_el    = $aos_el;
+			$result->visible_tca       = $tca;
+			$result->visible_max_el    = $max_el;
+			$result->visible_max_el_az = $max_el_az;
+			$result->visible_los       = $los;
+			$result->visible_los_az    = $los_az;
+			$result->visible_los_el    = $los_el;
+
+			$filtered[] = $result;
+		}
+
+		return $filtered;
+	}
+
+	/**
+	 * Translates aziumuth degrees to compass direction:
+	 *
+	 * N (0°), NNE (22.5°), NE (45°), ENE (67.5°), E (90°), ESE (112.5°),
+	 * SE (135°), SSE (157.5°), S (180°), SSW (202.5°), SW (225°),
+	 * WSW (247.5°), W (270°), WNW (292.5°), NW (315°), NNW (337.5°)
+	 *
+	 * @param int $az The azimuth in degrees, defaults to 0
+	 *
+	 * @return string
+	 */
+	public function azDegreesToDirection($az = 0)
+	{
+		$i = floor($az / 22.5);
+		$m = (22.5 * (2 * $i + 1)) / 2;
+		$i = ($az >= $m) ? $i + 1 : $i;
+
+		return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i * 3, 3));
+	}
 }

Spacing +93 added lines, -93 removed lines

@@ -52,60 +52,60 @@ 
  */
 class Predict
 {
-    const de2ra    =  1.74532925E-2;   /* Degrees to Radians */
-    const pi       =  3.1415926535898; /* Pi */
-    const pio2     =  1.5707963267949; /* Pi/2 */
-    const x3pio2   =  4.71238898;      /* 3*Pi/2 */
-    const twopi    =  6.2831853071796; /* 2*Pi  */
-    const e6a      =  1.0E-6;
-    const tothrd   =  6.6666667E-1;    /* 2/3 */
-    const xj2      =  1.0826158E-3;    /* J2 Harmonic */
-    const xj3      = -2.53881E-6;      /* J3 Harmonic */
-    const xj4      = -1.65597E-6;      /* J4 Harmonic */
-    const xke      =  7.43669161E-2;
-    const xkmper   =  6.378135E3;      /* Earth radius km */
-    const xmnpda   =  1.44E3;          /* Minutes per day */
-    const km2mi    =  0.621371;        /* Kilometers per Mile */
-    const ae       =  1.0;
-    const ck2      =  5.413079E-4;
-    const ck4      =  6.209887E-7;
-    const __f      =  3.352779E-3;
-    const ge       =  3.986008E5;
-    const __s__    =  1.012229;
-    const qoms2t   =  1.880279E-09;
-    const secday   =  8.6400E4;        /* Seconds per day */
-    const omega_E  =  1.0027379;
-    const omega_ER =  6.3003879;
-    const zns      =  1.19459E-5;
-    const c1ss     =  2.9864797E-6;
-    const zes      =  1.675E-2;
-    const znl      =  1.5835218E-4;
-    const c1l      =  4.7968065E-7;
-    const zel      =  5.490E-2;
-    const zcosis   =  9.1744867E-1;
-    const zsinis   =  3.9785416E-1;
+    const de2ra    = 1.74532925E-2; /* Degrees to Radians */
+    const pi       = 3.1415926535898; /* Pi */
+    const pio2     = 1.5707963267949; /* Pi/2 */
+    const x3pio2   = 4.71238898; /* 3*Pi/2 */
+    const twopi    = 6.2831853071796; /* 2*Pi  */
+    const e6a      = 1.0E-6;
+    const tothrd   = 6.6666667E-1; /* 2/3 */
+    const xj2      = 1.0826158E-3; /* J2 Harmonic */
+    const xj3      = -2.53881E-6; /* J3 Harmonic */
+    const xj4      = -1.65597E-6; /* J4 Harmonic */
+    const xke      = 7.43669161E-2;
+    const xkmper   = 6.378135E3; /* Earth radius km */
+    const xmnpda   = 1.44E3; /* Minutes per day */
+    const km2mi    = 0.621371; /* Kilometers per Mile */
+    const ae       = 1.0;
+    const ck2      = 5.413079E-4;
+    const ck4      = 6.209887E-7;
+    const __f      = 3.352779E-3;
+    const ge       = 3.986008E5;
+    const __s__    = 1.012229;
+    const qoms2t   = 1.880279E-09;
+    const secday   = 8.6400E4; /* Seconds per day */
+    const omega_E  = 1.0027379;
+    const omega_ER = 6.3003879;
+    const zns      = 1.19459E-5;
+    const c1ss     = 2.9864797E-6;
+    const zes      = 1.675E-2;
+    const znl      = 1.5835218E-4;
+    const c1l      = 4.7968065E-7;
+    const zel      = 5.490E-2;
+    const zcosis   = 9.1744867E-1;
+    const zsinis   = 3.9785416E-1;
     const zsings   = -9.8088458E-1;
-    const zcosgs   =  1.945905E-1;
-    const zcoshs   =  1;
-    const zsinhs   =  0;
-    const q22      =  1.7891679E-6;
-    const q31      =  2.1460748E-6;
-    const q33      =  2.2123015E-7;
-    const g22      =  5.7686396;
-    const g32      =  9.5240898E-1;
-    const g44      =  1.8014998;
-    const g52      =  1.0508330;
-    const g54      =  4.4108898;
-    const root22   =  1.7891679E-6;
-    const root32   =  3.7393792E-7;
-    const root44   =  7.3636953E-9;
-    const root52   =  1.1428639E-7;
-    const root54   =  2.1765803E-9;
-    const thdt     =  4.3752691E-3;
-    const rho      =  1.5696615E-1;
-    const mfactor  =  7.292115E-5;
-    const __sr__   =  6.96000E5;      /*Solar radius - kilometers (IAU 76)*/
-    const AU       =  1.49597870E8;   /*Astronomical unit - kilometers (IAU 76)*/
+    const zcosgs   = 1.945905E-1;
+    const zcoshs   = 1;
+    const zsinhs   = 0;
+    const q22      = 1.7891679E-6;
+    const q31      = 2.1460748E-6;
+    const q33      = 2.2123015E-7;
+    const g22      = 5.7686396;
+    const g32      = 9.5240898E-1;
+    const g44      = 1.8014998;
+    const g52      = 1.0508330;
+    const g54      = 4.4108898;
+    const root22   = 1.7891679E-6;
+    const root32   = 3.7393792E-7;
+    const root44   = 7.3636953E-9;
+    const root52   = 1.1428639E-7;
+    const root54   = 2.1765803E-9;
+    const thdt     = 4.3752691E-3;
+    const rho      = 1.5696615E-1;
+    const mfactor  = 7.292115E-5;
+    const __sr__   = 6.96000E5; /*Solar radius - kilometers (IAU 76)*/
+    const AU       = 1.49597870E8; /*Astronomical unit - kilometers (IAU 76)*/
 
     /* visibility constants */
     const SAT_VIS_NONE     = 0;
@@ -163,18 +163,18 @@ 
      */
     public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
     {
-        $aos = 0.0;    /* time of AOS */
-        $tca = 0.0;    /* time of TCA */
-        $los = 0.0;    /* time of LOS */
-        $dt = 0.0;     /* time diff */
-        $step = 0.0;   /* time step */
+        $aos = 0.0; /* time of AOS */
+        $tca = 0.0; /* time of TCA */
+        $los = 0.0; /* time of LOS */
+        $dt = 0.0; /* time diff */
+        $step = 0.0; /* time step */
         $t0 = $start;
-        $tres = 0.0;   /* required time resolution */
+        $tres = 0.0; /* required time resolution */
         $max_el = 0.0; /* maximum elevation */
         $pass = null;
         $detail = null;
         $done = false;
-        $iter = 0;      /* number of iterations */
+        $iter = 0; /* number of iterations */
         /* FIXME: watchdog */
 
         /*copy sat_in to a working structure*/
@@ -182,7 +182,7 @@ 
         $sat_working = clone $sat_in;
 
         /* get time resolution; sat-cfg stores it in seconds */
-        $tres = $this->timeRes / 86400.0;
+        $tres = $this->timeRes/86400.0;
 
         /* loop until we find a pass with elevation > SAT_CFG_INT_PRED_MIN_EL
             or we run out of time
@@ -207,7 +207,7 @@ 
             /* aos = 0.0 means no aos */
             if ($aos == 0.0) {
                 $done = true;
-            } else if (($maxdt > 0.0) && ($aos > ($start + $maxdt)) ) {
+            } else if (($maxdt > 0.0) && ($aos > ($start + $maxdt))) {
                 /* check whether we are within time limits;
                     maxdt = 0 mean no time limit.
                 */
@@ -217,7 +217,7 @@ 
                 $dt = $los - $aos;
 
                 /* get time step, which will give us the max number of entries */
-                $step = $dt / $this->numEntries;
+                $step = $dt/$this->numEntries;
 
                 /* but if this is smaller than the required resolution
                     we go with the resolution
@@ -369,9 +369,9 @@ 
         $solar_set = new Predict_ObsSet();
 
         /* FIXME: could be passed as parameter */
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
+        $obs_geodetic->lon   = $qth->lon*self::de2ra;
+        $obs_geodetic->lat   = $qth->lat*self::de2ra;
+        $obs_geodetic->alt   = $qth->alt/1000.0;
         $obs_geodetic->theta = 0;
 
         Predict_Solar::Calculate_Solar_Position($jul_utc, $solar_vector);
@@ -452,7 +452,7 @@ 
 
             /* coarse time steps */
             while (($sat->el < -1.0) && ($t <= ($start + $maxdt))) {
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+                $t -= 0.00035*($sat->el*(($sat->alt/8400.0) + 0.46) - 2.0);
                 $this->predict_calc($sat, $qth, $t);
             }
 
@@ -462,7 +462,7 @@ 
                 if (abs($sat->el) < 0.005) {
                     $aostime = $t;
                 } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
+                    $t -= $sat->el*sqrt($sat->alt)/530000.0;
                     $this->predict_calc($sat, $qth, $t);
                 }
             }
@@ -472,7 +472,7 @@ 
             /* coarse time steps */
             while ($sat->el < -1.0) {
 
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+                $t -= 0.00035*($sat->el*(($sat->alt/8400.0) + 0.46) - 2.0);
                 $this->predict_calc($sat, $qth, $t);
             }
 
@@ -482,7 +482,7 @@ 
                 if (abs($sat->el) < 0.005) {
                     $aostime = $t;
                 } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
+                    $t -= $sat->el*sqrt($sat->alt)/530000.0;
                     $this->predict_calc($sat, $qth, $t);
                 }
 
@@ -504,17 +504,17 @@ 
         $sat_geodetic = new Predict_Geodetic();
         $obs_geodetic = new Predict_Geodetic();
 
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
+        $obs_geodetic->lon   = $qth->lon*self::de2ra;
+        $obs_geodetic->lat   = $qth->lat*self::de2ra;
+        $obs_geodetic->alt   = $qth->alt/1000.0;
         $obs_geodetic->theta = 0;
 
         $sat->jul_utc = $t;
-        $sat->tsince = ($sat->jul_utc - $sat->jul_epoch) * self::xmnpda;
+        $sat->tsince = ($sat->jul_utc - $sat->jul_epoch)*self::xmnpda;
 
         /* call the norad routines according to the deep-space flag */
         $sgpsdp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+        if ($sat->flags&Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
             $sgpsdp->SDP4($sat, $sat->tsince);
         } else {
             $sgpsdp->SGP4($sat, $sat->tsince);
@@ -523,7 +523,7 @@ 
         Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
 
         /* get the velocity of the satellite */
-        $sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
+        $sat->vel->w = sqrt($sat->vel->x*$sat->vel->x + $sat->vel->y*$sat->vel->y + $sat->vel->z*$sat->vel->z);
         $sat->velo = $sat->vel->w;
         Predict_SGPObs::Calculate_Obs($sat->jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
         Predict_SGPObs::Calculate_LatLonAlt($sat->jul_utc, $sat->pos, $sat_geodetic);
@@ -544,16 +544,16 @@ 
         $sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
         $sat->alt = $sat_geodetic->alt;
         $sat->ma = Predict_Math::Degrees($sat->phase);
-        $sat->ma *= 256.0 / 360.0;
+        $sat->ma *= 256.0/360.0;
         $sat->phase = Predict_Math::Degrees($sat->phase);
 
         /* same formulas, but the one from predict is nicer */
         //sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
-        $sat->footprint = 12756.33 * acos(self::xkmper / (self::xkmper + $sat->alt));
+        $sat->footprint = 12756.33*acos(self::xkmper/(self::xkmper + $sat->alt));
         $age = $sat->jul_utc - $sat->jul_epoch;
-        $sat->orbit = floor(($sat->tle->xno * self::xmnpda / self::twopi +
-                        $age * $sat->tle->bstar * self::ae) * $age +
-                        $sat->tle->xmo / self::twopi) + $sat->tle->revnum - 1;
+        $sat->orbit = floor(($sat->tle->xno*self::xmnpda/self::twopi +
+                        $age*$sat->tle->bstar*self::ae)*$age +
+                        $sat->tle->xmo/self::twopi) + $sat->tle->revnum - 1;
     }
 
     /** Find the LOS time of the next pass.
@@ -585,7 +585,7 @@ 
         /* check whether satellite has aos */
         if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
             ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos ($sat, $qth)) {
+            !$this->has_aos($sat, $qth)) {
 
             return 0.0;
         }
@@ -607,14 +607,14 @@ 
 
             /* coarse steps */
             while (($sat->el >= 1.0) && ($t <= ($start + $maxdt))) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+                $t += cos(($sat->el - 1.0)*self::de2ra)*sqrt($sat->alt)/25000.0;
                 $this->predict_calc($sat, $qth, $t);
             }
 
             /* fine steps */
-            while (($lostime == 0.0) && ($t <= ($start + $maxdt)))  {
+            while (($lostime == 0.0) && ($t <= ($start + $maxdt))) {
 
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
+                $t += $sat->el*sqrt($sat->alt)/502500.0;
                 $this->predict_calc($sat, $qth, $t);
 
                 if (abs($sat->el) < 0.005) {
@@ -626,14 +626,14 @@ 
 
             /* coarse steps */
             while ($sat->el >= 1.0) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+                $t += cos(($sat->el - 1.0)*self::de2ra)*sqrt($sat->alt)/25000.0;
                 $this->predict_calc($sat, $qth, $t);
             }
 
             /* fine steps */
             while ($lostime == 0.0) {
 
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
+                $t += $sat->el*sqrt($sat->alt)/502500.0;
                 $this->predict_calc($sat, $qth, $t);
 
                 if (abs($sat->el) < 0.005)
@@ -701,10 +701,10 @@ 
                 $lin = self::pi - $lin;
             }
 
-            $sma = 331.25 * exp(log(1440.0 / $sat->meanmo) * (2.0 / 3.0));
-            $apogee = $sma * (1.0 + $sat->tle->eo) - self::xkmper;
+            $sma = 331.25*exp(log(1440.0/$sat->meanmo)*(2.0/3.0));
+            $apogee = $sma*(1.0 + $sat->tle->eo) - self::xkmper;
 
-            if ((acos(self::xkmper / ($apogee + self::xkmper)) + ($lin)) > abs($qth->lat * self::de2ra)) {
+            if ((acos(self::xkmper/($apogee + self::xkmper)) + ($lin)) > abs($qth->lat*self::de2ra)) {
                 $retcode = true;
             } else {
                 $retcode = false;
@@ -866,10 +866,10 @@ 
      */
     public function azDegreesToDirection($az = 0)
     {
-        $i = floor($az / 22.5);
-        $m = (22.5 * (2 * $i + 1)) / 2;
+        $i = floor($az/22.5);
+        $m = (22.5*(2*$i + 1))/2;
         $i = ($az >= $m) ? $i + 1 : $i;
 
-        return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i * 3, 3));
+        return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i*3, 3));
     }
 }

Braces +3 added lines, -2 removed lines

@@ -636,8 +636,9 @@
                 $t += $sat->el * sqrt($sat->alt) / 502500.0;
                 $this->predict_calc($sat, $qth, $t);
 
-                if (abs($sat->el) < 0.005)
-                    $lostime = $t;
+                if (abs($sat->el) < 0.005) {
+                                    $lostime = $t;
+                }
             }
         }
 

require/libs/Predict/Predict/Math.php

Doc Comments +16 added lines

@@ -42,6 +42,10 @@ 
     }
 
     /* Returns arccosine of rgument */
+
+    /**
+     * @param double $arg
+     */
     public static function ArcCos($arg)
     {
         return Predict::pio2 - self::ArcSin($arg);
@@ -68,6 +72,10 @@ 
     }
 
     /* Multiplies the vector v1 by the scalar k to produce the vector v2 */
+
+    /**
+     * @param integer $k
+     */
     public static function Scalar_Multiply($k, Predict_Vector $v1, Predict_Vector $v2)
     {
         $v2->x = $k * $v1->x;
@@ -155,6 +163,10 @@ 
     }
 
     /* Returns arg1 mod arg2 */
+
+    /**
+     * @param double $arg1
+     */
     public static function Modulus($arg1, $arg2)
     {
         $ret_val  = $arg1;
@@ -169,6 +181,10 @@ 
     }
 
     /* Returns fractional part of double argument */
+
+    /**
+     * @param double $arg
+     */
     public static function Frac($arg)
     {
         return $arg - floor($arg);

Indentation +174 added lines, -174 removed lines

@@ -19,178 +19,178 @@
  */
 class Predict_Math
 {
-    /* Returns sign of a float */
-    public static function Sign($arg)
-    {
-        if ($arg > 0 ) {
-            return 1;
-        } else if ($arg < 0 ) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-
-    /* Returns the arcsine of the argument */
-    public static function ArcSin($arg)
-    {
-        if (abs($arg) >= 1 ) {
-            return (self::Sign($arg) * Predict::pio2);
-        } else {
-            return(atan($arg / sqrt(1 - $arg * $arg)));
-        }
-    }
-
-    /* Returns arccosine of rgument */
-    public static function ArcCos($arg)
-    {
-        return Predict::pio2 - self::ArcSin($arg);
-    }
-
-    /* Adds vectors v1 and v2 together to produce v3 */
-    public static function Vec_Add(Predict_Vector $v1, Predict_Vector $v2, Predict_Vector $v3)
-    {
-        $v3->x = $v1->x + $v2->x;
-        $v3->y = $v1->y + $v2->y;
-        $v3->z = $v1->z + $v2->z;
-
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
-    }
-
-    /* Subtracts vector v2 from v1 to produce v3 */
-    public static function Vec_Sub(Predict_Vector $v1, Predict_Vector $v2, Predict_Vector $v3)
-    {
-        $v3->x = $v1->x - $v2->x;
-        $v3->y = $v1->y - $v2->y;
-        $v3->z = $v1->z - $v2->z;
-
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
-    }
-
-    /* Multiplies the vector v1 by the scalar k to produce the vector v2 */
-    public static function Scalar_Multiply($k, Predict_Vector $v1, Predict_Vector $v2)
-    {
-        $v2->x = $k * $v1->x;
-        $v2->y = $k * $v1->y;
-        $v2->z = $k * $v1->z;
-        $v2->w = abs($k) * $v1->w;
-    }
-
-    /* Multiplies the vector v1 by the scalar k */
-    public static function Scale_Vector($k, Predict_Vector $v)
-    {
-        $v->x *= $k;
-        $v->y *= $k;
-        $v->z *= $k;
-
-        $v->w = sqrt($v->x * $v->x + $v->y * $v->y + $v->z * $v->z);
-    }
-
-    /* Returns the dot product of two vectors */
-    public static function Dot(Predict_Vector $v1, Predict_Vector $v2)
-    {
-        return ($v1->x * $v2->x + $v1->y * $v2->y + $v1->z * $v2->z);
-    }
-
-    /* Calculates the angle between vectors v1 and v2 */
-    public static function Angle(Predict_Vector $v1, Predict_Vector $v2)
-    {
-        $v1->w = sqrt($v1->x * $v1->x + $v1->y * $v1->y + $v1->z * $v1->z);
-        $v2->w = sqrt($v2->x * $v2->x + $v2->y * $v2->y + $v2->z * $v2->z);
-        return (self::ArcCos(self::Dot($v1, $v2) / ($v1->w * $v2->w)));
-    }
-
-    /* Produces cross product of v1 and v2, and returns in v3 */
-    public static function Cross(Predict_Vector $v1, Predict_Vector $v2 ,Predict_Vector $v3)
-    {
-        $v3->x = $v1->y * $v2->z - $v1->z * $v2->y;
-        $v3->y = $v1->z * $v2->x - $v1->x * $v2->z;
-        $v3->z = $v1->x * $v2->y - $v1->y * $v2->x;
-
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
-    }
-
-    /* Normalizes a vector */
-    public static function Normalize(Predict_Vector $v )
-    {
-        $v->x /= $v->w;
-        $v->y /= $v->w;
-        $v->z /= $v->w;
-    }
-
-    /* Four-quadrant arctan function */
-    public static function AcTan($sinx, $cosx)
-    {
-        if ($cosx == 0) {
-            if ($sinx > 0) {
-                return Predict::pio2;
-            } else {
-                return Predict::x3pio2;
-            }
-        } else {
-            if ($cosx > 0) {
-                if ($sinx > 0) {
-                    return atan($sinx / $cosx);
-                } else {
-                    return Predict::twopi + atan($sinx / $cosx);
-                }
-            } else {
-                return Predict::pi + atan($sinx / $cosx);
-            }
-        }
-    }
-
-    /* Returns mod 2pi of argument */
-    public static function FMod2p($x)
-    {
-        $ret_val  = $x;
-        $i        = (int) ($ret_val / Predict::twopi);
-        $ret_val -= $i * Predict::twopi;
-
-        if ($ret_val < 0) {
-            $ret_val += Predict::twopi;
-        }
-
-        return $ret_val;
-    }
-
-    /* Returns arg1 mod arg2 */
-    public static function Modulus($arg1, $arg2)
-    {
-        $ret_val  = $arg1;
-        $i        = (int) ($ret_val / $arg2);
-        $ret_val -= $i * $arg2;
-
-        if ($ret_val < 0) {
-            $ret_val += $arg2;
-        }
-
-        return $ret_val;
-    }
-
-    /* Returns fractional part of double argument */
-    public static function Frac($arg)
-    {
-        return $arg - floor($arg);
-    }
-
-    /* Converts the satellite's position and velocity  */
-    /* vectors from normalised values to km and km/sec */
-    public static function Convert_Sat_State(Predict_Vector $pos, Predict_Vector $vel)
-    {
-        self::Scale_Vector(Predict::xkmper, $pos);
-        self::Scale_Vector(Predict::xkmper * Predict::xmnpda / Predict::secday, $vel);
-    }
-
-    /* Returns angle in radians from arg in degrees */
-    public static function Radians($arg)
-    {
-        return $arg * Predict::de2ra;
-    }
-
-    /* Returns angle in degrees from arg in rads */
-    public static function Degrees($arg)
-    {
-      return $arg / Predict::de2ra;
-    }
+	/* Returns sign of a float */
+	public static function Sign($arg)
+	{
+		if ($arg > 0 ) {
+			return 1;
+		} else if ($arg < 0 ) {
+			return -1;
+		} else {
+			return 0;
+		}
+	}
+
+	/* Returns the arcsine of the argument */
+	public static function ArcSin($arg)
+	{
+		if (abs($arg) >= 1 ) {
+			return (self::Sign($arg) * Predict::pio2);
+		} else {
+			return(atan($arg / sqrt(1 - $arg * $arg)));
+		}
+	}
+
+	/* Returns arccosine of rgument */
+	public static function ArcCos($arg)
+	{
+		return Predict::pio2 - self::ArcSin($arg);
+	}
+
+	/* Adds vectors v1 and v2 together to produce v3 */
+	public static function Vec_Add(Predict_Vector $v1, Predict_Vector $v2, Predict_Vector $v3)
+	{
+		$v3->x = $v1->x + $v2->x;
+		$v3->y = $v1->y + $v2->y;
+		$v3->z = $v1->z + $v2->z;
+
+		$v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+	}
+
+	/* Subtracts vector v2 from v1 to produce v3 */
+	public static function Vec_Sub(Predict_Vector $v1, Predict_Vector $v2, Predict_Vector $v3)
+	{
+		$v3->x = $v1->x - $v2->x;
+		$v3->y = $v1->y - $v2->y;
+		$v3->z = $v1->z - $v2->z;
+
+		$v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+	}
+
+	/* Multiplies the vector v1 by the scalar k to produce the vector v2 */
+	public static function Scalar_Multiply($k, Predict_Vector $v1, Predict_Vector $v2)
+	{
+		$v2->x = $k * $v1->x;
+		$v2->y = $k * $v1->y;
+		$v2->z = $k * $v1->z;
+		$v2->w = abs($k) * $v1->w;
+	}
+
+	/* Multiplies the vector v1 by the scalar k */
+	public static function Scale_Vector($k, Predict_Vector $v)
+	{
+		$v->x *= $k;
+		$v->y *= $k;
+		$v->z *= $k;
+
+		$v->w = sqrt($v->x * $v->x + $v->y * $v->y + $v->z * $v->z);
+	}
+
+	/* Returns the dot product of two vectors */
+	public static function Dot(Predict_Vector $v1, Predict_Vector $v2)
+	{
+		return ($v1->x * $v2->x + $v1->y * $v2->y + $v1->z * $v2->z);
+	}
+
+	/* Calculates the angle between vectors v1 and v2 */
+	public static function Angle(Predict_Vector $v1, Predict_Vector $v2)
+	{
+		$v1->w = sqrt($v1->x * $v1->x + $v1->y * $v1->y + $v1->z * $v1->z);
+		$v2->w = sqrt($v2->x * $v2->x + $v2->y * $v2->y + $v2->z * $v2->z);
+		return (self::ArcCos(self::Dot($v1, $v2) / ($v1->w * $v2->w)));
+	}
+
+	/* Produces cross product of v1 and v2, and returns in v3 */
+	public static function Cross(Predict_Vector $v1, Predict_Vector $v2 ,Predict_Vector $v3)
+	{
+		$v3->x = $v1->y * $v2->z - $v1->z * $v2->y;
+		$v3->y = $v1->z * $v2->x - $v1->x * $v2->z;
+		$v3->z = $v1->x * $v2->y - $v1->y * $v2->x;
+
+		$v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+	}
+
+	/* Normalizes a vector */
+	public static function Normalize(Predict_Vector $v )
+	{
+		$v->x /= $v->w;
+		$v->y /= $v->w;
+		$v->z /= $v->w;
+	}
+
+	/* Four-quadrant arctan function */
+	public static function AcTan($sinx, $cosx)
+	{
+		if ($cosx == 0) {
+			if ($sinx > 0) {
+				return Predict::pio2;
+			} else {
+				return Predict::x3pio2;
+			}
+		} else {
+			if ($cosx > 0) {
+				if ($sinx > 0) {
+					return atan($sinx / $cosx);
+				} else {
+					return Predict::twopi + atan($sinx / $cosx);
+				}
+			} else {
+				return Predict::pi + atan($sinx / $cosx);
+			}
+		}
+	}
+
+	/* Returns mod 2pi of argument */
+	public static function FMod2p($x)
+	{
+		$ret_val  = $x;
+		$i        = (int) ($ret_val / Predict::twopi);
+		$ret_val -= $i * Predict::twopi;
+
+		if ($ret_val < 0) {
+			$ret_val += Predict::twopi;
+		}
+
+		return $ret_val;
+	}
+
+	/* Returns arg1 mod arg2 */
+	public static function Modulus($arg1, $arg2)
+	{
+		$ret_val  = $arg1;
+		$i        = (int) ($ret_val / $arg2);
+		$ret_val -= $i * $arg2;
+
+		if ($ret_val < 0) {
+			$ret_val += $arg2;
+		}
+
+		return $ret_val;
+	}
+
+	/* Returns fractional part of double argument */
+	public static function Frac($arg)
+	{
+		return $arg - floor($arg);
+	}
+
+	/* Converts the satellite's position and velocity  */
+	/* vectors from normalised values to km and km/sec */
+	public static function Convert_Sat_State(Predict_Vector $pos, Predict_Vector $vel)
+	{
+		self::Scale_Vector(Predict::xkmper, $pos);
+		self::Scale_Vector(Predict::xkmper * Predict::xmnpda / Predict::secday, $vel);
+	}
+
+	/* Returns angle in radians from arg in degrees */
+	public static function Radians($arg)
+	{
+		return $arg * Predict::de2ra;
+	}
+
+	/* Returns angle in degrees from arg in rads */
+	public static function Degrees($arg)
+	{
+	  return $arg / Predict::de2ra;
+	}
 }

Spacing +32 added lines, -32 removed lines

@@ -22,9 +22,9 @@ 
     /* Returns sign of a float */
     public static function Sign($arg)
     {
-        if ($arg > 0 ) {
+        if ($arg > 0) {
             return 1;
-        } else if ($arg < 0 ) {
+        } else if ($arg < 0) {
             return -1;
         } else {
             return 0;
@@ -34,10 +34,10 @@ 
     /* Returns the arcsine of the argument */
     public static function ArcSin($arg)
     {
-        if (abs($arg) >= 1 ) {
-            return (self::Sign($arg) * Predict::pio2);
+        if (abs($arg) >= 1) {
+            return (self::Sign($arg)*Predict::pio2);
         } else {
-            return(atan($arg / sqrt(1 - $arg * $arg)));
+            return(atan($arg/sqrt(1 - $arg*$arg)));
         }
     }
 
@@ -54,7 +54,7 @@ 
         $v3->y = $v1->y + $v2->y;
         $v3->z = $v1->z + $v2->z;
 
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+        $v3->w = sqrt($v3->x*$v3->x + $v3->y*$v3->y + $v3->z*$v3->z);
     }
 
     /* Subtracts vector v2 from v1 to produce v3 */
@@ -64,16 +64,16 @@ 
         $v3->y = $v1->y - $v2->y;
         $v3->z = $v1->z - $v2->z;
 
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+        $v3->w = sqrt($v3->x*$v3->x + $v3->y*$v3->y + $v3->z*$v3->z);
     }
 
     /* Multiplies the vector v1 by the scalar k to produce the vector v2 */
     public static function Scalar_Multiply($k, Predict_Vector $v1, Predict_Vector $v2)
     {
-        $v2->x = $k * $v1->x;
-        $v2->y = $k * $v1->y;
-        $v2->z = $k * $v1->z;
-        $v2->w = abs($k) * $v1->w;
+        $v2->x = $k*$v1->x;
+        $v2->y = $k*$v1->y;
+        $v2->z = $k*$v1->z;
+        $v2->w = abs($k)*$v1->w;
     }
 
     /* Multiplies the vector v1 by the scalar k */
@@ -83,35 +83,35 @@ 
         $v->y *= $k;
         $v->z *= $k;
 
-        $v->w = sqrt($v->x * $v->x + $v->y * $v->y + $v->z * $v->z);
+        $v->w = sqrt($v->x*$v->x + $v->y*$v->y + $v->z*$v->z);
     }
 
     /* Returns the dot product of two vectors */
     public static function Dot(Predict_Vector $v1, Predict_Vector $v2)
     {
-        return ($v1->x * $v2->x + $v1->y * $v2->y + $v1->z * $v2->z);
+        return ($v1->x*$v2->x + $v1->y*$v2->y + $v1->z*$v2->z);
     }
 
     /* Calculates the angle between vectors v1 and v2 */
     public static function Angle(Predict_Vector $v1, Predict_Vector $v2)
     {
-        $v1->w = sqrt($v1->x * $v1->x + $v1->y * $v1->y + $v1->z * $v1->z);
-        $v2->w = sqrt($v2->x * $v2->x + $v2->y * $v2->y + $v2->z * $v2->z);
-        return (self::ArcCos(self::Dot($v1, $v2) / ($v1->w * $v2->w)));
+        $v1->w = sqrt($v1->x*$v1->x + $v1->y*$v1->y + $v1->z*$v1->z);
+        $v2->w = sqrt($v2->x*$v2->x + $v2->y*$v2->y + $v2->z*$v2->z);
+        return (self::ArcCos(self::Dot($v1, $v2)/($v1->w*$v2->w)));
     }
 
     /* Produces cross product of v1 and v2, and returns in v3 */
-    public static function Cross(Predict_Vector $v1, Predict_Vector $v2 ,Predict_Vector $v3)
+    public static function Cross(Predict_Vector $v1, Predict_Vector $v2, Predict_Vector $v3)
     {
-        $v3->x = $v1->y * $v2->z - $v1->z * $v2->y;
-        $v3->y = $v1->z * $v2->x - $v1->x * $v2->z;
-        $v3->z = $v1->x * $v2->y - $v1->y * $v2->x;
+        $v3->x = $v1->y*$v2->z - $v1->z*$v2->y;
+        $v3->y = $v1->z*$v2->x - $v1->x*$v2->z;
+        $v3->z = $v1->x*$v2->y - $v1->y*$v2->x;
 
-        $v3->w = sqrt($v3->x * $v3->x + $v3->y * $v3->y + $v3->z * $v3->z);
+        $v3->w = sqrt($v3->x*$v3->x + $v3->y*$v3->y + $v3->z*$v3->z);
     }
 
     /* Normalizes a vector */
-    public static function Normalize(Predict_Vector $v )
+    public static function Normalize(Predict_Vector $v)
     {
         $v->x /= $v->w;
         $v->y /= $v->w;
@@ -130,12 +130,12 @@ 
         } else {
             if ($cosx > 0) {
                 if ($sinx > 0) {
-                    return atan($sinx / $cosx);
+                    return atan($sinx/$cosx);
                 } else {
-                    return Predict::twopi + atan($sinx / $cosx);
+                    return Predict::twopi + atan($sinx/$cosx);
                 }
             } else {
-                return Predict::pi + atan($sinx / $cosx);
+                return Predict::pi + atan($sinx/$cosx);
             }
         }
     }
@@ -144,8 +144,8 @@ 
     public static function FMod2p($x)
     {
         $ret_val  = $x;
-        $i        = (int) ($ret_val / Predict::twopi);
-        $ret_val -= $i * Predict::twopi;
+        $i        = (int) ($ret_val/Predict::twopi);
+        $ret_val -= $i*Predict::twopi;
 
         if ($ret_val < 0) {
             $ret_val += Predict::twopi;
@@ -158,8 +158,8 @@ 
     public static function Modulus($arg1, $arg2)
     {
         $ret_val  = $arg1;
-        $i        = (int) ($ret_val / $arg2);
-        $ret_val -= $i * $arg2;
+        $i        = (int) ($ret_val/$arg2);
+        $ret_val -= $i*$arg2;
 
         if ($ret_val < 0) {
             $ret_val += $arg2;
@@ -179,18 +179,18 @@ 
     public static function Convert_Sat_State(Predict_Vector $pos, Predict_Vector $vel)
     {
         self::Scale_Vector(Predict::xkmper, $pos);
-        self::Scale_Vector(Predict::xkmper * Predict::xmnpda / Predict::secday, $vel);
+        self::Scale_Vector(Predict::xkmper*Predict::xmnpda/Predict::secday, $vel);
     }
 
     /* Returns angle in radians from arg in degrees */
     public static function Radians($arg)
     {
-        return $arg * Predict::de2ra;
+        return $arg*Predict::de2ra;
     }
 
     /* Returns angle in degrees from arg in rads */
     public static function Degrees($arg)
     {
-      return $arg / Predict::de2ra;
+      return $arg/Predict::de2ra;
     }
 }

require/libs/Predict/Predict/Sat.php

Doc Comments +7 added lines, -7 removed lines

@@ -124,8 +124,8 @@ 
     }
 
     /** Initialise satellite data.
-     *  @param sat The satellite to initialise.
-     *  @param qth Optional QTH info, use (0,0) if NULL.
+     *  @param sat Predict_Sat satellite to initialise.
+     *  @param qth Predict_QTH QTH info, use (0,0) if NULL.
      *
      * This function calculates the satellite data at t = 0, ie. epoch time
      * The function is called automatically by gtk_sat_data_read_sat.
@@ -216,8 +216,8 @@ 
 
     /** Determinte whether satellite is in geostationary orbit.
      *  @author John A. Magliacane, KD2BD
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to be in geostationary orbit,
+     *  @param sat Predict_Sat to satellite data.
+     *  @return boolean if the satellite appears to be in geostationary orbit,
      *          FALSE otherwise.
      *
      * A satellite is in geostationary orbit if
@@ -239,8 +239,8 @@ 
     /** Determine whether satellite has decayed.
      *  @author John A. Magliacane, KD2BD
      *  @author Alexandru Csete, OZ9AEC
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to have decayed, FALSE otherwise.
+     *  @param sat Predict_Sat to satellite data.
+     *  @return boolean if the satellite appears to have decayed, FALSE otherwise.
      *  @bug Modified version of the predict code but it is not tested.
      *
      * A satellite is decayed if
@@ -273,7 +273,7 @@ 
      * @param float       $time The daynum the satellite is calculated for
      * @param Predict_QTH $qth  The observer location
      *
-     * @return null on failure, float otherwise
+     * @return null|double on failure, float otherwise
      */
     public function calculateApparentMagnitude($time, Predict_QTH $qth)
     {

Indentation +296 added lines, -296 removed lines

@@ -22,304 +22,304 @@
  */
 class Predict_Sat
 {
-    // Fifth root of a hundred, used for magnitude calculation
-    const POGSONS_RATIO = 2.5118864315096;
-
-    public $name     = null;
-    public $nickname = null;
-    public $website  = null;
-
-    public $tle      = null;   /*!< Keplerian elements */
-    public $flags    = 0;      /*!< Flags for algo ctrl */
-    public $sgps     = null;
-    public $dps      = null;
-    public $deep_arg = null;
-    public $pos      = null;   /*!< Raw position and range */
-    public $vel      = null;   /*!< Raw velocity */
-
-    /*** FIXME: REMOVE */
-    public $bearing = null;   /*!< Az, El, range and vel */
-    public $astro   = null;   /*!< Ra and Decl */
-    /*** END */
-
-    /* time keeping fields */
-    public $jul_epoch = null;
-    public $jul_utc   = null;
-    public $tsince    = null;
-    public $aos       = null;    /*!< Next AOS. */
-    public $los       = null;    /*!< Next LOS */
-
-    public $az         = null;   /*!< Azimuth [deg] */
-    public $el         = null;   /*!< Elevation [deg] */
-    public $range      = null;   /*!< Range [km] */
-    public $range_rate = null;   /*!< Range Rate [km/sec] */
-    public $ra         = null;   /*!< Right Ascension [deg] */
-    public $dec        = null;   /*!< Declination [deg] */
-    public $ssplat     = null;   /*!< SSP latitude [deg] */
-    public $ssplon     = null;   /*!< SSP longitude [deg] */
-    public $alt        = null;   /*!< altitude [km] */
-    public $velo       = null;   /*!< velocity [km/s] */
-    public $ma         = null;   /*!< mean anomaly */
-    public $footprint  = null;   /*!< footprint */
-    public $phase      = null;   /*!< orbit phase */
-    public $meanmo     = null;   /*!< mean motion kept in rev/day */
-    public $orbit      = null;   /*!< orbit number */
-    public $otype      = null;   /*!< orbit type. */
-
-    public function __construct(Predict_TLE $tle)
-    {
-        $headerParts    = explode(' ', $tle->header);
-        $this->name     = $headerParts[0];
-        $this->nickname = $this->name;
-        $this->tle      = $tle;
-        $this->pos      = new Predict_Vector();
-        $this->vel      = new Predict_Vector();
-        $this->sgps     = new Predict_SGSDPStatic();
-        $this->deep_arg = new Predict_DeepArg();
-        $this->dps      = new Predict_DeepStatic();
-
-        $this->select_ephemeris();
-        $this->sat_data_init_sat($this);
-    }
-
-    /* Selects the apropriate ephemeris type to be used */
-    /* for predictions according to the data in the TLE */
-    /* It also processes values in the tle set so that  */
-    /* they are apropriate for the sgp4/sdp4 routines   */
-    public function select_ephemeris()
-    {
-        /* Preprocess tle set */
-        $this->tle->xnodeo *= Predict::de2ra;
-        $this->tle->omegao *= Predict::de2ra;
-        $this->tle->xmo    *= Predict::de2ra;
-        $this->tle->xincl  *= Predict::de2ra;
-        $temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
-
-        /* store mean motion before conversion */
-        $this->meanmo       = $this->tle->xno;
-        $this->tle->xno     = $this->tle->xno * $temp * Predict::xmnpda;
-        $this->tle->xndt2o *= $temp;
-        $this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
-        $this->tle->bstar  /= Predict::ae;
-
-        /* Period > 225 minutes is deep space */
-        $dd1 = Predict::xke / $this->tle->xno;
-        $dd2 = Predict::tothrd;
-        $a1 = pow($dd1, $dd2);
-        $r1 = cos($this->tle->xincl);
-        $dd1 = 1.0 - $this->tle->eo * $this->tle->eo;
-        $temp = Predict::ck2 * 1.5 * ($r1 * $r1 * 3.0 - 1.0) / pow($dd1, 1.5);
-        $del1 = $temp / ($a1 * $a1);
-        $ao = $a1 * (1.0 - $del1 * (Predict::tothrd * 0.5 + $del1 *
-                                 ($del1 * 1.654320987654321 + 1.0)));
-        $delo = $temp / ($ao * $ao);
-        $xnodp = $this->tle->xno / ($delo + 1.0);
-
-        /* Select a deep-space/near-earth ephemeris */
-        if (Predict::twopi / $xnodp / Predict::xmnpda >= .15625) {
-            $this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
-        } else {
-            $this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
-        }
-    }
-
-    /** Initialise satellite data.
-     *  @param sat The satellite to initialise.
-     *  @param qth Optional QTH info, use (0,0) if NULL.
-     *
-     * This function calculates the satellite data at t = 0, ie. epoch time
-     * The function is called automatically by gtk_sat_data_read_sat.
-     */
-    public function sat_data_init_sat(Predict_Sat $sat, Predict_QTH $qth = null)
-    {
-        $obs_geodetic = new Predict_Geodetic();
-        $obs_set = new Predict_ObsSet();
-        $sat_geodetic = new Predict_Geodetic();
-        /* double jul_utc, age; */
-
-        $jul_utc = Predict_Time::Julian_Date_of_Epoch($sat->tle->epoch); // => tsince = 0.0
-        $sat->jul_epoch = $jul_utc;
-
-        /* initialise observer location */
-        if ($qth != null) {
-            $obs_geodetic->lon = $qth->lon * Predict::de2ra;
-            $obs_geodetic->lat = $qth->lat * Predict::de2ra;
-            $obs_geodetic->alt = $qth->alt / 1000.0;
-            $obs_geodetic->theta = 0;
-        }
-        else {
-            $obs_geodetic->lon = 0.0;
-            $obs_geodetic->lat = 0.0;
-            $obs_geodetic->alt = 0.0;
-            $obs_geodetic->theta = 0;
-        }
-
-        /* execute computations */
-        $sdpsgp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
-            $sdpsgp->SDP4($sat, 0.0);
-        } else {
-            $sdpsgp->SGP4($sat, 0.0);
-        }
-
-        /* scale position and velocity to km and km/sec */
-        Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
-
-        /* get the velocity of the satellite */
-        $sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
-        $sat->velo = $sat->vel->w;
-        Predict_SGPObs::Calculate_Obs($jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
-        Predict_SGPObs::Calculate_LatLonAlt($jul_utc, $sat->pos, $sat_geodetic);
-
-        while ($sat_geodetic->lon < -Predict::pi) {
-            $sat_geodetic->lon += Predict::twopi;
-        }
-
-        while ($sat_geodetic->lon > Predict::pi) {
-            $sat_geodetic->lon -= Predict::twopi;
-        }
-
-        $sat->az = Predict_Math::Degrees($obs_set->az);
-        $sat->el = Predict_Math::Degrees($obs_set->el);
-        $sat->range = $obs_set->range;
-        $sat->range_rate = $obs_set->range_rate;
-        $sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
-        $sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
-        $sat->alt = $sat_geodetic->alt;
-        $sat->ma = Predict_Math::Degrees($sat->phase);
-        $sat->ma *= 256.0 / 360.0;
-        $sat->footprint = 2.0 * Predict::xkmper * acos (Predict::xkmper/$sat->pos->w);
-        $age = 0.0;
-        $sat->orbit = floor(($sat->tle->xno * Predict::xmnpda / Predict::twopi +
-                                   $age * $sat->tle->bstar * Predict::ae) * $age +
-                                  $sat->tle->xmo / Predict::twopi) + $sat->tle->revnum - 1;
-
-        /* orbit type */
-        $sat->otype = $sat->get_orbit_type($sat);
-    }
-
-    public function get_orbit_type(Predict_Sat $sat)
-    {
-         $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
-
-         if ($this->geostationary($sat)) {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_GEO;
-         } else if ($this->decayed($sat)) {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_DECAYED;
-         } else {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
-         }
-
-         return $orbit;
-    }
-
-
-    /** Determinte whether satellite is in geostationary orbit.
-     *  @author John A. Magliacane, KD2BD
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to be in geostationary orbit,
-     *          FALSE otherwise.
-     *
-     * A satellite is in geostationary orbit if
-     *
-     *     fabs (sat.meanmotion - 1.0027) < 0.0002
-     *
-     * Note: Appearantly, the mean motion can deviate much more from 1.0027 than 0.0002
-     */
-    public function geostationary(Predict_Sat $sat)
-    {
-         if (abs($sat->meanmo - 1.0027) < 0.0002) {
-              return true;
-         } else {
-              return false;
-        }
-    }
-
-
-    /** Determine whether satellite has decayed.
-     *  @author John A. Magliacane, KD2BD
-     *  @author Alexandru Csete, OZ9AEC
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to have decayed, FALSE otherwise.
-     *  @bug Modified version of the predict code but it is not tested.
-     *
-     * A satellite is decayed if
-     *
-     *    satepoch + ((16.666666 - sat.meanmo) / (10.0*fabs(sat.drag))) < "now"
-     *
-     */
-    public function decayed(Predict_Sat $sat)
-    {
-        /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
+	// Fifth root of a hundred, used for magnitude calculation
+	const POGSONS_RATIO = 2.5118864315096;
+
+	public $name     = null;
+	public $nickname = null;
+	public $website  = null;
+
+	public $tle      = null;   /*!< Keplerian elements */
+	public $flags    = 0;      /*!< Flags for algo ctrl */
+	public $sgps     = null;
+	public $dps      = null;
+	public $deep_arg = null;
+	public $pos      = null;   /*!< Raw position and range */
+	public $vel      = null;   /*!< Raw velocity */
+
+	/*** FIXME: REMOVE */
+	public $bearing = null;   /*!< Az, El, range and vel */
+	public $astro   = null;   /*!< Ra and Decl */
+	/*** END */
+
+	/* time keeping fields */
+	public $jul_epoch = null;
+	public $jul_utc   = null;
+	public $tsince    = null;
+	public $aos       = null;    /*!< Next AOS. */
+	public $los       = null;    /*!< Next LOS */
+
+	public $az         = null;   /*!< Azimuth [deg] */
+	public $el         = null;   /*!< Elevation [deg] */
+	public $range      = null;   /*!< Range [km] */
+	public $range_rate = null;   /*!< Range Rate [km/sec] */
+	public $ra         = null;   /*!< Right Ascension [deg] */
+	public $dec        = null;   /*!< Declination [deg] */
+	public $ssplat     = null;   /*!< SSP latitude [deg] */
+	public $ssplon     = null;   /*!< SSP longitude [deg] */
+	public $alt        = null;   /*!< altitude [km] */
+	public $velo       = null;   /*!< velocity [km/s] */
+	public $ma         = null;   /*!< mean anomaly */
+	public $footprint  = null;   /*!< footprint */
+	public $phase      = null;   /*!< orbit phase */
+	public $meanmo     = null;   /*!< mean motion kept in rev/day */
+	public $orbit      = null;   /*!< orbit number */
+	public $otype      = null;   /*!< orbit type. */
+
+	public function __construct(Predict_TLE $tle)
+	{
+		$headerParts    = explode(' ', $tle->header);
+		$this->name     = $headerParts[0];
+		$this->nickname = $this->name;
+		$this->tle      = $tle;
+		$this->pos      = new Predict_Vector();
+		$this->vel      = new Predict_Vector();
+		$this->sgps     = new Predict_SGSDPStatic();
+		$this->deep_arg = new Predict_DeepArg();
+		$this->dps      = new Predict_DeepStatic();
+
+		$this->select_ephemeris();
+		$this->sat_data_init_sat($this);
+	}
+
+	/* Selects the apropriate ephemeris type to be used */
+	/* for predictions according to the data in the TLE */
+	/* It also processes values in the tle set so that  */
+	/* they are apropriate for the sgp4/sdp4 routines   */
+	public function select_ephemeris()
+	{
+		/* Preprocess tle set */
+		$this->tle->xnodeo *= Predict::de2ra;
+		$this->tle->omegao *= Predict::de2ra;
+		$this->tle->xmo    *= Predict::de2ra;
+		$this->tle->xincl  *= Predict::de2ra;
+		$temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
+
+		/* store mean motion before conversion */
+		$this->meanmo       = $this->tle->xno;
+		$this->tle->xno     = $this->tle->xno * $temp * Predict::xmnpda;
+		$this->tle->xndt2o *= $temp;
+		$this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
+		$this->tle->bstar  /= Predict::ae;
+
+		/* Period > 225 minutes is deep space */
+		$dd1 = Predict::xke / $this->tle->xno;
+		$dd2 = Predict::tothrd;
+		$a1 = pow($dd1, $dd2);
+		$r1 = cos($this->tle->xincl);
+		$dd1 = 1.0 - $this->tle->eo * $this->tle->eo;
+		$temp = Predict::ck2 * 1.5 * ($r1 * $r1 * 3.0 - 1.0) / pow($dd1, 1.5);
+		$del1 = $temp / ($a1 * $a1);
+		$ao = $a1 * (1.0 - $del1 * (Predict::tothrd * 0.5 + $del1 *
+								 ($del1 * 1.654320987654321 + 1.0)));
+		$delo = $temp / ($ao * $ao);
+		$xnodp = $this->tle->xno / ($delo + 1.0);
+
+		/* Select a deep-space/near-earth ephemeris */
+		if (Predict::twopi / $xnodp / Predict::xmnpda >= .15625) {
+			$this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
+		} else {
+			$this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
+		}
+	}
+
+	/** Initialise satellite data.
+	 *  @param sat The satellite to initialise.
+	 *  @param qth Optional QTH info, use (0,0) if NULL.
+	 *
+	 * This function calculates the satellite data at t = 0, ie. epoch time
+	 * The function is called automatically by gtk_sat_data_read_sat.
+	 */
+	public function sat_data_init_sat(Predict_Sat $sat, Predict_QTH $qth = null)
+	{
+		$obs_geodetic = new Predict_Geodetic();
+		$obs_set = new Predict_ObsSet();
+		$sat_geodetic = new Predict_Geodetic();
+		/* double jul_utc, age; */
+
+		$jul_utc = Predict_Time::Julian_Date_of_Epoch($sat->tle->epoch); // => tsince = 0.0
+		$sat->jul_epoch = $jul_utc;
+
+		/* initialise observer location */
+		if ($qth != null) {
+			$obs_geodetic->lon = $qth->lon * Predict::de2ra;
+			$obs_geodetic->lat = $qth->lat * Predict::de2ra;
+			$obs_geodetic->alt = $qth->alt / 1000.0;
+			$obs_geodetic->theta = 0;
+		}
+		else {
+			$obs_geodetic->lon = 0.0;
+			$obs_geodetic->lat = 0.0;
+			$obs_geodetic->alt = 0.0;
+			$obs_geodetic->theta = 0;
+		}
+
+		/* execute computations */
+		$sdpsgp = Predict_SGPSDP::getInstance($sat);
+		if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+			$sdpsgp->SDP4($sat, 0.0);
+		} else {
+			$sdpsgp->SGP4($sat, 0.0);
+		}
+
+		/* scale position and velocity to km and km/sec */
+		Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
+
+		/* get the velocity of the satellite */
+		$sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
+		$sat->velo = $sat->vel->w;
+		Predict_SGPObs::Calculate_Obs($jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
+		Predict_SGPObs::Calculate_LatLonAlt($jul_utc, $sat->pos, $sat_geodetic);
+
+		while ($sat_geodetic->lon < -Predict::pi) {
+			$sat_geodetic->lon += Predict::twopi;
+		}
+
+		while ($sat_geodetic->lon > Predict::pi) {
+			$sat_geodetic->lon -= Predict::twopi;
+		}
+
+		$sat->az = Predict_Math::Degrees($obs_set->az);
+		$sat->el = Predict_Math::Degrees($obs_set->el);
+		$sat->range = $obs_set->range;
+		$sat->range_rate = $obs_set->range_rate;
+		$sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
+		$sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
+		$sat->alt = $sat_geodetic->alt;
+		$sat->ma = Predict_Math::Degrees($sat->phase);
+		$sat->ma *= 256.0 / 360.0;
+		$sat->footprint = 2.0 * Predict::xkmper * acos (Predict::xkmper/$sat->pos->w);
+		$age = 0.0;
+		$sat->orbit = floor(($sat->tle->xno * Predict::xmnpda / Predict::twopi +
+								   $age * $sat->tle->bstar * Predict::ae) * $age +
+								  $sat->tle->xmo / Predict::twopi) + $sat->tle->revnum - 1;
+
+		/* orbit type */
+		$sat->otype = $sat->get_orbit_type($sat);
+	}
+
+	public function get_orbit_type(Predict_Sat $sat)
+	{
+		 $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
+
+		 if ($this->geostationary($sat)) {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_GEO;
+		 } else if ($this->decayed($sat)) {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_DECAYED;
+		 } else {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
+		 }
+
+		 return $orbit;
+	}
+
+
+	/** Determinte whether satellite is in geostationary orbit.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param sat Pointer to satellite data.
+	 *  @return TRUE if the satellite appears to be in geostationary orbit,
+	 *          FALSE otherwise.
+	 *
+	 * A satellite is in geostationary orbit if
+	 *
+	 *     fabs (sat.meanmotion - 1.0027) < 0.0002
+	 *
+	 * Note: Appearantly, the mean motion can deviate much more from 1.0027 than 0.0002
+	 */
+	public function geostationary(Predict_Sat $sat)
+	{
+		 if (abs($sat->meanmo - 1.0027) < 0.0002) {
+			  return true;
+		 } else {
+			  return false;
+		}
+	}
+
+
+	/** Determine whether satellite has decayed.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @param sat Pointer to satellite data.
+	 *  @return TRUE if the satellite appears to have decayed, FALSE otherwise.
+	 *  @bug Modified version of the predict code but it is not tested.
+	 *
+	 * A satellite is decayed if
+	 *
+	 *    satepoch + ((16.666666 - sat.meanmo) / (10.0*fabs(sat.drag))) < "now"
+	 *
+	 */
+	public function decayed(Predict_Sat $sat)
+	{
+		/* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
            value matches up with the value in predict 2.2.3 */
-        /*** FIXME decayed is treated as a static quantity.
+		/*** FIXME decayed is treated as a static quantity.
              It is time dependent. Also sat->jul_utc is often zero
              when this function is called
         ***/
-        if ((10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda))) == 0) {
-    		return true;
-    	} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo) /
-                               (10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda)))) < $sat->jul_utc) {
-              return true;
-        } else {
-              return false;
-        }
-    }
-
-    /**
-     * Experimental attempt at calculating apparent magnitude.  Known intrinsic
-     * magnitudes are listed inside the function for now.
-     *
-     * @param float       $time The daynum the satellite is calculated for
-     * @param Predict_QTH $qth  The observer location
-     *
-     * @return null on failure, float otherwise
-     */
-    public function calculateApparentMagnitude($time, Predict_QTH $qth)
-    {
-        // Recorded intrinsic magnitudes and their respective
-        // illumination and distance from heavens-above.com
-        static $intrinsicMagnitudes = array(
-            '25544' => array(
-                'mag'      => -1.3,
-                'illum'    => .5,
-                'distance' => 1000,
-            )
-        );
-
-        // Return null if we don't have a record of the intrinsic mag
-        if (!isset($intrinsicMagnitudes[$this->tle->catnr])) {
-            return null;
-        }
-        $imag = $intrinsicMagnitudes[$this->tle->catnr];
-
-        // Convert the observer's geodetic info to radians and km so
-        // we can compare vectors
-        $observerGeo      = new Predict_Geodetic();
-        $observerGeo->lat = Predict_Math::Radians($qth->lat);
-        $observerGeo->lon = Predict_Math::Radians($qth->lon);
-        $observerGeo->alt = $qth->alt * 1000;
-
-        // Now determine the sun and observer positions
-        $observerPos      = new Predict_Vector();
-        $observerVel      = new Predict_Vector();
-        $solarVector      = new Predict_Vector();
-        Predict_Solar::Calculate_Solar_Position($time, $solarVector);
-        Predict_SGPObs::Calculate_User_PosVel($time, $observerGeo, $observerPos, $observerVel);
-
-        // Determine the solar phase and and thus the percent illumination
-        $observerSatPos = new Predict_Vector();
-        Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
-        $phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
-        $illum      = $phaseAngle / 180;
-
-        $illuminationChange            = $illum / $imag['illum'];
-        $inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
-        $changeInMagnitude             = log(
-            $illuminationChange * $inverseSquareOfDistanceChange,
-            self::POGSONS_RATIO
-        );
-
-        return $imag['mag'] - $changeInMagnitude;
-    }
+		if ((10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda))) == 0) {
+			return true;
+		} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo) /
+							   (10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda)))) < $sat->jul_utc) {
+			  return true;
+		} else {
+			  return false;
+		}
+	}
+
+	/**
+	 * Experimental attempt at calculating apparent magnitude.  Known intrinsic
+	 * magnitudes are listed inside the function for now.
+	 *
+	 * @param float       $time The daynum the satellite is calculated for
+	 * @param Predict_QTH $qth  The observer location
+	 *
+	 * @return null on failure, float otherwise
+	 */
+	public function calculateApparentMagnitude($time, Predict_QTH $qth)
+	{
+		// Recorded intrinsic magnitudes and their respective
+		// illumination and distance from heavens-above.com
+		static $intrinsicMagnitudes = array(
+			'25544' => array(
+				'mag'      => -1.3,
+				'illum'    => .5,
+				'distance' => 1000,
+			)
+		);
+
+		// Return null if we don't have a record of the intrinsic mag
+		if (!isset($intrinsicMagnitudes[$this->tle->catnr])) {
+			return null;
+		}
+		$imag = $intrinsicMagnitudes[$this->tle->catnr];
+
+		// Convert the observer's geodetic info to radians and km so
+		// we can compare vectors
+		$observerGeo      = new Predict_Geodetic();
+		$observerGeo->lat = Predict_Math::Radians($qth->lat);
+		$observerGeo->lon = Predict_Math::Radians($qth->lon);
+		$observerGeo->alt = $qth->alt * 1000;
+
+		// Now determine the sun and observer positions
+		$observerPos      = new Predict_Vector();
+		$observerVel      = new Predict_Vector();
+		$solarVector      = new Predict_Vector();
+		Predict_Solar::Calculate_Solar_Position($time, $solarVector);
+		Predict_SGPObs::Calculate_User_PosVel($time, $observerGeo, $observerPos, $observerVel);
+
+		// Determine the solar phase and and thus the percent illumination
+		$observerSatPos = new Predict_Vector();
+		Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
+		$phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
+		$illum      = $phaseAngle / 180;
+
+		$illuminationChange            = $illum / $imag['illum'];
+		$inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
+		$changeInMagnitude             = log(
+			$illuminationChange * $inverseSquareOfDistanceChange,
+			self::POGSONS_RATIO
+		);
+
+		return $imag['mag'] - $changeInMagnitude;
+	}
 }

Spacing +55 added lines, -55 removed lines

@@ -29,42 +29,42 @@ 
     public $nickname = null;
     public $website  = null;
 
-    public $tle      = null;   /*!< Keplerian elements */
-    public $flags    = 0;      /*!< Flags for algo ctrl */
+    public $tle      = null; /*!< Keplerian elements */
+    public $flags    = 0; /*!< Flags for algo ctrl */
     public $sgps     = null;
     public $dps      = null;
     public $deep_arg = null;
-    public $pos      = null;   /*!< Raw position and range */
-    public $vel      = null;   /*!< Raw velocity */
+    public $pos      = null; /*!< Raw position and range */
+    public $vel      = null; /*!< Raw velocity */
 
     /*** FIXME: REMOVE */
-    public $bearing = null;   /*!< Az, El, range and vel */
-    public $astro   = null;   /*!< Ra and Decl */
+    public $bearing = null; /*!< Az, El, range and vel */
+    public $astro   = null; /*!< Ra and Decl */
     /*** END */
 
     /* time keeping fields */
     public $jul_epoch = null;
     public $jul_utc   = null;
     public $tsince    = null;
-    public $aos       = null;    /*!< Next AOS. */
-    public $los       = null;    /*!< Next LOS */
-
-    public $az         = null;   /*!< Azimuth [deg] */
-    public $el         = null;   /*!< Elevation [deg] */
-    public $range      = null;   /*!< Range [km] */
-    public $range_rate = null;   /*!< Range Rate [km/sec] */
-    public $ra         = null;   /*!< Right Ascension [deg] */
-    public $dec        = null;   /*!< Declination [deg] */
-    public $ssplat     = null;   /*!< SSP latitude [deg] */
-    public $ssplon     = null;   /*!< SSP longitude [deg] */
-    public $alt        = null;   /*!< altitude [km] */
-    public $velo       = null;   /*!< velocity [km/s] */
-    public $ma         = null;   /*!< mean anomaly */
-    public $footprint  = null;   /*!< footprint */
-    public $phase      = null;   /*!< orbit phase */
-    public $meanmo     = null;   /*!< mean motion kept in rev/day */
-    public $orbit      = null;   /*!< orbit number */
-    public $otype      = null;   /*!< orbit type. */
+    public $aos       = null; /*!< Next AOS. */
+    public $los       = null; /*!< Next LOS */
+
+    public $az         = null; /*!< Azimuth [deg] */
+    public $el         = null; /*!< Elevation [deg] */
+    public $range      = null; /*!< Range [km] */
+    public $range_rate = null; /*!< Range Rate [km/sec] */
+    public $ra         = null; /*!< Right Ascension [deg] */
+    public $dec        = null; /*!< Declination [deg] */
+    public $ssplat     = null; /*!< SSP latitude [deg] */
+    public $ssplon     = null; /*!< SSP longitude [deg] */
+    public $alt        = null; /*!< altitude [km] */
+    public $velo       = null; /*!< velocity [km/s] */
+    public $ma         = null; /*!< mean anomaly */
+    public $footprint  = null; /*!< footprint */
+    public $phase      = null; /*!< orbit phase */
+    public $meanmo     = null; /*!< mean motion kept in rev/day */
+    public $orbit      = null; /*!< orbit number */
+    public $otype      = null; /*!< orbit type. */
 
     public function __construct(Predict_TLE $tle)
     {
@@ -93,30 +93,30 @@ 
         $this->tle->omegao *= Predict::de2ra;
         $this->tle->xmo    *= Predict::de2ra;
         $this->tle->xincl  *= Predict::de2ra;
-        $temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
+        $temp = Predict::twopi/Predict::xmnpda/Predict::xmnpda;
 
         /* store mean motion before conversion */
         $this->meanmo       = $this->tle->xno;
-        $this->tle->xno     = $this->tle->xno * $temp * Predict::xmnpda;
+        $this->tle->xno     = $this->tle->xno*$temp*Predict::xmnpda;
         $this->tle->xndt2o *= $temp;
-        $this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
+        $this->tle->xndd6o  = $this->tle->xndd6o*$temp/Predict::xmnpda;
         $this->tle->bstar  /= Predict::ae;
 
         /* Period > 225 minutes is deep space */
-        $dd1 = Predict::xke / $this->tle->xno;
+        $dd1 = Predict::xke/$this->tle->xno;
         $dd2 = Predict::tothrd;
         $a1 = pow($dd1, $dd2);
         $r1 = cos($this->tle->xincl);
-        $dd1 = 1.0 - $this->tle->eo * $this->tle->eo;
-        $temp = Predict::ck2 * 1.5 * ($r1 * $r1 * 3.0 - 1.0) / pow($dd1, 1.5);
-        $del1 = $temp / ($a1 * $a1);
-        $ao = $a1 * (1.0 - $del1 * (Predict::tothrd * 0.5 + $del1 *
-                                 ($del1 * 1.654320987654321 + 1.0)));
-        $delo = $temp / ($ao * $ao);
-        $xnodp = $this->tle->xno / ($delo + 1.0);
+        $dd1 = 1.0 - $this->tle->eo*$this->tle->eo;
+        $temp = Predict::ck2*1.5*($r1*$r1*3.0 - 1.0)/pow($dd1, 1.5);
+        $del1 = $temp/($a1*$a1);
+        $ao = $a1*(1.0 - $del1*(Predict::tothrd*0.5 + $del1*
+                                 ($del1*1.654320987654321 + 1.0)));
+        $delo = $temp/($ao*$ao);
+        $xnodp = $this->tle->xno/($delo + 1.0);
 
         /* Select a deep-space/near-earth ephemeris */
-        if (Predict::twopi / $xnodp / Predict::xmnpda >= .15625) {
+        if (Predict::twopi/$xnodp/Predict::xmnpda >= .15625) {
             $this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
         } else {
             $this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
@@ -142,9 +142,9 @@ 
 
         /* initialise observer location */
         if ($qth != null) {
-            $obs_geodetic->lon = $qth->lon * Predict::de2ra;
-            $obs_geodetic->lat = $qth->lat * Predict::de2ra;
-            $obs_geodetic->alt = $qth->alt / 1000.0;
+            $obs_geodetic->lon = $qth->lon*Predict::de2ra;
+            $obs_geodetic->lat = $qth->lat*Predict::de2ra;
+            $obs_geodetic->alt = $qth->alt/1000.0;
             $obs_geodetic->theta = 0;
         }
         else {
@@ -156,7 +156,7 @@ 
 
         /* execute computations */
         $sdpsgp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+        if ($sat->flags&Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
             $sdpsgp->SDP4($sat, 0.0);
         } else {
             $sdpsgp->SGP4($sat, 0.0);
@@ -166,7 +166,7 @@ 
         Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
 
         /* get the velocity of the satellite */
-        $sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
+        $sat->vel->w = sqrt($sat->vel->x*$sat->vel->x + $sat->vel->y*$sat->vel->y + $sat->vel->z*$sat->vel->z);
         $sat->velo = $sat->vel->w;
         Predict_SGPObs::Calculate_Obs($jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
         Predict_SGPObs::Calculate_LatLonAlt($jul_utc, $sat->pos, $sat_geodetic);
@@ -187,12 +187,12 @@ 
         $sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
         $sat->alt = $sat_geodetic->alt;
         $sat->ma = Predict_Math::Degrees($sat->phase);
-        $sat->ma *= 256.0 / 360.0;
-        $sat->footprint = 2.0 * Predict::xkmper * acos (Predict::xkmper/$sat->pos->w);
+        $sat->ma *= 256.0/360.0;
+        $sat->footprint = 2.0*Predict::xkmper*acos(Predict::xkmper/$sat->pos->w);
         $age = 0.0;
-        $sat->orbit = floor(($sat->tle->xno * Predict::xmnpda / Predict::twopi +
-                                   $age * $sat->tle->bstar * Predict::ae) * $age +
-                                  $sat->tle->xmo / Predict::twopi) + $sat->tle->revnum - 1;
+        $sat->orbit = floor(($sat->tle->xno*Predict::xmnpda/Predict::twopi +
+                                   $age*$sat->tle->bstar*Predict::ae)*$age +
+                                  $sat->tle->xmo/Predict::twopi) + $sat->tle->revnum - 1;
 
         /* orbit type */
         $sat->otype = $sat->get_orbit_type($sat);
@@ -256,10 +256,10 @@ 
              It is time dependent. Also sat->jul_utc is often zero
              when this function is called
         ***/
-        if ((10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda))) == 0) {
+        if ((10.0*abs($sat->tle->xndt2o/(Predict::twopi/Predict::xmnpda/Predict::xmnpda))) == 0) {
     		return true;
-    	} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo) /
-                               (10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda)))) < $sat->jul_utc) {
+    	} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo)/
+                               (10.0*abs($sat->tle->xndt2o/(Predict::twopi/Predict::xmnpda/Predict::xmnpda)))) < $sat->jul_utc) {
               return true;
         } else {
               return false;
@@ -298,7 +298,7 @@ 
         $observerGeo      = new Predict_Geodetic();
         $observerGeo->lat = Predict_Math::Radians($qth->lat);
         $observerGeo->lon = Predict_Math::Radians($qth->lon);
-        $observerGeo->alt = $qth->alt * 1000;
+        $observerGeo->alt = $qth->alt*1000;
 
         // Now determine the sun and observer positions
         $observerPos      = new Predict_Vector();
@@ -311,12 +311,12 @@ 
         $observerSatPos = new Predict_Vector();
         Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
         $phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
-        $illum      = $phaseAngle / 180;
+        $illum      = $phaseAngle/180;
 
-        $illuminationChange            = $illum / $imag['illum'];
-        $inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
+        $illuminationChange            = $illum/$imag['illum'];
+        $inverseSquareOfDistanceChange = pow(($imag['distance']/$this->range), 2);
         $changeInMagnitude             = log(
-            $illuminationChange * $inverseSquareOfDistanceChange,
+            $illuminationChange*$inverseSquareOfDistanceChange,
             self::POGSONS_RATIO
         );
 

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
             $obs_geodetic->lat = $qth->lat * Predict::de2ra;
             $obs_geodetic->alt = $qth->alt / 1000.0;
             $obs_geodetic->theta = 0;
-        }
-        else {
+        } else {
             $obs_geodetic->lon = 0.0;
             $obs_geodetic->lat = 0.0;
             $obs_geodetic->alt = 0.0;

require/libs/Predict/Predict/SGPObs.php

Doc Comments +4 added lines

@@ -56,6 +56,10 @@
     /* It is intended to be used to determine the ground track of */
     /* a satellite.  The calculations  assume the earth to be an  */
     /* oblate spheroid as defined in WGS '72.                     */
+
+    /**
+     * @param double $_time
+     */
     public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
     {
         /* Reference:  The 1992 Astronomical Almanac, page K12. */

Indentation +127 added lines, -127 removed lines

@@ -25,131 +25,131 @@
  */
 class Predict_SGPObs
 {
-    /* Procedure Calculate_User_PosVel passes the user's geodetic position */
-    /* and the time of interest and returns the ECI position and velocity  */
-    /* of the observer. The velocity calculation assumes the geodetic      */
-    /* position is stationary relative to the earth's surface.             */
-    public static function Calculate_User_PosVel(
-        $_time, Predict_Geodetic $geodetic, Predict_Vector $obs_pos, Predict_Vector $obs_vel
-    )
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page K11. */
-
-        $sinGeodeticLat = sin($geodetic->lat); /* Only run sin($geodetic->lat) once */
-
-        $geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon);/*LMST*/
-        $c = 1 / sqrt(1 + Predict::__f * (Predict::__f - 2) * $sinGeodeticLat * $sinGeodeticLat);
-        $sq = (1 - Predict::__f) * (1 - Predict::__f) * $c;
-        $achcp = (Predict::xkmper * $c + $geodetic->alt) * cos($geodetic->lat);
-        $obs_pos->x = $achcp * cos($geodetic->theta); /*kilometers*/
-        $obs_pos->y = $achcp * sin($geodetic->theta);
-        $obs_pos->z = (Predict::xkmper * $sq + $geodetic->alt) * $sinGeodeticLat;
-        $obs_vel->x = -Predict::mfactor * $obs_pos->y; /*kilometers/second*/
-        $obs_vel->y =  Predict::mfactor * $obs_pos->x;
-        $obs_vel->z =  0;
-        $obs_pos->w = sqrt($obs_pos->x * $obs_pos->x + $obs_pos->y * $obs_pos->y + $obs_pos->z * $obs_pos->z);
-        $obs_vel->w = sqrt($obs_vel->x * $obs_vel->x + $obs_vel->y * $obs_vel->y + $obs_vel->z * $obs_vel->z);
-    }
-
-    /* Procedure Calculate_LatLonAlt will calculate the geodetic  */
-    /* position of an object given its ECI position pos and time. */
-    /* It is intended to be used to determine the ground track of */
-    /* a satellite.  The calculations  assume the earth to be an  */
-    /* oblate spheroid as defined in WGS '72.                     */
-    public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page K12. */
-
-        /* double r,e2,phi,c; */
-
-        $geodetic->theta = Predict_Math::AcTan($pos->y, $pos->x); /*radians*/
-        $geodetic->lon = Predict_Math::FMod2p($geodetic->theta - Predict_Time::ThetaG_JD($_time)); /*radians*/
-        $r = sqrt(($pos->x * $pos->x) + ($pos->y * $pos->y));
-        $e2 = Predict::__f * (2 - Predict::__f);
-        $geodetic->lat = Predict_Math::AcTan($pos->z, $r); /*radians*/
-
-        do {
-            $phi    = $geodetic->lat;
-            $sinPhi = sin($phi);
-            $c      = 1 / sqrt(1 - $e2 * ($sinPhi * $sinPhi));
-            $geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper * $c * $e2 * $sinPhi, $r);
-        } while (abs($geodetic->lat - $phi) >= 1E-10);
-
-        $geodetic->alt = $r / cos($geodetic->lat) - Predict::xkmper * $c;/*kilometers*/
-
-        if ($geodetic->lat > Predict::pio2) {
-            $geodetic->lat -= Predict::twopi;
-        }
-    }
-
-    /* The procedures Calculate_Obs and Calculate_RADec calculate         */
-    /* the *topocentric* coordinates of the object with ECI position,     */
-    /* {pos}, and velocity, {vel}, from location {geodetic} at {time}.    */
-    /* The {obs_set} returned for Calculate_Obs consists of azimuth,      */
-    /* elevation, range, and range rate (in that order) with units of     */
-    /* radians, radians, kilometers, and kilometers/second, respectively. */
-    /* The WGS '72 geoid is used and the effect of atmospheric refraction */
-    /* (under standard temperature and pressure) is incorporated into the */
-    /* elevation calculation; the effect of atmospheric refraction on     */
-    /* range and range rate has not yet been quantified.                  */
-
-    /* The {obs_set} for Calculate_RADec consists of right ascension and  */
-    /* declination (in that order) in radians.  Again, calculations are   */
-    /* based on *topocentric* position using the WGS '72 geoid and        */
-    /* incorporating atmospheric refraction.                              */
-    public static function Calculate_Obs($_time, Predict_Vector $pos, Predict_Vector $vel, Predict_Geodetic $geodetic, Predict_ObsSet $obs_set)
-    {
-        $obs_pos = new Predict_Vector();
-        $obs_vel = new Predict_Vector();
-        $range   = new Predict_Vector();
-        $rgvel   = new Predict_Vector();
-
-        self::Calculate_User_PosVel($_time, $geodetic, $obs_pos, $obs_vel);
-
-        $range->x = $pos->x - $obs_pos->x;
-        $range->y = $pos->y - $obs_pos->y;
-        $range->z = $pos->z - $obs_pos->z;
-
-        $rgvel->x = $vel->x - $obs_vel->x;
-        $rgvel->y = $vel->y - $obs_vel->y;
-        $rgvel->z = $vel->z - $obs_vel->z;
-
-        $range->w = sqrt($range->x * $range->x + $range->y * $range->y + $range->z * $range->z);
-
-        $sin_lat   = sin($geodetic->lat);
-        $cos_lat   = cos($geodetic->lat);
-        $sin_theta = sin($geodetic->theta);
-        $cos_theta = cos($geodetic->theta);
-        $top_s = $sin_lat * $cos_theta * $range->x
-            + $sin_lat * $sin_theta * $range->y
-            - $cos_lat * $range->z;
-        $top_e = -$sin_theta * $range->x
-            + $cos_theta * $range->y;
-        $top_z = $cos_lat * $cos_theta * $range->x
-            + $cos_lat * $sin_theta * $range->y
-            + $sin_lat * $range->z;
-        $azim = atan(-$top_e / $top_s); /*Azimuth*/
-        if ($top_s > 0) {
-            $azim = $azim + Predict::pi;
-        }
-        if ($azim < 0 ) {
-            $azim = $azim + Predict::twopi;
-        }
-        $el = Predict_Math::ArcSin($top_z / $range->w);
-        $obs_set->az = $azim;        /* Azimuth (radians)  */
-        $obs_set->el = $el;          /* Elevation (radians)*/
-        $obs_set->range = $range->w; /* Range (kilometers) */
-
-        /* Range Rate (kilometers/second)*/
-        $obs_set->range_rate = Predict_Math::Dot($range, $rgvel) / $range->w;
-
-        /* Corrections for atmospheric refraction */
-        /* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
-        /* Correction is meaningless when apparent elevation is below horizon */
-        //	obs_set->el = obs_set->el + Radians((1.02/tan(Radians(Degrees(el)+
-        //							      10.3/(Degrees(el)+5.11))))/60);
-        if ($obs_set->el < 0) {
-            $obs_set->el = $el;  /*Reset to true elevation*/
-        }
-    }
+	/* Procedure Calculate_User_PosVel passes the user's geodetic position */
+	/* and the time of interest and returns the ECI position and velocity  */
+	/* of the observer. The velocity calculation assumes the geodetic      */
+	/* position is stationary relative to the earth's surface.             */
+	public static function Calculate_User_PosVel(
+		$_time, Predict_Geodetic $geodetic, Predict_Vector $obs_pos, Predict_Vector $obs_vel
+	)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page K11. */
+
+		$sinGeodeticLat = sin($geodetic->lat); /* Only run sin($geodetic->lat) once */
+
+		$geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon);/*LMST*/
+		$c = 1 / sqrt(1 + Predict::__f * (Predict::__f - 2) * $sinGeodeticLat * $sinGeodeticLat);
+		$sq = (1 - Predict::__f) * (1 - Predict::__f) * $c;
+		$achcp = (Predict::xkmper * $c + $geodetic->alt) * cos($geodetic->lat);
+		$obs_pos->x = $achcp * cos($geodetic->theta); /*kilometers*/
+		$obs_pos->y = $achcp * sin($geodetic->theta);
+		$obs_pos->z = (Predict::xkmper * $sq + $geodetic->alt) * $sinGeodeticLat;
+		$obs_vel->x = -Predict::mfactor * $obs_pos->y; /*kilometers/second*/
+		$obs_vel->y =  Predict::mfactor * $obs_pos->x;
+		$obs_vel->z =  0;
+		$obs_pos->w = sqrt($obs_pos->x * $obs_pos->x + $obs_pos->y * $obs_pos->y + $obs_pos->z * $obs_pos->z);
+		$obs_vel->w = sqrt($obs_vel->x * $obs_vel->x + $obs_vel->y * $obs_vel->y + $obs_vel->z * $obs_vel->z);
+	}
+
+	/* Procedure Calculate_LatLonAlt will calculate the geodetic  */
+	/* position of an object given its ECI position pos and time. */
+	/* It is intended to be used to determine the ground track of */
+	/* a satellite.  The calculations  assume the earth to be an  */
+	/* oblate spheroid as defined in WGS '72.                     */
+	public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page K12. */
+
+		/* double r,e2,phi,c; */
+
+		$geodetic->theta = Predict_Math::AcTan($pos->y, $pos->x); /*radians*/
+		$geodetic->lon = Predict_Math::FMod2p($geodetic->theta - Predict_Time::ThetaG_JD($_time)); /*radians*/
+		$r = sqrt(($pos->x * $pos->x) + ($pos->y * $pos->y));
+		$e2 = Predict::__f * (2 - Predict::__f);
+		$geodetic->lat = Predict_Math::AcTan($pos->z, $r); /*radians*/
+
+		do {
+			$phi    = $geodetic->lat;
+			$sinPhi = sin($phi);
+			$c      = 1 / sqrt(1 - $e2 * ($sinPhi * $sinPhi));
+			$geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper * $c * $e2 * $sinPhi, $r);
+		} while (abs($geodetic->lat - $phi) >= 1E-10);
+
+		$geodetic->alt = $r / cos($geodetic->lat) - Predict::xkmper * $c;/*kilometers*/
+
+		if ($geodetic->lat > Predict::pio2) {
+			$geodetic->lat -= Predict::twopi;
+		}
+	}
+
+	/* The procedures Calculate_Obs and Calculate_RADec calculate         */
+	/* the *topocentric* coordinates of the object with ECI position,     */
+	/* {pos}, and velocity, {vel}, from location {geodetic} at {time}.    */
+	/* The {obs_set} returned for Calculate_Obs consists of azimuth,      */
+	/* elevation, range, and range rate (in that order) with units of     */
+	/* radians, radians, kilometers, and kilometers/second, respectively. */
+	/* The WGS '72 geoid is used and the effect of atmospheric refraction */
+	/* (under standard temperature and pressure) is incorporated into the */
+	/* elevation calculation; the effect of atmospheric refraction on     */
+	/* range and range rate has not yet been quantified.                  */
+
+	/* The {obs_set} for Calculate_RADec consists of right ascension and  */
+	/* declination (in that order) in radians.  Again, calculations are   */
+	/* based on *topocentric* position using the WGS '72 geoid and        */
+	/* incorporating atmospheric refraction.                              */
+	public static function Calculate_Obs($_time, Predict_Vector $pos, Predict_Vector $vel, Predict_Geodetic $geodetic, Predict_ObsSet $obs_set)
+	{
+		$obs_pos = new Predict_Vector();
+		$obs_vel = new Predict_Vector();
+		$range   = new Predict_Vector();
+		$rgvel   = new Predict_Vector();
+
+		self::Calculate_User_PosVel($_time, $geodetic, $obs_pos, $obs_vel);
+
+		$range->x = $pos->x - $obs_pos->x;
+		$range->y = $pos->y - $obs_pos->y;
+		$range->z = $pos->z - $obs_pos->z;
+
+		$rgvel->x = $vel->x - $obs_vel->x;
+		$rgvel->y = $vel->y - $obs_vel->y;
+		$rgvel->z = $vel->z - $obs_vel->z;
+
+		$range->w = sqrt($range->x * $range->x + $range->y * $range->y + $range->z * $range->z);
+
+		$sin_lat   = sin($geodetic->lat);
+		$cos_lat   = cos($geodetic->lat);
+		$sin_theta = sin($geodetic->theta);
+		$cos_theta = cos($geodetic->theta);
+		$top_s = $sin_lat * $cos_theta * $range->x
+			+ $sin_lat * $sin_theta * $range->y
+			- $cos_lat * $range->z;
+		$top_e = -$sin_theta * $range->x
+			+ $cos_theta * $range->y;
+		$top_z = $cos_lat * $cos_theta * $range->x
+			+ $cos_lat * $sin_theta * $range->y
+			+ $sin_lat * $range->z;
+		$azim = atan(-$top_e / $top_s); /*Azimuth*/
+		if ($top_s > 0) {
+			$azim = $azim + Predict::pi;
+		}
+		if ($azim < 0 ) {
+			$azim = $azim + Predict::twopi;
+		}
+		$el = Predict_Math::ArcSin($top_z / $range->w);
+		$obs_set->az = $azim;        /* Azimuth (radians)  */
+		$obs_set->el = $el;          /* Elevation (radians)*/
+		$obs_set->range = $range->w; /* Range (kilometers) */
+
+		/* Range Rate (kilometers/second)*/
+		$obs_set->range_rate = Predict_Math::Dot($range, $rgvel) / $range->w;
+
+		/* Corrections for atmospheric refraction */
+		/* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
+		/* Correction is meaningless when apparent elevation is below horizon */
+		//	obs_set->el = obs_set->el + Radians((1.02/tan(Radians(Degrees(el)+
+		//							      10.3/(Degrees(el)+5.11))))/60);
+		if ($obs_set->el < 0) {
+			$obs_set->el = $el;  /*Reset to true elevation*/
+		}
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -37,18 +37,18 @@ 
 
         $sinGeodeticLat = sin($geodetic->lat); /* Only run sin($geodetic->lat) once */
 
-        $geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon);/*LMST*/
-        $c = 1 / sqrt(1 + Predict::__f * (Predict::__f - 2) * $sinGeodeticLat * $sinGeodeticLat);
-        $sq = (1 - Predict::__f) * (1 - Predict::__f) * $c;
-        $achcp = (Predict::xkmper * $c + $geodetic->alt) * cos($geodetic->lat);
-        $obs_pos->x = $achcp * cos($geodetic->theta); /*kilometers*/
-        $obs_pos->y = $achcp * sin($geodetic->theta);
-        $obs_pos->z = (Predict::xkmper * $sq + $geodetic->alt) * $sinGeodeticLat;
-        $obs_vel->x = -Predict::mfactor * $obs_pos->y; /*kilometers/second*/
-        $obs_vel->y =  Predict::mfactor * $obs_pos->x;
-        $obs_vel->z =  0;
-        $obs_pos->w = sqrt($obs_pos->x * $obs_pos->x + $obs_pos->y * $obs_pos->y + $obs_pos->z * $obs_pos->z);
-        $obs_vel->w = sqrt($obs_vel->x * $obs_vel->x + $obs_vel->y * $obs_vel->y + $obs_vel->z * $obs_vel->z);
+        $geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon); /*LMST*/
+        $c = 1/sqrt(1 + Predict::__f*(Predict::__f - 2)*$sinGeodeticLat*$sinGeodeticLat);
+        $sq = (1 - Predict::__f)*(1 - Predict::__f)*$c;
+        $achcp = (Predict::xkmper*$c + $geodetic->alt)*cos($geodetic->lat);
+        $obs_pos->x = $achcp*cos($geodetic->theta); /*kilometers*/
+        $obs_pos->y = $achcp*sin($geodetic->theta);
+        $obs_pos->z = (Predict::xkmper*$sq + $geodetic->alt)*$sinGeodeticLat;
+        $obs_vel->x = -Predict::mfactor*$obs_pos->y; /*kilometers/second*/
+        $obs_vel->y = Predict::mfactor*$obs_pos->x;
+        $obs_vel->z = 0;
+        $obs_pos->w = sqrt($obs_pos->x*$obs_pos->x + $obs_pos->y*$obs_pos->y + $obs_pos->z*$obs_pos->z);
+        $obs_vel->w = sqrt($obs_vel->x*$obs_vel->x + $obs_vel->y*$obs_vel->y + $obs_vel->z*$obs_vel->z);
     }
 
     /* Procedure Calculate_LatLonAlt will calculate the geodetic  */
@@ -56,7 +56,7 @@ 
     /* It is intended to be used to determine the ground track of */
     /* a satellite.  The calculations  assume the earth to be an  */
     /* oblate spheroid as defined in WGS '72.                     */
-    public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
+    public static function Calculate_LatLonAlt($_time, Predict_Vector $pos, Predict_Geodetic $geodetic)
     {
         /* Reference:  The 1992 Astronomical Almanac, page K12. */
 
@@ -64,18 +64,18 @@ 
 
         $geodetic->theta = Predict_Math::AcTan($pos->y, $pos->x); /*radians*/
         $geodetic->lon = Predict_Math::FMod2p($geodetic->theta - Predict_Time::ThetaG_JD($_time)); /*radians*/
-        $r = sqrt(($pos->x * $pos->x) + ($pos->y * $pos->y));
-        $e2 = Predict::__f * (2 - Predict::__f);
+        $r = sqrt(($pos->x*$pos->x) + ($pos->y*$pos->y));
+        $e2 = Predict::__f*(2 - Predict::__f);
         $geodetic->lat = Predict_Math::AcTan($pos->z, $r); /*radians*/
 
         do {
             $phi    = $geodetic->lat;
             $sinPhi = sin($phi);
-            $c      = 1 / sqrt(1 - $e2 * ($sinPhi * $sinPhi));
-            $geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper * $c * $e2 * $sinPhi, $r);
+            $c      = 1/sqrt(1 - $e2*($sinPhi*$sinPhi));
+            $geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper*$c*$e2*$sinPhi, $r);
         } while (abs($geodetic->lat - $phi) >= 1E-10);
 
-        $geodetic->alt = $r / cos($geodetic->lat) - Predict::xkmper * $c;/*kilometers*/
+        $geodetic->alt = $r/cos($geodetic->lat) - Predict::xkmper*$c; /*kilometers*/
 
         if ($geodetic->lat > Predict::pio2) {
             $geodetic->lat -= Predict::twopi;
@@ -114,34 +114,34 @@ 
         $rgvel->y = $vel->y - $obs_vel->y;
         $rgvel->z = $vel->z - $obs_vel->z;
 
-        $range->w = sqrt($range->x * $range->x + $range->y * $range->y + $range->z * $range->z);
+        $range->w = sqrt($range->x*$range->x + $range->y*$range->y + $range->z*$range->z);
 
         $sin_lat   = sin($geodetic->lat);
         $cos_lat   = cos($geodetic->lat);
         $sin_theta = sin($geodetic->theta);
         $cos_theta = cos($geodetic->theta);
-        $top_s = $sin_lat * $cos_theta * $range->x
-            + $sin_lat * $sin_theta * $range->y
-            - $cos_lat * $range->z;
-        $top_e = -$sin_theta * $range->x
-            + $cos_theta * $range->y;
-        $top_z = $cos_lat * $cos_theta * $range->x
-            + $cos_lat * $sin_theta * $range->y
-            + $sin_lat * $range->z;
-        $azim = atan(-$top_e / $top_s); /*Azimuth*/
+        $top_s = $sin_lat*$cos_theta*$range->x
+            + $sin_lat*$sin_theta*$range->y
+            - $cos_lat*$range->z;
+        $top_e = -$sin_theta*$range->x
+            + $cos_theta*$range->y;
+        $top_z = $cos_lat*$cos_theta*$range->x
+            + $cos_lat*$sin_theta*$range->y
+            + $sin_lat*$range->z;
+        $azim = atan(-$top_e/$top_s); /*Azimuth*/
         if ($top_s > 0) {
             $azim = $azim + Predict::pi;
         }
-        if ($azim < 0 ) {
+        if ($azim < 0) {
             $azim = $azim + Predict::twopi;
         }
-        $el = Predict_Math::ArcSin($top_z / $range->w);
-        $obs_set->az = $azim;        /* Azimuth (radians)  */
-        $obs_set->el = $el;          /* Elevation (radians)*/
+        $el = Predict_Math::ArcSin($top_z/$range->w);
+        $obs_set->az = $azim; /* Azimuth (radians)  */
+        $obs_set->el = $el; /* Elevation (radians)*/
         $obs_set->range = $range->w; /* Range (kilometers) */
 
         /* Range Rate (kilometers/second)*/
-        $obs_set->range_rate = Predict_Math::Dot($range, $rgvel) / $range->w;
+        $obs_set->range_rate = Predict_Math::Dot($range, $rgvel)/$range->w;
 
         /* Corrections for atmospheric refraction */
         /* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
@@ -149,7 +149,7 @@ 
         //	obs_set->el = obs_set->el + Radians((1.02/tan(Radians(Degrees(el)+
         //							      10.3/(Degrees(el)+5.11))))/60);
         if ($obs_set->el < 0) {
-            $obs_set->el = $el;  /*Reset to true elevation*/
+            $obs_set->el = $el; /*Reset to true elevation*/
         }
     }
 }

require/libs/Predict/Predict/SGPSDP.php

Doc Comments +12 added lines

@@ -67,6 +67,10 @@ 
     /* structure with Keplerian orbital elements and pos and vel    */
     /* are vector_t structures returning ECI satellite position and */
     /* velocity. Use Convert_Sat_State() to convert to km and km/s.*/
+
+    /**
+     * @param double $tsince
+     */
     public function SGP4(Predict_Sat $sat, $tsince)
     {
         /* Initialization */
@@ -312,6 +316,10 @@ 
     /* structure with Keplerian orbital elements and pos and vel    */
     /* are vector_t structures returning ECI satellite position and */
     /* velocity. Use Convert_Sat_State() to convert to km and km/s. */
+
+    /**
+     * @param double $tsince
+     */
     public function SDP4(Predict_Sat $sat, $tsince)
     {
         /* Initialization */
@@ -538,6 +546,10 @@ 
     /* DEEP */
     /* This function is used by SDP4 to add lunar and solar */
     /* perturbation effects to deep-space orbit objects.    */
+
+    /**
+     * @param integer $ientry
+     */
     public function Deep($ientry, Predict_Sat $sat)
     {
         switch ($ientry) {

Indentation +1031 added lines, -1031 removed lines

@@ -23,1037 +23,1037 @@
  */
 class Predict_SGPSDP
 {
-    const ALL_FLAGS             = -1;
-    const SGP_INITIALIZED_FLAG  = 0x000001;
-    const SGP4_INITIALIZED_FLAG = 0x000002;
-    const SDP4_INITIALIZED_FLAG = 0x000004;
-    const SGP8_INITIALIZED_FLAG = 0x000008;
-    const SDP8_INITIALIZED_FLAG = 0x000010;
-    const SIMPLE_FLAG           = 0x000020;
-    const DEEP_SPACE_EPHEM_FLAG = 0x000040;
-    const LUNAR_TERMS_DONE_FLAG = 0x000080;
-    const NEW_EPHEMERIS_FLAG    = 0x000100;
-    const DO_LOOP_FLAG          = 0x000200;
-    const RESONANCE_FLAG        = 0x000400;
-    const SYNCHRONOUS_FLAG      = 0x000800;
-    const EPOCH_RESTART_FLAG    = 0x001000;
-    const VISIBLE_FLAG          = 0x002000;
-    const SAT_ECLIPSED_FLAG     = 0x004000;
-
-    /* orbit_type_t struct */
-    const ORBIT_TYPE_UNKNOWN = 0;
-    const ORBIT_TYPE_LEO     = 1;            /*!< Low Earth orbit, up to 1200 km. */
-    const ORBIT_TYPE_ICO     = 2;            /*!< Intermediate Circular Orbit, up to 1400 km. */
-    const ORBIT_TYPE_GEO     = 3;            /*!< Geostationary. */
-    const ORBIT_TYPE_GSO     = 4;            /*!< Geosynchronuous. */
-    const ORBIT_TYPE_MOLNIYA = 5;
-    const ORBIT_TYPE_TUNDRA  = 6;
-    const ORBIT_TYPE_POLAR   = 7;
-    const ORBIT_TYPE_SUNSYNC = 8;
-    const ORBIT_TYPE_DECAYED = 9;
-
-
-
-    /* Entry points of Deep()
+	const ALL_FLAGS             = -1;
+	const SGP_INITIALIZED_FLAG  = 0x000001;
+	const SGP4_INITIALIZED_FLAG = 0x000002;
+	const SDP4_INITIALIZED_FLAG = 0x000004;
+	const SGP8_INITIALIZED_FLAG = 0x000008;
+	const SDP8_INITIALIZED_FLAG = 0x000010;
+	const SIMPLE_FLAG           = 0x000020;
+	const DEEP_SPACE_EPHEM_FLAG = 0x000040;
+	const LUNAR_TERMS_DONE_FLAG = 0x000080;
+	const NEW_EPHEMERIS_FLAG    = 0x000100;
+	const DO_LOOP_FLAG          = 0x000200;
+	const RESONANCE_FLAG        = 0x000400;
+	const SYNCHRONOUS_FLAG      = 0x000800;
+	const EPOCH_RESTART_FLAG    = 0x001000;
+	const VISIBLE_FLAG          = 0x002000;
+	const SAT_ECLIPSED_FLAG     = 0x004000;
+
+	/* orbit_type_t struct */
+	const ORBIT_TYPE_UNKNOWN = 0;
+	const ORBIT_TYPE_LEO     = 1;            /*!< Low Earth orbit, up to 1200 km. */
+	const ORBIT_TYPE_ICO     = 2;            /*!< Intermediate Circular Orbit, up to 1400 km. */
+	const ORBIT_TYPE_GEO     = 3;            /*!< Geostationary. */
+	const ORBIT_TYPE_GSO     = 4;            /*!< Geosynchronuous. */
+	const ORBIT_TYPE_MOLNIYA = 5;
+	const ORBIT_TYPE_TUNDRA  = 6;
+	const ORBIT_TYPE_POLAR   = 7;
+	const ORBIT_TYPE_SUNSYNC = 8;
+	const ORBIT_TYPE_DECAYED = 9;
+
+
+
+	/* Entry points of Deep()
     // FIXME: Change to enu */
-    const dpinit = 1; /* Deep-space initialization code */
-    const dpsec  = 2; /* Deep-space secular code        */
-    const dpper  = 3; /* Deep-space periodic code       */
-
-    /* SGP4 */
-    /* This function is used to calculate the position and velocity */
-    /* of near-earth (period < 225 minutes) satellites. tsince is   */
-    /* time since epoch in minutes, tle is a pointer to a tle_t     */
-    /* structure with Keplerian orbital elements and pos and vel    */
-    /* are vector_t structures returning ECI satellite position and */
-    /* velocity. Use Convert_Sat_State() to convert to km and km/s.*/
-    public function SGP4(Predict_Sat $sat, $tsince)
-    {
-        /* Initialization */
-        if (~$sat->flags & self::SGP4_INITIALIZED_FLAG) {
-            $sat->flags |= self::SGP4_INITIALIZED_FLAG;
-
-            /* Recover original mean motion (xnodp) and   */
-            /* semimajor axis (aodp) from input elements. */
-            $a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
-            $sat->sgps->cosio = cos($sat->tle->xincl);
-            $theta2 = $sat->sgps->cosio * $sat->sgps->cosio;
-            $sat->sgps->x3thm1 = 3 * $theta2 - 1.0;
-            $eosq = $sat->tle->eo * $sat->tle->eo;
-            $betao2 = 1 - $eosq;
-            $betao = sqrt($betao2);
-            $del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($a1 * $a1 * $betao * $betao2);
-            $ao = $a1 * (1 - $del1 * (0.5 * Predict::tothrd + $del1 * (1 + 134.0 / 81.0 * $del1)));
-            $delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($ao * $ao * $betao * $betao2);
-            $sat->sgps->xnodp = $sat->tle->xno / (1.0 + $delo);
-            $sat->sgps->aodp = $ao / (1.0 - $delo);
-
-            /* For perigee less than 220 kilometers, the "simple" flag is set */
-            /* and the equations are truncated to linear variation in sqrt a  */
-            /* and quadratic variation in mean anomaly.  Also, the c3 term,   */
-            /* the delta omega term, and the delta m term are dropped.        */
-            if (($sat->sgps->aodp * (1.0 - $sat->tle->eo) / Predict::ae) < (220.0 / Predict::xkmper + Predict::ae)) {
-                $sat->flags |= self::SIMPLE_FLAG;
-            } else {
-                $sat->flags &= ~self::SIMPLE_FLAG;
-            }
-
-            /* For perigee below 156 km, the       */
-            /* values of s and qoms2t are altered. */
-            $s4 = Predict::__s__;
-            $qoms24 = Predict::qoms2t;
-            $perige = ($sat->sgps->aodp * (1 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
-            if ($perige < 156.0) {
-                if ($perige <= 98.0) {
-                    $s4 = 20.0;
-                } else {
-                    $s4 = $perige - 78.0;
-                }
-                $qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
-                $s4 = $s4 / Predict::xkmper + Predict::ae;
-            }; /* FIXME FIXME: End of if(perige <= 98) NO WAY!!!! */
-
-            $pinvsq = 1.0 / ($sat->sgps->aodp * $sat->sgps->aodp * $betao2 * $betao2);
-            $tsi = 1.0 / ($sat->sgps->aodp - $s4);
-            $sat->sgps->eta = $sat->sgps->aodp * $sat->tle->eo * $tsi;
-            $etasq = $sat->sgps->eta * $sat->sgps->eta;
-            $eeta = $sat->tle->eo * $sat->sgps->eta;
-            $psisq = abs(1.0 - $etasq);
-            $coef = $qoms24 * pow($tsi, 4);
-            $coef1 = $coef / pow($psisq, 3.5);
-            $c2 = $coef1 * $sat->sgps->xnodp * ($sat->sgps->aodp *
-                            (1.0 + 1.5 * $etasq + $eeta * (4.0 + $etasq)) +
-                            0.75 * Predict::ck2 * $tsi / $psisq * $sat->sgps->x3thm1 *
-                            (8.0 + 3.0 * $etasq * (8 + $etasq)));
-            $sat->sgps->c1 = $c2 * $sat->tle->bstar;
-            $sat->sgps->sinio = sin($sat->tle->xincl);
-            $a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
-            $c3 = $coef * $tsi * $a3ovk2 * $sat->sgps->xnodp * Predict::ae * $sat->sgps->sinio / $sat->tle->eo;
-            $sat->sgps->x1mth2 = 1.0 - $theta2;
-            $sat->sgps->c4 = 2.0 * $sat->sgps->xnodp * $coef1 * $sat->sgps->aodp * $betao2 *
-                ($sat->sgps->eta * (2.0 + 0.5 * $etasq) +
-                 $sat->tle->eo * (0.5 + 2.0 * $etasq) -
-                 2.0 * Predict::ck2 * $tsi / ($sat->sgps->aodp * $psisq) *
-                 (-3.0 * $sat->sgps->x3thm1 * (1.0 - 2.0 * $eeta + $etasq * (1.5 - 0.5 * $eeta)) +
-                  0.75 * $sat->sgps->x1mth2 * (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
-                  cos(2.0 * $sat->tle->omegao)));
-            $sat->sgps->c5 = 2.0 * $coef1 * $sat->sgps->aodp * $betao2 *
-                (1.0 + 2.75 * ($etasq + $eeta) + $eeta * $etasq);
-            $theta4 = $theta2 * $theta2;
-            $temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->sgps->xnodp;
-            $temp2 = $temp1 * Predict::ck2 * $pinvsq;
-            $temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->sgps->xnodp;
-            $sat->sgps->xmdot = $sat->sgps->xnodp + 0.5 * $temp1 * $betao * $sat->sgps->x3thm1 +
-                0.0625 * $temp2 * $betao * (13.0 - 78.0 * $theta2 + 137.0 * $theta4);
-            $x1m5th = 1.0 - 5.0 * $theta2;
-            $sat->sgps->omgdot = -0.5 * $temp1 * $x1m5th +
-                0.0625 * $temp2 * (7.0 - 114.0 * $theta2 + 395.0 * $theta4) +
-                $temp3 * (3.0 - 36.0 * $theta2 + 49.0 * $theta4);
-            $xhdot1 = -$temp1 * $sat->sgps->cosio;
-            $sat->sgps->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $theta2) +
-                             2.0 * $temp3 * (3.0 - 7.0 * $theta2)) * $sat->sgps->cosio;
-            $sat->sgps->omgcof = $sat->tle->bstar * $c3 * cos($sat->tle->omegao);
-            $sat->sgps->xmcof = -Predict::tothrd * $coef * $sat->tle->bstar * Predict::ae / $eeta;
-            $sat->sgps->xnodcf = 3.5 * $betao2 * $xhdot1 * $sat->sgps->c1;
-            $sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
-            $sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->sgps->sinio *
-                (3.0 + 5.0 * $sat->sgps->cosio) / (1.0 + $sat->sgps->cosio);
-            $sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->sgps->sinio;
-            $sat->sgps->delmo = pow(1.0 + $sat->sgps->eta * cos($sat->tle->xmo), 3);
-            $sat->sgps->sinmo = sin($sat->tle->xmo);
-            $sat->sgps->x7thm1 = 7.0 * $theta2 - 1.0;
-            if (~$sat->flags & self::SIMPLE_FLAG) {
-                $c1sq = $sat->sgps->c1 * $sat->sgps->c1;
-                $sat->sgps->d2 = 4.0 * $sat->sgps->aodp * $tsi * $c1sq;
-                $temp = $sat->sgps->d2 * $tsi * $sat->sgps->c1 / 3.0;
-                $sat->sgps->d3 = (17.0 * $sat->sgps->aodp + $s4) * $temp;
-                $sat->sgps->d4 = 0.5 * $temp * $sat->sgps->aodp * $tsi *
-                    (221.0 * $sat->sgps->aodp + 31.0 * $s4) * $sat->sgps->c1;
-                $sat->sgps->t3cof = $sat->sgps->d2 + 2.0 * $c1sq;
-                $sat->sgps->t4cof = 0.25 * (3.0 * $sat->sgps->d3 + $sat->sgps->c1 *
-                              (12.0 * $sat->sgps->d2 + 10.0 * $c1sq));
-                $sat->sgps->t5cof = 0.2 * (3.0 * $sat->sgps->d4 +
-                             12.0 * $sat->sgps->c1 * $sat->sgps->d3 +
-                             6.0 * $sat->sgps->d2 * $sat->sgps->d2 +
-                             15.0 * $c1sq * (2.0 * $sat->sgps->d2 + $c1sq));
-            }; /* End of if (isFlagClear(SIMPLE_FLAG)) */
-        }; /* End of SGP4() initialization */
-
-        /* Update for secular gravity and atmospheric drag. */
-        $xmdf = $sat->tle->xmo + $sat->sgps->xmdot * $tsince;
-        $omgadf = $sat->tle->omegao + $sat->sgps->omgdot * $tsince;
-        $xnoddf = $sat->tle->xnodeo + $sat->sgps->xnodot * $tsince;
-        $omega = $omgadf;
-        $xmp = $xmdf;
-        $tsq = $tsince * $tsince;
-        $xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
-        $tempa = 1.0 - $sat->sgps->c1 * $tsince;
-        $tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
-        $templ = $sat->sgps->t2cof * $tsq;
-        if (~$sat->flags & self::SIMPLE_FLAG) {
-            $delomg = $sat->sgps->omgcof * $tsince;
-            $delm = $sat->sgps->xmcof * (pow(1 + $sat->sgps->eta * cos($xmdf), 3) - $sat->sgps->delmo);
-            $temp = $delomg + $delm;
-            $xmp = $xmdf + $temp;
-            $omega = $omgadf - $temp;
-            $tcube = $tsq * $tsince;
-            $tfour = $tsince * $tcube;
-            $tempa = $tempa - $sat->sgps->d2 * $tsq - $sat->sgps->d3 * $tcube - $sat->sgps->d4 * $tfour;
-            $tempe = $tempe + $sat->tle->bstar * $sat->sgps->c5 * (sin($xmp) - $sat->sgps->sinmo);
-            $templ = $templ + $sat->sgps->t3cof * $tcube + $tfour *
-                ($sat->sgps->t4cof + $tsince * $sat->sgps->t5cof);
-        }; /* End of if (isFlagClear(SIMPLE_FLAG)) */
-
-        $a = $sat->sgps->aodp * pow($tempa, 2);
-        $e = $sat->tle->eo - $tempe;
-        $xl = $xmp + $omega + $xnode + $sat->sgps->xnodp * $templ;
-        $beta = sqrt(1.0 - ($e * $e));
-        $xn = Predict::xke / pow($a, 1.5);
-
-        /* Long period periodics */
-        $axn = $e * cos($omega);
-        $temp = 1.0 / ($a * $beta * $beta);
-        $xll = $temp * $sat->sgps->xlcof * $axn;
-        $aynl = $temp * $sat->sgps->aycof;
-        $xlt = $xl + $xll;
-        $ayn = $e * sin($omega) + $aynl;
-
-        /* Solve Kepler's' Equation */
-        $capu = Predict_Math::FMod2p($xlt - $xnode);
-        $temp2 = $capu;
-
-        $i = 0;
-        do {
-            $sinepw = sin($temp2);
-            $cosepw = cos($temp2);
-            $temp3 = $axn * $sinepw;
-            $temp4 = $ayn * $cosepw;
-            $temp5 = $axn * $cosepw;
-            $temp6 = $ayn * $sinepw;
-            $epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
-            if (abs($epw - $temp2) <= Predict::e6a) {
-                break;
-            }
-            $temp2 = $epw;
-        } while ($i++ < 10);
-
-        /* Short period preliminary quantities */
-        $ecose = $temp5 + $temp6;
-        $esine = $temp3 - $temp4;
-        $elsq = $axn * $axn + $ayn * $ayn;
-        $temp = 1.0 - $elsq;
-        $pl = $a * $temp;
-        $r = $a * (1.0 - $ecose);
-        $temp1 = 1.0 / $r;
-        $rdot = Predict::xke * sqrt($a) * $esine * $temp1;
-        $rfdot = Predict::xke * sqrt($pl) * $temp1;
-        $temp2 = $a * $temp1;
-        $betal = sqrt($temp);
-        $temp3 = 1.0 / (1.0 + $betal);
-        $cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
-        $sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
-        $u = Predict_Math::AcTan($sinu, $cosu);
-        $sin2u = 2.0 * $sinu * $cosu;
-        $cos2u = 2.0 * $cosu * $cosu - 1.0;
-        $temp = 1.0 / $pl;
-        $temp1 = Predict::ck2 * $temp;
-        $temp2 = $temp1 * $temp;
-
-        /* Update for short periodics */
-        $rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
-            0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
-        $uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
-        $xnodek = $xnode + 1.5 * $temp2 * $sat->sgps->cosio * $sin2u;
-        $xinck = $sat->tle->xincl + 1.5 * $temp2 * $sat->sgps->cosio * $sat->sgps->sinio * $cos2u;
-        $rdotk = $rdot - $xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
-        $rfdotk = $rfdot + $xn * $temp1 * ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
-
-
-        /* Orientation vectors */
-        $sinuk = sin($uk);
-        $cosuk = cos($uk);
-        $sinik = sin($xinck);
-        $cosik = cos($xinck);
-        $sinnok = sin($xnodek);
-        $cosnok = cos($xnodek);
-        $xmx = -$sinnok * $cosik;
-        $xmy = $cosnok * $cosik;
-        $ux = $xmx * $sinuk + $cosnok * $cosuk;
-        $uy = $xmy * $sinuk + $sinnok * $cosuk;
-        $uz = $sinik * $sinuk;
-        $vx = $xmx * $cosuk - $cosnok * $sinuk;
-        $vy = $xmy * $cosuk - $sinnok * $sinuk;
-        $vz = $sinik * $cosuk;
-
-        /* Position and velocity */
-        $sat->pos->x = $rk * $ux;
-        $sat->pos->y = $rk * $uy;
-        $sat->pos->z = $rk * $uz;
-        $sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
-        $sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
-        $sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
-
-        $sat->phase = $xlt - $xnode - $omgadf + Predict::twopi;
-        if ($sat->phase < 0) {
-            $sat->phase += Predict::twopi;
-        }
-        $sat->phase = Predict_Math::FMod2p($sat->phase);
-
-        $sat->tle->omegao1 = $omega;
-        $sat->tle->xincl1  = $xinck;
-        $sat->tle->xnodeo1 = $xnodek;
-
-    } /*SGP4*/
-
-    /* SDP4 */
-    /* This function is used to calculate the position and velocity */
-    /* of deep-space (period > 225 minutes) satellites. tsince is   */
-    /* time since epoch in minutes, tle is a pointer to a tle_t     */
-    /* structure with Keplerian orbital elements and pos and vel    */
-    /* are vector_t structures returning ECI satellite position and */
-    /* velocity. Use Convert_Sat_State() to convert to km and km/s. */
-    public function SDP4(Predict_Sat $sat, $tsince)
-    {
-        /* Initialization */
-        if (~$sat->flags & self::SDP4_INITIALIZED_FLAG) {
-
-            $sat->flags |= self::SDP4_INITIALIZED_FLAG;
-
-            /* Recover original mean motion (xnodp) and   */
-            /* semimajor axis (aodp) from input elements. */
-            $a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
-            $sat->deep_arg->cosio = cos($sat->tle->xincl);
-            $sat->deep_arg->theta2 = $sat->deep_arg->cosio * $sat->deep_arg->cosio;
-            $sat->sgps->x3thm1 = 3.0 * $sat->deep_arg->theta2 - 1.0;
-            $sat->deep_arg->eosq = $sat->tle->eo * $sat->tle->eo;
-            $sat->deep_arg->betao2 = 1.0 - $sat->deep_arg->eosq;
-            $sat->deep_arg->betao = sqrt($sat->deep_arg->betao2);
-            $del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
-                ($a1 * $a1 * $sat->deep_arg->betao * $sat->deep_arg->betao2);
-            $ao = $a1 * (1.0 - $del1 * (0.5 * Predict::tothrd + $del1 * (1.0 + 134.0 / 81.0 * $del1)));
-            $delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
-                ($ao * $ao * $sat->deep_arg->betao * $sat->deep_arg->betao2);
-            $sat->deep_arg->xnodp = $sat->tle->xno / (1.0 + $delo);
-            $sat->deep_arg->aodp = $ao / (1.0 - $delo);
-
-            /* For perigee below 156 km, the values */
-            /* of s and qoms2t are altered.         */
-            $s4 = Predict::__s__;
-            $qoms24 = Predict::qoms2t;
-            $perige = ($sat->deep_arg->aodp * (1.0 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
-            if ($perige < 156.0) {
-                if ($perige <= 98.0) {
-                    $s4 = 20.0;
-                } else {
-                    $s4 = $perige - 78.0;
-                }
-                $qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
-                $s4 = $s4 / Predict::xkmper + Predict::ae;
-            }
-            $pinvsq = 1.0 / ($sat->deep_arg->aodp * $sat->deep_arg->aodp *
-                    $sat->deep_arg->betao2 * $sat->deep_arg->betao2);
-            $sat->deep_arg->sing = sin($sat->tle->omegao);
-            $sat->deep_arg->cosg = cos($sat->tle->omegao);
-            $tsi = 1.0 / ($sat->deep_arg->aodp - $s4);
-            $eta = $sat->deep_arg->aodp * $sat->tle->eo * $tsi;
-            $etasq = $eta * $eta;
-            $eeta = $sat->tle->eo * $eta;
-            $psisq = abs(1.0 - $etasq);
-            $coef = $qoms24 * pow($tsi, 4);
-            $coef1 = $coef / pow($psisq, 3.5);
-            $c2 = $coef1 * $sat->deep_arg->xnodp * ($sat->deep_arg->aodp *
-                                (1.0 + 1.5 * $etasq + $eeta *
-                                 (4.0 + $etasq)) + 0.75 * Predict::ck2 * $tsi / $psisq *
-                                $sat->sgps->x3thm1 * (8.0 + 3.0 * $etasq *
-                                        (8.0 + $etasq)));
-            $sat->sgps->c1 = $sat->tle->bstar * $c2;
-            $sat->deep_arg->sinio = sin($sat->tle->xincl);
-            $a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
-            $sat->sgps->x1mth2 = 1.0 - $sat->deep_arg->theta2;
-            $sat->sgps->c4 = 2.0 * $sat->deep_arg->xnodp * $coef1 *
-                $sat->deep_arg->aodp * $sat->deep_arg->betao2 *
-                ($eta * (2.0 + 0.5 * $etasq) + $sat->tle->eo *
-                 (0.5 + 2.0 * $etasq) - 2.0 * Predict::ck2 * $tsi /
-                 ($sat->deep_arg->aodp * $psisq) * (-3.0 * $sat->sgps->x3thm1 *
-                                 (1.0 - 2.0 * $eeta + $etasq *
-                                  (1.5 - 0.5 * $eeta)) +
-                                 0.75 * $sat->sgps->x1mth2 *
-                                 (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
-                                 cos(2.0 * $sat->tle->omegao)));
-            $theta4 = $sat->deep_arg->theta2 * $sat->deep_arg->theta2;
-            $temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->deep_arg->xnodp;
-            $temp2 = $temp1 * Predict::ck2 * $pinvsq;
-            $temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->deep_arg->xnodp;
-            $sat->deep_arg->xmdot = $sat->deep_arg->xnodp + 0.5 * $temp1 * $sat->deep_arg->betao *
-                $sat->sgps->x3thm1 + 0.0625 * $temp2 * $sat->deep_arg->betao *
-                (13.0 - 78.0 * $sat->deep_arg->theta2 + 137.0 * $theta4);
-            $x1m5th = 1.0 - 5.0 * $sat->deep_arg->theta2;
-            $sat->deep_arg->omgdot = -0.5 * $temp1 * $x1m5th + 0.0625 * $temp2 *
-                            (7.0 - 114.0 * $sat->deep_arg->theta2 + 395.0 * $theta4) +
-                        $temp3 * (3.0 - 36.0 * $sat->deep_arg->theta2 + 49.0 * $theta4);
-            $xhdot1 = -$temp1 * $sat->deep_arg->cosio;
-            $sat->deep_arg->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $sat->deep_arg->theta2) +
-                             2.0 * $temp3 * (3.0 - 7.0 * $sat->deep_arg->theta2)) *
-                $sat->deep_arg->cosio;
-            $sat->sgps->xnodcf = 3.5 * $sat->deep_arg->betao2 * $xhdot1 * $sat->sgps->c1;
-            $sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
-            $sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->deep_arg->sinio *
-                (3.0 + 5.0 * $sat->deep_arg->cosio) / (1.0 + $sat->deep_arg->cosio);
-            $sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->deep_arg->sinio;
-            $sat->sgps->x7thm1 = 7.0 * $sat->deep_arg->theta2 - 1.0;
-
-            /* initialize Deep() */
-            $this->Deep(self::dpinit, $sat);
-        }; /*End of SDP4() initialization */
-
-        /* Update for secular gravity and atmospheric drag */
-        $xmdf = $sat->tle->xmo + $sat->deep_arg->xmdot * $tsince;
-        $sat->deep_arg->omgadf = $sat->tle->omegao + $sat->deep_arg->omgdot * $tsince;
-        $xnoddf = $sat->tle->xnodeo + $sat->deep_arg->xnodot * $tsince;
-        $tsq = $tsince * $tsince;
-        $sat->deep_arg->xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
-        $tempa = 1.0 - $sat->sgps->c1 * $tsince;
-        $tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
-        $templ = $sat->sgps->t2cof * $tsq;
-        $sat->deep_arg->xn = $sat->deep_arg->xnodp;
-
-        /* Update for deep-space secular effects */
-        $sat->deep_arg->xll = $xmdf;
-        $sat->deep_arg->t = $tsince;
-
-        $this->Deep(self::dpsec, $sat);
-
-        $xmdf = $sat->deep_arg->xll;
-        $a = pow(Predict::xke / $sat->deep_arg->xn, Predict::tothrd) * $tempa * $tempa;
-        $sat->deep_arg->em = $sat->deep_arg->em - $tempe;
-        $xmam = $xmdf + $sat->deep_arg->xnodp * $templ;
-
-        /* Update for deep-space periodic effects */
-        $sat->deep_arg->xll = $xmam;
-
-        $this->Deep(self::dpper, $sat);
-
-        $xmam = $sat->deep_arg->xll;
-        $xl = $xmam + $sat->deep_arg->omgadf + $sat->deep_arg->xnode;
-        $beta = sqrt(1.0 - $sat->deep_arg->em * $sat->deep_arg->em);
-        $sat->deep_arg->xn = Predict::xke / pow($a, 1.5);
-
-        /* Long period periodics */
-        $axn = $sat->deep_arg->em * cos($sat->deep_arg->omgadf);
-        $temp = 1.0 / ($a * $beta * $beta);
-        $xll = $temp * $sat->sgps->xlcof * $axn;
-        $aynl = $temp * $sat->sgps->aycof;
-        $xlt = $xl + $xll;
-        $ayn = $sat->deep_arg->em * sin($sat->deep_arg->omgadf) + $aynl;
-
-        /* Solve Kepler's Equation */
-        $capu = Predict_Math::FMod2p ($xlt - $sat->deep_arg->xnode);
-        $temp2 = $capu;
-
-        $i = 0;
-        do {
-            $sinepw = sin($temp2);
-            $cosepw = cos($temp2);
-            $temp3 = $axn * $sinepw;
-            $temp4 = $ayn * $cosepw;
-            $temp5 = $axn * $cosepw;
-            $temp6 = $ayn * $sinepw;
-            $epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
-            if (abs($epw - $temp2) <= Predict::e6a) {
-                break;
-            }
-            $temp2 = $epw;
-        } while ($i++ < 10);
-
-        /* Short period preliminary quantities */
-        $ecose = $temp5 + $temp6;
-        $esine = $temp3 - $temp4;
-        $elsq = $axn * $axn + $ayn * $ayn;
-        $temp = 1.0 - $elsq;
-        $pl = $a * $temp;
-        $r = $a * (1.0 - $ecose);
-        $temp1 = 1.0 / $r;
-        $rdot = Predict::xke * sqrt($a) * $esine * $temp1;
-        $rfdot = Predict::xke * sqrt($pl) * $temp1;
-        $temp2 = $a * $temp1;
-        $betal = sqrt($temp);
-        $temp3 = 1.0 / (1.0 + $betal);
-        $cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
-        $sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
-        $u = Predict_Math::AcTan($sinu, $cosu);
-        $sin2u = 2.0 * $sinu * $cosu;
-        $cos2u = 2.0 * $cosu * $cosu - 1.0;
-        $temp = 1.0 / $pl;
-        $temp1 = Predict::ck2 * $temp;
-        $temp2 = $temp1 * $temp;
-
-        /* Update for short periodics */
-        $rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
-             0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
-        $uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
-        $xnodek = $sat->deep_arg->xnode + 1.5 * $temp2 * $sat->deep_arg->cosio * $sin2u;
-        $xinck = $sat->deep_arg->xinc + 1.5 * $temp2 *
-             $sat->deep_arg->cosio * $sat->deep_arg->sinio * $cos2u;
-        $rdotk = $rdot - $sat->deep_arg->xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
-        $rfdotk = $rfdot + $sat->deep_arg->xn * $temp1 *
-             ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
-
-        /* Orientation vectors */
-        $sinuk = sin($uk);
-        $cosuk = cos($uk);
-        $sinik = sin($xinck);
-        $cosik = cos($xinck);
-        $sinnok = sin($xnodek);
-        $cosnok = cos($xnodek);
-        $xmx = -$sinnok * $cosik;
-        $xmy = $cosnok * $cosik;
-        $ux = $xmx * $sinuk + $cosnok * $cosuk;
-        $uy = $xmy * $sinuk + $sinnok * $cosuk;
-        $uz = $sinik * $sinuk;
-        $vx = $xmx * $cosuk - $cosnok * $sinuk;
-        $vy = $xmy * $cosuk - $sinnok * $sinuk;
-        $vz = $sinik * $cosuk;
-
-        /* Position and velocity */
-        $sat->pos->x = $rk * $ux;
-        $sat->pos->y = $rk * $uy;
-        $sat->pos->z = $rk * $uz;
-        $sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
-        $sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
-        $sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
-
-        /* Phase in rads */
-        $sat->phase = $xlt - $sat->deep_arg->xnode - $sat->deep_arg->omgadf + Predict::twopi;
-        if ($sat->phase < 0.0) {
-            $sat->phase += Predict::twopi;
-        }
-        $sat->phase = Predict_Math::FMod2p ($sat->phase);
-
-        $sat->tle->omegao1 = $sat->deep_arg->omgadf;
-        $sat->tle->xincl1  = $sat->deep_arg->xinc;
-        $sat->tle->xnodeo1 = $sat->deep_arg->xnode;
-    } /* SDP4 */
-
-
-    /* DEEP */
-    /* This function is used by SDP4 to add lunar and solar */
-    /* perturbation effects to deep-space orbit objects.    */
-    public function Deep($ientry, Predict_Sat $sat)
-    {
-        switch ($ientry) {
-        case self::dpinit : /* Entrance for deep space initialization */
-            $sat->dps->thgr = Predict_Time::ThetaG($sat->tle->epoch, $sat->deep_arg);
-            $eq = $sat->tle->eo;
-            $sat->dps->xnq = $sat->deep_arg->xnodp;
-            $aqnv = 1.0 / $sat->deep_arg->aodp;
-            $sat->dps->xqncl = $sat->tle->xincl;
-            $xmao = $sat->tle->xmo;
-            $xpidot = $sat->deep_arg->omgdot + $sat->deep_arg->xnodot;
-            $sinq = sin($sat->tle->xnodeo);
-            $cosq = cos($sat->tle->xnodeo);
-            $sat->dps->omegaq = $sat->tle->omegao;
-            $sat->dps->preep = 0;
-
-            /* Initialize lunar solar terms */
-            $day = $sat->deep_arg->ds50 + 18261.5;  /* Days since 1900 Jan 0.5 */
-            if ($day != $sat->dps->preep) {
-                $sat->dps->preep = $day;
-                $xnodce = 4.5236020 - 9.2422029E-4 * $day;
-                $stem = sin($xnodce);
-                $ctem = cos($xnodce);
-                $sat->dps->zcosil = 0.91375164 - 0.03568096 * $ctem;
-                $sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil * $sat->dps->zcosil);
-                $sat->dps->zsinhl = 0.089683511 * $stem / $sat->dps->zsinil;
-                $sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl * $sat->dps->zsinhl);
-                $c = 4.7199672 + 0.22997150 * $day;
-                $gam = 5.8351514 + 0.0019443680 * $day;
-                $sat->dps->zmol = Predict_Math::FMod2p($c - $gam);
-                $zx = 0.39785416 * $stem / $sat->dps->zsinil;
-                $zy = $sat->dps->zcoshl * $ctem + 0.91744867 * $sat->dps->zsinhl * $stem;
-                $zx = Predict_Math::AcTan($zx, $zy);
-                $zx = $gam + $zx - $xnodce;
-                $sat->dps->zcosgl = cos($zx);
-                $sat->dps->zsingl = sin($zx);
-                $sat->dps->zmos = 6.2565837 + 0.017201977 * $day;
-                $sat->dps->zmos = Predict_Math::FMod2p($sat->dps->zmos);
-            } /* End if(day != preep) */
-
-            /* Do solar terms */
-            $sat->dps->savtsn = 1E20;
-            $zcosg = Predict::zcosgs;
-            $zsing = Predict::zsings;
-            $zcosi = Predict::zcosis;
-            $zsini = Predict::zsinis;
-            $zcosh = $cosq;
-            $zsinh = $sinq;
-            $cc = Predict::c1ss;
-            $zn = Predict::zns;
-            $ze = Predict::zes;
-            $zmo = $sat->dps->zmos;
-            $xnoi = 1.0 / $sat->dps->xnq;
-
-            /* Loop breaks when Solar terms are done a second */
-            /* time, after Lunar terms are initialized        */
-            for(;;) {
-                /* Solar terms done again after Lunar terms are done */
-                $a1 = $zcosg * $zcosh + $zsing * $zcosi * $zsinh;
-                $a3 = -$zsing * $zcosh + $zcosg * $zcosi * $zsinh;
-                $a7 = -$zcosg * $zsinh + $zsing * $zcosi * $zcosh;
-                $a8 = $zsing * $zsini;
-                $a9 = $zsing * $zsinh + $zcosg * $zcosi * $zcosh;
-                $a10 = $zcosg * $zsini;
-                $a2 = $sat->deep_arg->cosio * $a7 + $sat->deep_arg->sinio * $a8;
-                $a4 = $sat->deep_arg->cosio * $a9 + $sat->deep_arg->sinio * $a10;
-                $a5 = -$sat->deep_arg->sinio * $a7 + $sat->deep_arg->cosio * $a8;
-                $a6 = -$sat->deep_arg->sinio * $a9 + $sat->deep_arg->cosio * $a10;
-                $x1 = $a1 * $sat->deep_arg->cosg + $a2 * $sat->deep_arg->sing;
-                $x2 = $a3 * $sat->deep_arg->cosg + $a4 * $sat->deep_arg->sing;
-                $x3 = -$a1 * $sat->deep_arg->sing + $a2 * $sat->deep_arg->cosg;
-                $x4 = -$a3 * $sat->deep_arg->sing + $a4 * $sat->deep_arg->cosg;
-                $x5 = $a5 * $sat->deep_arg->sing;
-                $x6 = $a6 * $sat->deep_arg->sing;
-                $x7 = $a5 * $sat->deep_arg->cosg;
-                $x8 = $a6 * $sat->deep_arg->cosg;
-                $z31 = 12 * $x1 * $x1 - 3 * $x3 * $x3;
-                $z32 = 24 * $x1 * $x2 - 6 * $x3 * $x4;
-                $z33 = 12 * $x2 * $x2 - 3 * $x4 * $x4;
-                $z1 = 3 * ($a1 * $a1 + $a2 * $a2) + $z31 * $sat->deep_arg->eosq;
-                $z2 = 6 * ($a1 * $a3 + $a2 * $a4) + $z32 * $sat->deep_arg->eosq;
-                $z3 = 3 * ($a3 * $a3 + $a4 * $a4) + $z33 * $sat->deep_arg->eosq;
-                $z11 = -6 * $a1 * $a5 + $sat->deep_arg->eosq * (-24 * $x1 * $x7 - 6 * $x3 * $x5);
-                $z12 = -6 * ($a1 * $a6 + $a3 * $a5) + $sat->deep_arg->eosq *
-                    (-24 * ($x2 * $x7 + $x1 * $x8) - 6 * ($x3 * $x6 + $x4 * $x5));
-                $z13 = -6 * $a3 * $a6 + $sat->deep_arg->eosq * (-24 * $x2 * $x8 - 6 * $x4 * $x6);
-                $z21 = 6 * $a2 * $a5 + $sat->deep_arg->eosq * (24 * $x1 * $x5 - 6 * $x3 * $x7);
-                $z22 = 6 * ($a4 * $a5 + $a2 * $a6) + $sat->deep_arg->eosq *
-                    (24 * ($x2 * $x5 + $x1 * $x6) - 6 * ($x4 * $x7 + $x3 * $x8));
-                $z23 = 6 * $a4 * $a6 + $sat->deep_arg->eosq * (24 * $x2 * $x6 - 6 * $x4 * $x8);
-                $z1 = $z1 + $z1 + $sat->deep_arg->betao2 * $z31;
-                $z2 = $z2 + $z2 + $sat->deep_arg->betao2 * $z32;
-                $z3 = $z3 + $z3 + $sat->deep_arg->betao2 * $z33;
-                $s3 = $cc * $xnoi;
-                $s2 = -0.5 * $s3 / $sat->deep_arg->betao;
-                $s4 = $s3 * $sat->deep_arg->betao;
-                $s1 = -15 * $eq * $s4;
-                $s5 = $x1 * $x3 + $x2 * $x4;
-                $s6 = $x2 * $x3 + $x1 * $x4;
-                $s7 = $x2 * $x4 - $x1 * $x3;
-                $se = $s1 * $zn * $s5;
-                $si = $s2 * $zn * ($z11 + $z13);
-                $sl = -$zn * $s3 * ($z1 + $z3 - 14 - 6 * $sat->deep_arg->eosq);
-                $sgh = $s4 * $zn * ($z31 + $z33 - 6);
-                $sh = -$zn * $s2 * ($z21 + $z23);
-                if ($sat->dps->xqncl < 5.2359877E-2) {
-                    $sh = 0;
-                }
-                $sat->dps->ee2 = 2 * $s1 * $s6;
-                $sat->dps->e3 = 2 * $s1 * $s7;
-                $sat->dps->xi2 = 2 * $s2 * $z12;
-                $sat->dps->xi3 = 2 * $s2 * ($z13 - $z11);
-                $sat->dps->xl2 = -2 * $s3 * $z2;
-                $sat->dps->xl3 = -2 * $s3 * ($z3 - $z1);
-                $sat->dps->xl4 = -2 * $s3 * (-21 - 9 * $sat->deep_arg->eosq) * $ze;
-                $sat->dps->xgh2 = 2 * $s4 * $z32;
-                $sat->dps->xgh3 = 2 * $s4 * ($z33 - $z31);
-                $sat->dps->xgh4 = -18 * $s4 * $ze;
-                $sat->dps->xh2 = -2 * $s2 * $z22;
-                $sat->dps->xh3 = -2 * $s2 * ($z23 - $z21);
-
-                if ($sat->flags & self::LUNAR_TERMS_DONE_FLAG) {
-                    break;
-                }
-
-                /* Do lunar terms */
-                $sat->dps->sse = $se;
-                $sat->dps->ssi = $si;
-                $sat->dps->ssl = $sl;
-                $sat->dps->ssh = $sh / $sat->deep_arg->sinio;
-                $sat->dps->ssg = $sgh - $sat->deep_arg->cosio * $sat->dps->ssh;
-                $sat->dps->se2 = $sat->dps->ee2;
-                $sat->dps->si2 = $sat->dps->xi2;
-                $sat->dps->sl2 = $sat->dps->xl2;
-                $sat->dps->sgh2 = $sat->dps->xgh2;
-                $sat->dps->sh2 = $sat->dps->xh2;
-                $sat->dps->se3 = $sat->dps->e3;
-                $sat->dps->si3 = $sat->dps->xi3;
-                $sat->dps->sl3 = $sat->dps->xl3;
-                $sat->dps->sgh3 = $sat->dps->xgh3;
-                $sat->dps->sh3 = $sat->dps->xh3;
-                $sat->dps->sl4 = $sat->dps->xl4;
-                $sat->dps->sgh4 = $sat->dps->xgh4;
-                $zcosg = $sat->dps->zcosgl;
-                $zsing = $sat->dps->zsingl;
-                $zcosi = $sat->dps->zcosil;
-                $zsini = $sat->dps->zsinil;
-                $zcosh = $sat->dps->zcoshl * $cosq + $sat->dps->zsinhl * $sinq;
-                $zsinh = $sinq * $sat->dps->zcoshl - $cosq * $sat->dps->zsinhl;
-                $zn = Predict::znl;
-                $cc = Predict::c1l;
-                $ze = Predict::zel;
-                $zmo = $sat->dps->zmol;
-                $sat->flags |= self::LUNAR_TERMS_DONE_FLAG;
-            } /* End of for(;;) */
-
-            $sat->dps->sse = $sat->dps->sse + $se;
-            $sat->dps->ssi = $sat->dps->ssi + $si;
-            $sat->dps->ssl = $sat->dps->ssl + $sl;
-            $sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio / $sat->deep_arg->sinio * $sh;
-            $sat->dps->ssh = $sat->dps->ssh + $sh / $sat->deep_arg->sinio;
-
-            /* Geopotential resonance initialization for 12 hour orbits */
-            $sat->flags &= ~self::RESONANCE_FLAG;
-            $sat->flags &= ~self::SYNCHRONOUS_FLAG;
-
-            if (!(($sat->dps->xnq < 0.0052359877) && ($sat->dps->xnq > 0.0034906585))) {
-                if( ($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924) ) {
-                    return;
-                }
-                if ($eq < 0.5) {
-                    return;
-                }
-                $sat->flags |= self::RESONANCE_FLAG;
-                $eoc = $eq * $sat->deep_arg->eosq;
-                $g201 = -0.306 - ($eq - 0.64) * 0.440;
-                if ($eq <= 0.65) {
-                    $g211 = 3.616 - 13.247 * $eq + 16.290 * $sat->deep_arg->eosq;
-                    $g310 = -19.302 + 117.390 * $eq - 228.419 *
-                        $sat->deep_arg->eosq + 156.591 * $eoc;
-                    $g322 = -18.9068 + 109.7927 * $eq - 214.6334 *
-                        $sat->deep_arg->eosq + 146.5816 * $eoc;
-                    $g410 = -41.122 + 242.694 * $eq - 471.094 *
-                        $sat->deep_arg->eosq + 313.953 * $eoc;
-                    $g422 = -146.407 + 841.880 * $eq - 1629.014 *
-                        $sat->deep_arg->eosq + 1083.435 * $eoc;
-                    $g520 = -532.114 + 3017.977 * $eq - 5740 *
-                        $sat->deep_arg->eosq + 3708.276 * $eoc;
-                } else {
-                    $g211 = -72.099 + 331.819 * $eq - 508.738 *
-                        $sat->deep_arg->eosq + 266.724 * $eoc;
-                    $g310 = -346.844 + 1582.851 * $eq - 2415.925 *
-                        $sat->deep_arg->eosq + 1246.113 * $eoc;
-                    $g322 = -342.585 + 1554.908 * $eq - 2366.899 *
-                        $sat->deep_arg->eosq + 1215.972 * $eoc;
-                    $g410 = -1052.797 + 4758.686 * $eq - 7193.992 *
-                        $sat->deep_arg->eosq + 3651.957 * $eoc;
-                    $g422 = -3581.69 + 16178.11 * $eq - 24462.77 *
-                        $sat->deep_arg->eosq+ 12422.52 * $eoc;
-                    if ($eq <= 0.715) {
-                        $g520 = 1464.74 - 4664.75 * $eq + 3763.64 * $sat->deep_arg->eosq;
-                    } else {
-                        $g520 = -5149.66 + 29936.92 * $eq - 54087.36 *
-                            $sat->deep_arg->eosq + 31324.56 * $eoc;
-                    }
-                } /* End if (eq <= 0.65) */
-
-                if ($eq < 0.7) {
-                    $g533 = -919.2277 + 4988.61 * $eq - 9064.77 *
-                        $sat->deep_arg->eosq + 5542.21 * $eoc;
-                    $g521 = -822.71072 + 4568.6173 * $eq - 8491.4146 *
-                        $sat->deep_arg->eosq + 5337.524 * $eoc;
-                    $g532 = -853.666 + 4690.25 * $eq - 8624.77 *
-                        $sat->deep_arg->eosq + 5341.4 * $eoc;
-                }
-                else {
-                    $g533 = -37995.78 + 161616.52 * $eq - 229838.2*
-                        $sat->deep_arg->eosq + 109377.94 * $eoc;
-                    $g521 = -51752.104 + 218913.95 * $eq - 309468.16*
-                        $sat->deep_arg->eosq + 146349.42 * $eoc;
-                    $g532 = -40023.88 + 170470.89 * $eq - 242699.48*
-                        $sat->deep_arg->eosq + 115605.82 * $eoc;
-                } /* End if (eq <= 0.7) */
-
-                $sini2 = $sat->deep_arg->sinio * $sat->deep_arg->sinio;
-                $f220 = 0.75 * (1 + 2 * $sat->deep_arg->cosio + $sat->deep_arg->theta2);
-                $f221 = 1.5 * $sini2;
-                $f321 = 1.875 * $sat->deep_arg->sinio * (1 - 2 *
-                                  $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f322 = -1.875 * $sat->deep_arg->sinio * (1 + 2*
-                                   $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f441 = 35 * $sini2 * $f220;
-                $f442 = 39.3750 * $sini2 * $sini2;
-                $f522 = 9.84375 * $sat->deep_arg->sinio * ($sini2 * (1 - 2 * $sat->deep_arg->cosio - 5 *
-                                       $sat->deep_arg->theta2) + 0.33333333 * (-2 + 4 * $sat->deep_arg->cosio +
-                                                     6 * $sat->deep_arg->theta2));
-                $f523 = $sat->deep_arg->sinio * (4.92187512 * $sini2 * (-2 - 4 *
-                                      $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2) + 6.56250012
-                            * (1 + 2 * $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2));
-                $f542 = 29.53125 * $sat->deep_arg->sinio * (2 - 8 *
-                                 $sat->deep_arg->cosio + $sat->deep_arg->theta2 *
-                                 (-12 + 8 * $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2));
-                $f543 = 29.53125 * $sat->deep_arg->sinio * (-2 - 8 * $sat->deep_arg->cosio +
-                                 $sat->deep_arg->theta2 * (12 + 8 * $sat->deep_arg->cosio - 10 *
-                                           $sat->deep_arg->theta2));
-                $xno2 = $sat->dps->xnq * $sat->dps->xnq;
-                $ainv2 = $aqnv * $aqnv;
-                $temp1 = 3 * $xno2 * $ainv2;
-                $temp = $temp1 * Predict::root22;
-                $sat->dps->d2201 = $temp * $f220 * $g201;
-                $sat->dps->d2211 = $temp * $f221 * $g211;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root32;
-                $sat->dps->d3210 = $temp * $f321 * $g310;
-                $sat->dps->d3222 = $temp * $f322 * $g322;
-                $temp1 = $temp1 * $aqnv;
-                $temp = 2 * $temp1 * Predict::root44;
-                $sat->dps->d4410 = $temp * $f441 * $g410;
-                $sat->dps->d4422 = $temp * $f442 * $g422;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root52;
-                $sat->dps->d5220 = $temp * $f522 * $g520;
-                $sat->dps->d5232 = $temp * $f523 * $g532;
-                $temp = 2 * $temp1 * Predict::root54;
-                $sat->dps->d5421 = $temp * $f542 * $g521;
-                $sat->dps->d5433 = $temp * $f543 * $g533;
-                $sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->xnodeo - $sat->dps->thgr - $sat->dps->thgr;
-                $bfact = $sat->deep_arg->xmdot + $sat->deep_arg->xnodot +
-                    $sat->deep_arg->xnodot - Predict::thdt - Predict::thdt;
-                $bfact = $bfact + $sat->dps->ssl + $sat->dps->ssh + $sat->dps->ssh;
-            } else {
-                $sat->flags |= self::RESONANCE_FLAG;
-                $sat->flags |= self::SYNCHRONOUS_FLAG;
-                /* Synchronous resonance terms initialization */
-                $g200 = 1 + $sat->deep_arg->eosq * (-2.5 + 0.8125 * $sat->deep_arg->eosq);
-                $g310 = 1 + 2 * $sat->deep_arg->eosq;
-                $g300 = 1 + $sat->deep_arg->eosq * (-6 + 6.60937 * $sat->deep_arg->eosq);
-                $f220 = 0.75 * (1 + $sat->deep_arg->cosio) * (1 + $sat->deep_arg->cosio);
-                $f311 = 0.9375 * $sat->deep_arg->sinio * $sat->deep_arg->sinio *
-                    (1 + 3 * $sat->deep_arg->cosio) - 0.75 * (1 + $sat->deep_arg->cosio);
-                $f330 = 1 + $sat->deep_arg->cosio;
-                $f330 = 1.875 * $f330 * $f330 * $f330;
-                $sat->dps->del1 = 3 * $sat->dps->xnq * $sat->dps->xnq * $aqnv * $aqnv;
-                $sat->dps->del2 = 2 * $sat->dps->del1 * $f220 * $g200 * Predict::q22;
-                $sat->dps->del3 = 3 * $sat->dps->del1 * $f330 * $g300 * Predict::q33 * $aqnv;
-                $sat->dps->del1 = $sat->dps->del1 * $f311 * $g310 * Predict::q31 * $aqnv;
-                $sat->dps->fasx2 = 0.13130908;
-                $sat->dps->fasx4 = 2.8843198;
-                $sat->dps->fasx6 = 0.37448087;
-                $sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->omegao - $sat->dps->thgr;
-                $bfact = $sat->deep_arg->xmdot + $xpidot - Predict::thdt;
-                $bfact = $bfact + $sat->dps->ssl + $sat->dps->ssg + $sat->dps->ssh;
-            } /* End if( !(xnq < 0.0052359877) && (xnq > 0.0034906585) ) */
-
-            $sat->dps->xfact = $bfact - $sat->dps->xnq;
-
-            /* Initialize integrator */
-            $sat->dps->xli = $sat->dps->xlamo;
-            $sat->dps->xni = $sat->dps->xnq;
-            $sat->dps->atime = 0;
-            $sat->dps->stepp = 720;
-            $sat->dps->stepn = -720;
-            $sat->dps->step2 = 259200;
-            /* End case self::dpinit: */
-            return;
-
-        case self::dpsec: /* Entrance for deep space secular effects */
-            $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl * $sat->deep_arg->t;
-            $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg * $sat->deep_arg->t;
-            $sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh * $sat->deep_arg->t;
-            $sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse * $sat->deep_arg->t;
-            $sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi * $sat->deep_arg->t;
-            if ($sat->deep_arg->xinc < 0) {
-                $sat->deep_arg->xinc = -$sat->deep_arg->xinc;
-                $sat->deep_arg->xnode = $sat->deep_arg->xnode + Predict::pi;
-                $sat->deep_arg->omgadf = $sat->deep_arg->omgadf - Predict::pi;
-            }
-            if(~$sat->flags & self::RESONANCE_FLAG ) {
-                return;
-            }
-
-            do {
-                if ( ($sat->dps->atime == 0) ||
-                    (($sat->deep_arg->t >= 0) && ($sat->dps->atime < 0)) ||
-                    (($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0)) ) {
-                    /* Epoch restart */
-                    if ($sat->deep_arg->t >= 0) {
-                        $delt = $sat->dps->stepp;
-                    } else {
-                        $delt = $sat->dps->stepn;
-                    }
-
-                    $sat->dps->atime = 0;
-                    $sat->dps->xni = $sat->dps->xnq;
-                    $sat->dps->xli = $sat->dps->xlamo;
-                } else {
-                    if (abs($sat->deep_arg->t) >= abs($sat->dps->atime)) {
-                        if ($sat->deep_arg->t > 0) {
-                            $delt = $sat->dps->stepp;
-                        } else {
-                            $delt = $sat->dps->stepn;
-                        }
-                    }
-                }
-
-                do {
-                    if (abs($sat->deep_arg->t - $sat->dps->atime) >= $sat->dps->stepp) {
-                        $sat->flags |= self::DO_LOOP_FLAG;
-                        $sat->flags &= ~self::EPOCH_RESTART_FLAG;
-                    }
-                    else {
-                        $ft = $sat->deep_arg->t - $sat->dps->atime;
-                        $sat->flags &= ~self::DO_LOOP_FLAG;
-                    }
-
-                    if (abs($sat->deep_arg->t) < abs($sat->dps->atime)) {
-                        if ($sat->deep_arg->t >= 0) {
-                            $delt = $sat->dps->stepn;
-                        } else {
-                            $delt = $sat->dps->stepp;
-                        }
-                        $sat->flags |= (self::DO_LOOP_FLAG | self::EPOCH_RESTART_FLAG);
-                    }
-
-                    /* Dot terms calculated */
-                    if ($sat->flags & self::SYNCHRONOUS_FLAG) {
-                        $xndot = $sat->dps->del1 * sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2 * sin(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + $sat->dps->del3 * sin(3 * ($sat->dps->xli - $sat->dps->fasx6));
-                        $xnddt = $sat->dps->del1 * cos($sat->dps->xli - $sat->dps->fasx2) + 2 * $sat->dps->del2 * cos(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + 3 * $sat->dps->del3 * cos(3 * ($sat->dps->xli - $sat->dps->fasx6));
-                    } else {
-                        $xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot * $sat->dps->atime;
-                        $x2omi = $xomi + $xomi;
-                        $x2li = $sat->dps->xli + $sat->dps->xli;
-                        $xndot = $sat->dps->d2201 * sin($x2omi + $sat->dps->xli - Predict::g22)
-                            + $sat->dps->d2211 * sin($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * sin($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * sin(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d4410 * sin($x2omi + $x2li- Predict::g44)
-                            + $sat->dps->d4422 * sin($x2li- Predict::g44)
-                            + $sat->dps->d5220 * sin($xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5232 * sin(-$xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5421 * sin($xomi + $x2li - Predict::g54)
-                            + $sat->dps->d5433 * sin(-$xomi + $x2li - Predict::g54);
-                        $xnddt = $sat->dps->d2201 * cos($x2omi + $sat->dps->xli- Predict::g22)
-                            + $sat->dps->d2211 * cos($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * cos($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * cos(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d5220 * cos($xomi + $sat->dps->xli - Predict::g52)
-                            + $sat->dps->d5232 * cos(-$xomi + $sat->dps->xli - Predict::g52)
-                            + 2 * ($sat->dps->d4410 * cos($x2omi + $x2li - Predict::g44)
-                                + $sat->dps->d4422 * cos($x2li - Predict::g44)
-                                + $sat->dps->d5421 * cos($xomi + $x2li - Predict::g54)
-                                + $sat->dps->d5433 * cos(-$xomi + $x2li - Predict::g54));
-                    } /* End of if (isFlagSet(SYNCHRONOUS_FLAG)) */
-
-                    $xldot = $sat->dps->xni + $sat->dps->xfact;
-                    $xnddt = $xnddt * $xldot;
-
-                    if ($sat->flags & self::DO_LOOP_FLAG) {
-                        $sat->dps->xli = $sat->dps->xli + $xldot * $delt + $xndot * $sat->dps->step2;
-                        $sat->dps->xni = $sat->dps->xni + $xndot * $delt + $xnddt * $sat->dps->step2;
-                        $sat->dps->atime = $sat->dps->atime + $delt;
-                    }
-                } while (($sat->flags & self::DO_LOOP_FLAG) &&
-                        (~$sat->flags & self::EPOCH_RESTART_FLAG));
-            }
-            while (($sat->flags & self::DO_LOOP_FLAG) && ($sat->flags & self::EPOCH_RESTART_FLAG));
-
-            $sat->deep_arg->xn = $sat->dps->xni + $xndot * $ft + $xnddt * $ft * $ft * 0.5;
-            $xl = $sat->dps->xli + $xldot * $ft + $xndot * $ft * $ft * 0.5;
-            $temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t * Predict::thdt;
-
-            if (~$sat->flags & self::SYNCHRONOUS_FLAG) {
-                $sat->deep_arg->xll = $xl + $temp + $temp;
-            } else {
-                $sat->deep_arg->xll = $xl - $sat->deep_arg->omgadf + $temp;
-            }
-
-            return;
-            /* End case dpsec: */
-
-        case self::dpper: /* Entrance for lunar-solar periodics */
-            $sinis = sin($sat->deep_arg->xinc);
-            $cosis = cos($sat->deep_arg->xinc);
-            if (abs($sat->dps->savtsn - $sat->deep_arg->t) >= 30) {
-                $sat->dps->savtsn = $sat->deep_arg->t;
-                $zm = $sat->dps->zmos + Predict::zns * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zes * sin($zm);
-                $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $ses = $sat->dps->se2 * $f2 + $sat->dps->se3 * $f3;
-                $sis = $sat->dps->si2 * $f2 + $sat->dps->si3 * $f3;
-                $sls = $sat->dps->sl2 * $f2 + $sat->dps->sl3 * $f3 + $sat->dps->sl4 * $sinzf;
-                $sat->dps->sghs = $sat->dps->sgh2 * $f2 + $sat->dps->sgh3 * $f3 + $sat->dps->sgh4 * $sinzf;
-                $sat->dps->shs = $sat->dps->sh2 * $f2 + $sat->dps->sh3 * $f3;
-                $zm = $sat->dps->zmol + Predict::znl * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zel * sin($zm);
-                $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $sel = $sat->dps->ee2 * $f2 + $sat->dps->e3 * $f3;
-                $sil = $sat->dps->xi2 * $f2 + $sat->dps->xi3 * $f3;
-                $sll = $sat->dps->xl2 * $f2 + $sat->dps->xl3 * $f3 + $sat->dps->xl4 * $sinzf;
-                $sat->dps->sghl = $sat->dps->xgh2 * $f2 + $sat->dps->xgh3 * $f3 + $sat->dps->xgh4 * $sinzf;
-                $sat->dps->sh1 = $sat->dps->xh2 * $f2 + $sat->dps->xh3 * $f3;
-                $sat->dps->pe = $ses + $sel;
-                $sat->dps->pinc = $sis + $sil;
-                $sat->dps->pl = $sls + $sll;
-            }
-
-            $pgh = $sat->dps->sghs + $sat->dps->sghl;
-            $ph = $sat->dps->shs + $sat->dps->sh1;
-            $sat->deep_arg->xinc = $sat->deep_arg->xinc + $sat->dps->pinc;
-            $sat->deep_arg->em = $sat->deep_arg->em + $sat->dps->pe;
-
-            if ($sat->dps->xqncl >= 0.2) {
-                /* Apply periodics directly */
-                $ph = $ph / $sat->deep_arg->sinio;
-                $pgh = $pgh - $sat->deep_arg->cosio * $ph;
-                $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $pgh;
-                $sat->deep_arg->xnode = $sat->deep_arg->xnode + $ph;
-                $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
-            } else {
-                /* Apply periodics with Lyddane modification */
-                $sinok = sin($sat->deep_arg->xnode);
-                $cosok = cos($sat->deep_arg->xnode);
-                $alfdp = $sinis * $sinok;
-                $betdp = $sinis * $cosok;
-                $dalf = $ph * $cosok + $sat->dps->pinc * $cosis * $sinok;
-                $dbet = -$ph * $sinok + $sat->dps->pinc * $cosis * $cosok;
-                $alfdp = $alfdp + $dalf;
-                $betdp = $betdp + $dbet;
-                $sat->deep_arg->xnode = Predict_Math::FMod2p($sat->deep_arg->xnode);
-                $xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis * $sat->deep_arg->xnode;
-                $dls = $sat->dps->pl + $pgh - $sat->dps->pinc * $sat->deep_arg->xnode * $sinis;
-                $xls = $xls + $dls;
-                $xnoh = $sat->deep_arg->xnode;
-                $sat->deep_arg->xnode = Predict_Math::AcTan($alfdp, $betdp);
-
-                /* This is a patch to Lyddane modification */
-                /* suggested by Rob Matson. */
-                if(abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
-                    if ($sat->deep_arg->xnode < $xnoh) {
-                        $sat->deep_arg->xnode += Predict::twopi;
-                    } else {
-                        $sat->deep_arg->xnode -= Predict::twopi;
-                    }
-                }
-
-                $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
-                $sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc) *
-                    $sat->deep_arg->xnode;
-            } /* End case dpper: */
-            return;
-
-        } /* End switch(ientry) */
-
-    } /* End of Deep() */
-
-    /**
-     * Singleton
-     *
-     * @param Predict_Sat $sat The current satellite data instance
-     *
-     * @return Predict_SGPSDP
-     */
-    public static function getInstance(Predict_Sat $sat)
-    {
-        static $instances = array();
-        $catnr = $sat->tle->catnr;
-        if (!isset($instances[$catnr])) {
-            $instances[$catnr] = new self();
-        }
-        return $instances[$catnr];
-    }
+	const dpinit = 1; /* Deep-space initialization code */
+	const dpsec  = 2; /* Deep-space secular code        */
+	const dpper  = 3; /* Deep-space periodic code       */
+
+	/* SGP4 */
+	/* This function is used to calculate the position and velocity */
+	/* of near-earth (period < 225 minutes) satellites. tsince is   */
+	/* time since epoch in minutes, tle is a pointer to a tle_t     */
+	/* structure with Keplerian orbital elements and pos and vel    */
+	/* are vector_t structures returning ECI satellite position and */
+	/* velocity. Use Convert_Sat_State() to convert to km and km/s.*/
+	public function SGP4(Predict_Sat $sat, $tsince)
+	{
+		/* Initialization */
+		if (~$sat->flags & self::SGP4_INITIALIZED_FLAG) {
+			$sat->flags |= self::SGP4_INITIALIZED_FLAG;
+
+			/* Recover original mean motion (xnodp) and   */
+			/* semimajor axis (aodp) from input elements. */
+			$a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
+			$sat->sgps->cosio = cos($sat->tle->xincl);
+			$theta2 = $sat->sgps->cosio * $sat->sgps->cosio;
+			$sat->sgps->x3thm1 = 3 * $theta2 - 1.0;
+			$eosq = $sat->tle->eo * $sat->tle->eo;
+			$betao2 = 1 - $eosq;
+			$betao = sqrt($betao2);
+			$del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($a1 * $a1 * $betao * $betao2);
+			$ao = $a1 * (1 - $del1 * (0.5 * Predict::tothrd + $del1 * (1 + 134.0 / 81.0 * $del1)));
+			$delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($ao * $ao * $betao * $betao2);
+			$sat->sgps->xnodp = $sat->tle->xno / (1.0 + $delo);
+			$sat->sgps->aodp = $ao / (1.0 - $delo);
+
+			/* For perigee less than 220 kilometers, the "simple" flag is set */
+			/* and the equations are truncated to linear variation in sqrt a  */
+			/* and quadratic variation in mean anomaly.  Also, the c3 term,   */
+			/* the delta omega term, and the delta m term are dropped.        */
+			if (($sat->sgps->aodp * (1.0 - $sat->tle->eo) / Predict::ae) < (220.0 / Predict::xkmper + Predict::ae)) {
+				$sat->flags |= self::SIMPLE_FLAG;
+			} else {
+				$sat->flags &= ~self::SIMPLE_FLAG;
+			}
+
+			/* For perigee below 156 km, the       */
+			/* values of s and qoms2t are altered. */
+			$s4 = Predict::__s__;
+			$qoms24 = Predict::qoms2t;
+			$perige = ($sat->sgps->aodp * (1 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
+			if ($perige < 156.0) {
+				if ($perige <= 98.0) {
+					$s4 = 20.0;
+				} else {
+					$s4 = $perige - 78.0;
+				}
+				$qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
+				$s4 = $s4 / Predict::xkmper + Predict::ae;
+			}; /* FIXME FIXME: End of if(perige <= 98) NO WAY!!!! */
+
+			$pinvsq = 1.0 / ($sat->sgps->aodp * $sat->sgps->aodp * $betao2 * $betao2);
+			$tsi = 1.0 / ($sat->sgps->aodp - $s4);
+			$sat->sgps->eta = $sat->sgps->aodp * $sat->tle->eo * $tsi;
+			$etasq = $sat->sgps->eta * $sat->sgps->eta;
+			$eeta = $sat->tle->eo * $sat->sgps->eta;
+			$psisq = abs(1.0 - $etasq);
+			$coef = $qoms24 * pow($tsi, 4);
+			$coef1 = $coef / pow($psisq, 3.5);
+			$c2 = $coef1 * $sat->sgps->xnodp * ($sat->sgps->aodp *
+							(1.0 + 1.5 * $etasq + $eeta * (4.0 + $etasq)) +
+							0.75 * Predict::ck2 * $tsi / $psisq * $sat->sgps->x3thm1 *
+							(8.0 + 3.0 * $etasq * (8 + $etasq)));
+			$sat->sgps->c1 = $c2 * $sat->tle->bstar;
+			$sat->sgps->sinio = sin($sat->tle->xincl);
+			$a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
+			$c3 = $coef * $tsi * $a3ovk2 * $sat->sgps->xnodp * Predict::ae * $sat->sgps->sinio / $sat->tle->eo;
+			$sat->sgps->x1mth2 = 1.0 - $theta2;
+			$sat->sgps->c4 = 2.0 * $sat->sgps->xnodp * $coef1 * $sat->sgps->aodp * $betao2 *
+				($sat->sgps->eta * (2.0 + 0.5 * $etasq) +
+				 $sat->tle->eo * (0.5 + 2.0 * $etasq) -
+				 2.0 * Predict::ck2 * $tsi / ($sat->sgps->aodp * $psisq) *
+				 (-3.0 * $sat->sgps->x3thm1 * (1.0 - 2.0 * $eeta + $etasq * (1.5 - 0.5 * $eeta)) +
+				  0.75 * $sat->sgps->x1mth2 * (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
+				  cos(2.0 * $sat->tle->omegao)));
+			$sat->sgps->c5 = 2.0 * $coef1 * $sat->sgps->aodp * $betao2 *
+				(1.0 + 2.75 * ($etasq + $eeta) + $eeta * $etasq);
+			$theta4 = $theta2 * $theta2;
+			$temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->sgps->xnodp;
+			$temp2 = $temp1 * Predict::ck2 * $pinvsq;
+			$temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->sgps->xnodp;
+			$sat->sgps->xmdot = $sat->sgps->xnodp + 0.5 * $temp1 * $betao * $sat->sgps->x3thm1 +
+				0.0625 * $temp2 * $betao * (13.0 - 78.0 * $theta2 + 137.0 * $theta4);
+			$x1m5th = 1.0 - 5.0 * $theta2;
+			$sat->sgps->omgdot = -0.5 * $temp1 * $x1m5th +
+				0.0625 * $temp2 * (7.0 - 114.0 * $theta2 + 395.0 * $theta4) +
+				$temp3 * (3.0 - 36.0 * $theta2 + 49.0 * $theta4);
+			$xhdot1 = -$temp1 * $sat->sgps->cosio;
+			$sat->sgps->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $theta2) +
+							 2.0 * $temp3 * (3.0 - 7.0 * $theta2)) * $sat->sgps->cosio;
+			$sat->sgps->omgcof = $sat->tle->bstar * $c3 * cos($sat->tle->omegao);
+			$sat->sgps->xmcof = -Predict::tothrd * $coef * $sat->tle->bstar * Predict::ae / $eeta;
+			$sat->sgps->xnodcf = 3.5 * $betao2 * $xhdot1 * $sat->sgps->c1;
+			$sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
+			$sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->sgps->sinio *
+				(3.0 + 5.0 * $sat->sgps->cosio) / (1.0 + $sat->sgps->cosio);
+			$sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->sgps->sinio;
+			$sat->sgps->delmo = pow(1.0 + $sat->sgps->eta * cos($sat->tle->xmo), 3);
+			$sat->sgps->sinmo = sin($sat->tle->xmo);
+			$sat->sgps->x7thm1 = 7.0 * $theta2 - 1.0;
+			if (~$sat->flags & self::SIMPLE_FLAG) {
+				$c1sq = $sat->sgps->c1 * $sat->sgps->c1;
+				$sat->sgps->d2 = 4.0 * $sat->sgps->aodp * $tsi * $c1sq;
+				$temp = $sat->sgps->d2 * $tsi * $sat->sgps->c1 / 3.0;
+				$sat->sgps->d3 = (17.0 * $sat->sgps->aodp + $s4) * $temp;
+				$sat->sgps->d4 = 0.5 * $temp * $sat->sgps->aodp * $tsi *
+					(221.0 * $sat->sgps->aodp + 31.0 * $s4) * $sat->sgps->c1;
+				$sat->sgps->t3cof = $sat->sgps->d2 + 2.0 * $c1sq;
+				$sat->sgps->t4cof = 0.25 * (3.0 * $sat->sgps->d3 + $sat->sgps->c1 *
+							  (12.0 * $sat->sgps->d2 + 10.0 * $c1sq));
+				$sat->sgps->t5cof = 0.2 * (3.0 * $sat->sgps->d4 +
+							 12.0 * $sat->sgps->c1 * $sat->sgps->d3 +
+							 6.0 * $sat->sgps->d2 * $sat->sgps->d2 +
+							 15.0 * $c1sq * (2.0 * $sat->sgps->d2 + $c1sq));
+			}; /* End of if (isFlagClear(SIMPLE_FLAG)) */
+		}; /* End of SGP4() initialization */
+
+		/* Update for secular gravity and atmospheric drag. */
+		$xmdf = $sat->tle->xmo + $sat->sgps->xmdot * $tsince;
+		$omgadf = $sat->tle->omegao + $sat->sgps->omgdot * $tsince;
+		$xnoddf = $sat->tle->xnodeo + $sat->sgps->xnodot * $tsince;
+		$omega = $omgadf;
+		$xmp = $xmdf;
+		$tsq = $tsince * $tsince;
+		$xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
+		$tempa = 1.0 - $sat->sgps->c1 * $tsince;
+		$tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
+		$templ = $sat->sgps->t2cof * $tsq;
+		if (~$sat->flags & self::SIMPLE_FLAG) {
+			$delomg = $sat->sgps->omgcof * $tsince;
+			$delm = $sat->sgps->xmcof * (pow(1 + $sat->sgps->eta * cos($xmdf), 3) - $sat->sgps->delmo);
+			$temp = $delomg + $delm;
+			$xmp = $xmdf + $temp;
+			$omega = $omgadf - $temp;
+			$tcube = $tsq * $tsince;
+			$tfour = $tsince * $tcube;
+			$tempa = $tempa - $sat->sgps->d2 * $tsq - $sat->sgps->d3 * $tcube - $sat->sgps->d4 * $tfour;
+			$tempe = $tempe + $sat->tle->bstar * $sat->sgps->c5 * (sin($xmp) - $sat->sgps->sinmo);
+			$templ = $templ + $sat->sgps->t3cof * $tcube + $tfour *
+				($sat->sgps->t4cof + $tsince * $sat->sgps->t5cof);
+		}; /* End of if (isFlagClear(SIMPLE_FLAG)) */
+
+		$a = $sat->sgps->aodp * pow($tempa, 2);
+		$e = $sat->tle->eo - $tempe;
+		$xl = $xmp + $omega + $xnode + $sat->sgps->xnodp * $templ;
+		$beta = sqrt(1.0 - ($e * $e));
+		$xn = Predict::xke / pow($a, 1.5);
+
+		/* Long period periodics */
+		$axn = $e * cos($omega);
+		$temp = 1.0 / ($a * $beta * $beta);
+		$xll = $temp * $sat->sgps->xlcof * $axn;
+		$aynl = $temp * $sat->sgps->aycof;
+		$xlt = $xl + $xll;
+		$ayn = $e * sin($omega) + $aynl;
+
+		/* Solve Kepler's' Equation */
+		$capu = Predict_Math::FMod2p($xlt - $xnode);
+		$temp2 = $capu;
+
+		$i = 0;
+		do {
+			$sinepw = sin($temp2);
+			$cosepw = cos($temp2);
+			$temp3 = $axn * $sinepw;
+			$temp4 = $ayn * $cosepw;
+			$temp5 = $axn * $cosepw;
+			$temp6 = $ayn * $sinepw;
+			$epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
+			if (abs($epw - $temp2) <= Predict::e6a) {
+				break;
+			}
+			$temp2 = $epw;
+		} while ($i++ < 10);
+
+		/* Short period preliminary quantities */
+		$ecose = $temp5 + $temp6;
+		$esine = $temp3 - $temp4;
+		$elsq = $axn * $axn + $ayn * $ayn;
+		$temp = 1.0 - $elsq;
+		$pl = $a * $temp;
+		$r = $a * (1.0 - $ecose);
+		$temp1 = 1.0 / $r;
+		$rdot = Predict::xke * sqrt($a) * $esine * $temp1;
+		$rfdot = Predict::xke * sqrt($pl) * $temp1;
+		$temp2 = $a * $temp1;
+		$betal = sqrt($temp);
+		$temp3 = 1.0 / (1.0 + $betal);
+		$cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
+		$sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
+		$u = Predict_Math::AcTan($sinu, $cosu);
+		$sin2u = 2.0 * $sinu * $cosu;
+		$cos2u = 2.0 * $cosu * $cosu - 1.0;
+		$temp = 1.0 / $pl;
+		$temp1 = Predict::ck2 * $temp;
+		$temp2 = $temp1 * $temp;
+
+		/* Update for short periodics */
+		$rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
+			0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
+		$uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
+		$xnodek = $xnode + 1.5 * $temp2 * $sat->sgps->cosio * $sin2u;
+		$xinck = $sat->tle->xincl + 1.5 * $temp2 * $sat->sgps->cosio * $sat->sgps->sinio * $cos2u;
+		$rdotk = $rdot - $xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
+		$rfdotk = $rfdot + $xn * $temp1 * ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
+
+
+		/* Orientation vectors */
+		$sinuk = sin($uk);
+		$cosuk = cos($uk);
+		$sinik = sin($xinck);
+		$cosik = cos($xinck);
+		$sinnok = sin($xnodek);
+		$cosnok = cos($xnodek);
+		$xmx = -$sinnok * $cosik;
+		$xmy = $cosnok * $cosik;
+		$ux = $xmx * $sinuk + $cosnok * $cosuk;
+		$uy = $xmy * $sinuk + $sinnok * $cosuk;
+		$uz = $sinik * $sinuk;
+		$vx = $xmx * $cosuk - $cosnok * $sinuk;
+		$vy = $xmy * $cosuk - $sinnok * $sinuk;
+		$vz = $sinik * $cosuk;
+
+		/* Position and velocity */
+		$sat->pos->x = $rk * $ux;
+		$sat->pos->y = $rk * $uy;
+		$sat->pos->z = $rk * $uz;
+		$sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
+		$sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
+		$sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
+
+		$sat->phase = $xlt - $xnode - $omgadf + Predict::twopi;
+		if ($sat->phase < 0) {
+			$sat->phase += Predict::twopi;
+		}
+		$sat->phase = Predict_Math::FMod2p($sat->phase);
+
+		$sat->tle->omegao1 = $omega;
+		$sat->tle->xincl1  = $xinck;
+		$sat->tle->xnodeo1 = $xnodek;
+
+	} /*SGP4*/
+
+	/* SDP4 */
+	/* This function is used to calculate the position and velocity */
+	/* of deep-space (period > 225 minutes) satellites. tsince is   */
+	/* time since epoch in minutes, tle is a pointer to a tle_t     */
+	/* structure with Keplerian orbital elements and pos and vel    */
+	/* are vector_t structures returning ECI satellite position and */
+	/* velocity. Use Convert_Sat_State() to convert to km and km/s. */
+	public function SDP4(Predict_Sat $sat, $tsince)
+	{
+		/* Initialization */
+		if (~$sat->flags & self::SDP4_INITIALIZED_FLAG) {
+
+			$sat->flags |= self::SDP4_INITIALIZED_FLAG;
+
+			/* Recover original mean motion (xnodp) and   */
+			/* semimajor axis (aodp) from input elements. */
+			$a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
+			$sat->deep_arg->cosio = cos($sat->tle->xincl);
+			$sat->deep_arg->theta2 = $sat->deep_arg->cosio * $sat->deep_arg->cosio;
+			$sat->sgps->x3thm1 = 3.0 * $sat->deep_arg->theta2 - 1.0;
+			$sat->deep_arg->eosq = $sat->tle->eo * $sat->tle->eo;
+			$sat->deep_arg->betao2 = 1.0 - $sat->deep_arg->eosq;
+			$sat->deep_arg->betao = sqrt($sat->deep_arg->betao2);
+			$del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
+				($a1 * $a1 * $sat->deep_arg->betao * $sat->deep_arg->betao2);
+			$ao = $a1 * (1.0 - $del1 * (0.5 * Predict::tothrd + $del1 * (1.0 + 134.0 / 81.0 * $del1)));
+			$delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
+				($ao * $ao * $sat->deep_arg->betao * $sat->deep_arg->betao2);
+			$sat->deep_arg->xnodp = $sat->tle->xno / (1.0 + $delo);
+			$sat->deep_arg->aodp = $ao / (1.0 - $delo);
+
+			/* For perigee below 156 km, the values */
+			/* of s and qoms2t are altered.         */
+			$s4 = Predict::__s__;
+			$qoms24 = Predict::qoms2t;
+			$perige = ($sat->deep_arg->aodp * (1.0 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
+			if ($perige < 156.0) {
+				if ($perige <= 98.0) {
+					$s4 = 20.0;
+				} else {
+					$s4 = $perige - 78.0;
+				}
+				$qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
+				$s4 = $s4 / Predict::xkmper + Predict::ae;
+			}
+			$pinvsq = 1.0 / ($sat->deep_arg->aodp * $sat->deep_arg->aodp *
+					$sat->deep_arg->betao2 * $sat->deep_arg->betao2);
+			$sat->deep_arg->sing = sin($sat->tle->omegao);
+			$sat->deep_arg->cosg = cos($sat->tle->omegao);
+			$tsi = 1.0 / ($sat->deep_arg->aodp - $s4);
+			$eta = $sat->deep_arg->aodp * $sat->tle->eo * $tsi;
+			$etasq = $eta * $eta;
+			$eeta = $sat->tle->eo * $eta;
+			$psisq = abs(1.0 - $etasq);
+			$coef = $qoms24 * pow($tsi, 4);
+			$coef1 = $coef / pow($psisq, 3.5);
+			$c2 = $coef1 * $sat->deep_arg->xnodp * ($sat->deep_arg->aodp *
+								(1.0 + 1.5 * $etasq + $eeta *
+								 (4.0 + $etasq)) + 0.75 * Predict::ck2 * $tsi / $psisq *
+								$sat->sgps->x3thm1 * (8.0 + 3.0 * $etasq *
+										(8.0 + $etasq)));
+			$sat->sgps->c1 = $sat->tle->bstar * $c2;
+			$sat->deep_arg->sinio = sin($sat->tle->xincl);
+			$a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
+			$sat->sgps->x1mth2 = 1.0 - $sat->deep_arg->theta2;
+			$sat->sgps->c4 = 2.0 * $sat->deep_arg->xnodp * $coef1 *
+				$sat->deep_arg->aodp * $sat->deep_arg->betao2 *
+				($eta * (2.0 + 0.5 * $etasq) + $sat->tle->eo *
+				 (0.5 + 2.0 * $etasq) - 2.0 * Predict::ck2 * $tsi /
+				 ($sat->deep_arg->aodp * $psisq) * (-3.0 * $sat->sgps->x3thm1 *
+								 (1.0 - 2.0 * $eeta + $etasq *
+								  (1.5 - 0.5 * $eeta)) +
+								 0.75 * $sat->sgps->x1mth2 *
+								 (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
+								 cos(2.0 * $sat->tle->omegao)));
+			$theta4 = $sat->deep_arg->theta2 * $sat->deep_arg->theta2;
+			$temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->deep_arg->xnodp;
+			$temp2 = $temp1 * Predict::ck2 * $pinvsq;
+			$temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->deep_arg->xnodp;
+			$sat->deep_arg->xmdot = $sat->deep_arg->xnodp + 0.5 * $temp1 * $sat->deep_arg->betao *
+				$sat->sgps->x3thm1 + 0.0625 * $temp2 * $sat->deep_arg->betao *
+				(13.0 - 78.0 * $sat->deep_arg->theta2 + 137.0 * $theta4);
+			$x1m5th = 1.0 - 5.0 * $sat->deep_arg->theta2;
+			$sat->deep_arg->omgdot = -0.5 * $temp1 * $x1m5th + 0.0625 * $temp2 *
+							(7.0 - 114.0 * $sat->deep_arg->theta2 + 395.0 * $theta4) +
+						$temp3 * (3.0 - 36.0 * $sat->deep_arg->theta2 + 49.0 * $theta4);
+			$xhdot1 = -$temp1 * $sat->deep_arg->cosio;
+			$sat->deep_arg->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $sat->deep_arg->theta2) +
+							 2.0 * $temp3 * (3.0 - 7.0 * $sat->deep_arg->theta2)) *
+				$sat->deep_arg->cosio;
+			$sat->sgps->xnodcf = 3.5 * $sat->deep_arg->betao2 * $xhdot1 * $sat->sgps->c1;
+			$sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
+			$sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->deep_arg->sinio *
+				(3.0 + 5.0 * $sat->deep_arg->cosio) / (1.0 + $sat->deep_arg->cosio);
+			$sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->deep_arg->sinio;
+			$sat->sgps->x7thm1 = 7.0 * $sat->deep_arg->theta2 - 1.0;
+
+			/* initialize Deep() */
+			$this->Deep(self::dpinit, $sat);
+		}; /*End of SDP4() initialization */
+
+		/* Update for secular gravity and atmospheric drag */
+		$xmdf = $sat->tle->xmo + $sat->deep_arg->xmdot * $tsince;
+		$sat->deep_arg->omgadf = $sat->tle->omegao + $sat->deep_arg->omgdot * $tsince;
+		$xnoddf = $sat->tle->xnodeo + $sat->deep_arg->xnodot * $tsince;
+		$tsq = $tsince * $tsince;
+		$sat->deep_arg->xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
+		$tempa = 1.0 - $sat->sgps->c1 * $tsince;
+		$tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
+		$templ = $sat->sgps->t2cof * $tsq;
+		$sat->deep_arg->xn = $sat->deep_arg->xnodp;
+
+		/* Update for deep-space secular effects */
+		$sat->deep_arg->xll = $xmdf;
+		$sat->deep_arg->t = $tsince;
+
+		$this->Deep(self::dpsec, $sat);
+
+		$xmdf = $sat->deep_arg->xll;
+		$a = pow(Predict::xke / $sat->deep_arg->xn, Predict::tothrd) * $tempa * $tempa;
+		$sat->deep_arg->em = $sat->deep_arg->em - $tempe;
+		$xmam = $xmdf + $sat->deep_arg->xnodp * $templ;
+
+		/* Update for deep-space periodic effects */
+		$sat->deep_arg->xll = $xmam;
+
+		$this->Deep(self::dpper, $sat);
+
+		$xmam = $sat->deep_arg->xll;
+		$xl = $xmam + $sat->deep_arg->omgadf + $sat->deep_arg->xnode;
+		$beta = sqrt(1.0 - $sat->deep_arg->em * $sat->deep_arg->em);
+		$sat->deep_arg->xn = Predict::xke / pow($a, 1.5);
+
+		/* Long period periodics */
+		$axn = $sat->deep_arg->em * cos($sat->deep_arg->omgadf);
+		$temp = 1.0 / ($a * $beta * $beta);
+		$xll = $temp * $sat->sgps->xlcof * $axn;
+		$aynl = $temp * $sat->sgps->aycof;
+		$xlt = $xl + $xll;
+		$ayn = $sat->deep_arg->em * sin($sat->deep_arg->omgadf) + $aynl;
+
+		/* Solve Kepler's Equation */
+		$capu = Predict_Math::FMod2p ($xlt - $sat->deep_arg->xnode);
+		$temp2 = $capu;
+
+		$i = 0;
+		do {
+			$sinepw = sin($temp2);
+			$cosepw = cos($temp2);
+			$temp3 = $axn * $sinepw;
+			$temp4 = $ayn * $cosepw;
+			$temp5 = $axn * $cosepw;
+			$temp6 = $ayn * $sinepw;
+			$epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
+			if (abs($epw - $temp2) <= Predict::e6a) {
+				break;
+			}
+			$temp2 = $epw;
+		} while ($i++ < 10);
+
+		/* Short period preliminary quantities */
+		$ecose = $temp5 + $temp6;
+		$esine = $temp3 - $temp4;
+		$elsq = $axn * $axn + $ayn * $ayn;
+		$temp = 1.0 - $elsq;
+		$pl = $a * $temp;
+		$r = $a * (1.0 - $ecose);
+		$temp1 = 1.0 / $r;
+		$rdot = Predict::xke * sqrt($a) * $esine * $temp1;
+		$rfdot = Predict::xke * sqrt($pl) * $temp1;
+		$temp2 = $a * $temp1;
+		$betal = sqrt($temp);
+		$temp3 = 1.0 / (1.0 + $betal);
+		$cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
+		$sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
+		$u = Predict_Math::AcTan($sinu, $cosu);
+		$sin2u = 2.0 * $sinu * $cosu;
+		$cos2u = 2.0 * $cosu * $cosu - 1.0;
+		$temp = 1.0 / $pl;
+		$temp1 = Predict::ck2 * $temp;
+		$temp2 = $temp1 * $temp;
+
+		/* Update for short periodics */
+		$rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
+			 0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
+		$uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
+		$xnodek = $sat->deep_arg->xnode + 1.5 * $temp2 * $sat->deep_arg->cosio * $sin2u;
+		$xinck = $sat->deep_arg->xinc + 1.5 * $temp2 *
+			 $sat->deep_arg->cosio * $sat->deep_arg->sinio * $cos2u;
+		$rdotk = $rdot - $sat->deep_arg->xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
+		$rfdotk = $rfdot + $sat->deep_arg->xn * $temp1 *
+			 ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
+
+		/* Orientation vectors */
+		$sinuk = sin($uk);
+		$cosuk = cos($uk);
+		$sinik = sin($xinck);
+		$cosik = cos($xinck);
+		$sinnok = sin($xnodek);
+		$cosnok = cos($xnodek);
+		$xmx = -$sinnok * $cosik;
+		$xmy = $cosnok * $cosik;
+		$ux = $xmx * $sinuk + $cosnok * $cosuk;
+		$uy = $xmy * $sinuk + $sinnok * $cosuk;
+		$uz = $sinik * $sinuk;
+		$vx = $xmx * $cosuk - $cosnok * $sinuk;
+		$vy = $xmy * $cosuk - $sinnok * $sinuk;
+		$vz = $sinik * $cosuk;
+
+		/* Position and velocity */
+		$sat->pos->x = $rk * $ux;
+		$sat->pos->y = $rk * $uy;
+		$sat->pos->z = $rk * $uz;
+		$sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
+		$sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
+		$sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
+
+		/* Phase in rads */
+		$sat->phase = $xlt - $sat->deep_arg->xnode - $sat->deep_arg->omgadf + Predict::twopi;
+		if ($sat->phase < 0.0) {
+			$sat->phase += Predict::twopi;
+		}
+		$sat->phase = Predict_Math::FMod2p ($sat->phase);
+
+		$sat->tle->omegao1 = $sat->deep_arg->omgadf;
+		$sat->tle->xincl1  = $sat->deep_arg->xinc;
+		$sat->tle->xnodeo1 = $sat->deep_arg->xnode;
+	} /* SDP4 */
+
+
+	/* DEEP */
+	/* This function is used by SDP4 to add lunar and solar */
+	/* perturbation effects to deep-space orbit objects.    */
+	public function Deep($ientry, Predict_Sat $sat)
+	{
+		switch ($ientry) {
+		case self::dpinit : /* Entrance for deep space initialization */
+			$sat->dps->thgr = Predict_Time::ThetaG($sat->tle->epoch, $sat->deep_arg);
+			$eq = $sat->tle->eo;
+			$sat->dps->xnq = $sat->deep_arg->xnodp;
+			$aqnv = 1.0 / $sat->deep_arg->aodp;
+			$sat->dps->xqncl = $sat->tle->xincl;
+			$xmao = $sat->tle->xmo;
+			$xpidot = $sat->deep_arg->omgdot + $sat->deep_arg->xnodot;
+			$sinq = sin($sat->tle->xnodeo);
+			$cosq = cos($sat->tle->xnodeo);
+			$sat->dps->omegaq = $sat->tle->omegao;
+			$sat->dps->preep = 0;
+
+			/* Initialize lunar solar terms */
+			$day = $sat->deep_arg->ds50 + 18261.5;  /* Days since 1900 Jan 0.5 */
+			if ($day != $sat->dps->preep) {
+				$sat->dps->preep = $day;
+				$xnodce = 4.5236020 - 9.2422029E-4 * $day;
+				$stem = sin($xnodce);
+				$ctem = cos($xnodce);
+				$sat->dps->zcosil = 0.91375164 - 0.03568096 * $ctem;
+				$sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil * $sat->dps->zcosil);
+				$sat->dps->zsinhl = 0.089683511 * $stem / $sat->dps->zsinil;
+				$sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl * $sat->dps->zsinhl);
+				$c = 4.7199672 + 0.22997150 * $day;
+				$gam = 5.8351514 + 0.0019443680 * $day;
+				$sat->dps->zmol = Predict_Math::FMod2p($c - $gam);
+				$zx = 0.39785416 * $stem / $sat->dps->zsinil;
+				$zy = $sat->dps->zcoshl * $ctem + 0.91744867 * $sat->dps->zsinhl * $stem;
+				$zx = Predict_Math::AcTan($zx, $zy);
+				$zx = $gam + $zx - $xnodce;
+				$sat->dps->zcosgl = cos($zx);
+				$sat->dps->zsingl = sin($zx);
+				$sat->dps->zmos = 6.2565837 + 0.017201977 * $day;
+				$sat->dps->zmos = Predict_Math::FMod2p($sat->dps->zmos);
+			} /* End if(day != preep) */
+
+			/* Do solar terms */
+			$sat->dps->savtsn = 1E20;
+			$zcosg = Predict::zcosgs;
+			$zsing = Predict::zsings;
+			$zcosi = Predict::zcosis;
+			$zsini = Predict::zsinis;
+			$zcosh = $cosq;
+			$zsinh = $sinq;
+			$cc = Predict::c1ss;
+			$zn = Predict::zns;
+			$ze = Predict::zes;
+			$zmo = $sat->dps->zmos;
+			$xnoi = 1.0 / $sat->dps->xnq;
+
+			/* Loop breaks when Solar terms are done a second */
+			/* time, after Lunar terms are initialized        */
+			for(;;) {
+				/* Solar terms done again after Lunar terms are done */
+				$a1 = $zcosg * $zcosh + $zsing * $zcosi * $zsinh;
+				$a3 = -$zsing * $zcosh + $zcosg * $zcosi * $zsinh;
+				$a7 = -$zcosg * $zsinh + $zsing * $zcosi * $zcosh;
+				$a8 = $zsing * $zsini;
+				$a9 = $zsing * $zsinh + $zcosg * $zcosi * $zcosh;
+				$a10 = $zcosg * $zsini;
+				$a2 = $sat->deep_arg->cosio * $a7 + $sat->deep_arg->sinio * $a8;
+				$a4 = $sat->deep_arg->cosio * $a9 + $sat->deep_arg->sinio * $a10;
+				$a5 = -$sat->deep_arg->sinio * $a7 + $sat->deep_arg->cosio * $a8;
+				$a6 = -$sat->deep_arg->sinio * $a9 + $sat->deep_arg->cosio * $a10;
+				$x1 = $a1 * $sat->deep_arg->cosg + $a2 * $sat->deep_arg->sing;
+				$x2 = $a3 * $sat->deep_arg->cosg + $a4 * $sat->deep_arg->sing;
+				$x3 = -$a1 * $sat->deep_arg->sing + $a2 * $sat->deep_arg->cosg;
+				$x4 = -$a3 * $sat->deep_arg->sing + $a4 * $sat->deep_arg->cosg;
+				$x5 = $a5 * $sat->deep_arg->sing;
+				$x6 = $a6 * $sat->deep_arg->sing;
+				$x7 = $a5 * $sat->deep_arg->cosg;
+				$x8 = $a6 * $sat->deep_arg->cosg;
+				$z31 = 12 * $x1 * $x1 - 3 * $x3 * $x3;
+				$z32 = 24 * $x1 * $x2 - 6 * $x3 * $x4;
+				$z33 = 12 * $x2 * $x2 - 3 * $x4 * $x4;
+				$z1 = 3 * ($a1 * $a1 + $a2 * $a2) + $z31 * $sat->deep_arg->eosq;
+				$z2 = 6 * ($a1 * $a3 + $a2 * $a4) + $z32 * $sat->deep_arg->eosq;
+				$z3 = 3 * ($a3 * $a3 + $a4 * $a4) + $z33 * $sat->deep_arg->eosq;
+				$z11 = -6 * $a1 * $a5 + $sat->deep_arg->eosq * (-24 * $x1 * $x7 - 6 * $x3 * $x5);
+				$z12 = -6 * ($a1 * $a6 + $a3 * $a5) + $sat->deep_arg->eosq *
+					(-24 * ($x2 * $x7 + $x1 * $x8) - 6 * ($x3 * $x6 + $x4 * $x5));
+				$z13 = -6 * $a3 * $a6 + $sat->deep_arg->eosq * (-24 * $x2 * $x8 - 6 * $x4 * $x6);
+				$z21 = 6 * $a2 * $a5 + $sat->deep_arg->eosq * (24 * $x1 * $x5 - 6 * $x3 * $x7);
+				$z22 = 6 * ($a4 * $a5 + $a2 * $a6) + $sat->deep_arg->eosq *
+					(24 * ($x2 * $x5 + $x1 * $x6) - 6 * ($x4 * $x7 + $x3 * $x8));
+				$z23 = 6 * $a4 * $a6 + $sat->deep_arg->eosq * (24 * $x2 * $x6 - 6 * $x4 * $x8);
+				$z1 = $z1 + $z1 + $sat->deep_arg->betao2 * $z31;
+				$z2 = $z2 + $z2 + $sat->deep_arg->betao2 * $z32;
+				$z3 = $z3 + $z3 + $sat->deep_arg->betao2 * $z33;
+				$s3 = $cc * $xnoi;
+				$s2 = -0.5 * $s3 / $sat->deep_arg->betao;
+				$s4 = $s3 * $sat->deep_arg->betao;
+				$s1 = -15 * $eq * $s4;
+				$s5 = $x1 * $x3 + $x2 * $x4;
+				$s6 = $x2 * $x3 + $x1 * $x4;
+				$s7 = $x2 * $x4 - $x1 * $x3;
+				$se = $s1 * $zn * $s5;
+				$si = $s2 * $zn * ($z11 + $z13);
+				$sl = -$zn * $s3 * ($z1 + $z3 - 14 - 6 * $sat->deep_arg->eosq);
+				$sgh = $s4 * $zn * ($z31 + $z33 - 6);
+				$sh = -$zn * $s2 * ($z21 + $z23);
+				if ($sat->dps->xqncl < 5.2359877E-2) {
+					$sh = 0;
+				}
+				$sat->dps->ee2 = 2 * $s1 * $s6;
+				$sat->dps->e3 = 2 * $s1 * $s7;
+				$sat->dps->xi2 = 2 * $s2 * $z12;
+				$sat->dps->xi3 = 2 * $s2 * ($z13 - $z11);
+				$sat->dps->xl2 = -2 * $s3 * $z2;
+				$sat->dps->xl3 = -2 * $s3 * ($z3 - $z1);
+				$sat->dps->xl4 = -2 * $s3 * (-21 - 9 * $sat->deep_arg->eosq) * $ze;
+				$sat->dps->xgh2 = 2 * $s4 * $z32;
+				$sat->dps->xgh3 = 2 * $s4 * ($z33 - $z31);
+				$sat->dps->xgh4 = -18 * $s4 * $ze;
+				$sat->dps->xh2 = -2 * $s2 * $z22;
+				$sat->dps->xh3 = -2 * $s2 * ($z23 - $z21);
+
+				if ($sat->flags & self::LUNAR_TERMS_DONE_FLAG) {
+					break;
+				}
+
+				/* Do lunar terms */
+				$sat->dps->sse = $se;
+				$sat->dps->ssi = $si;
+				$sat->dps->ssl = $sl;
+				$sat->dps->ssh = $sh / $sat->deep_arg->sinio;
+				$sat->dps->ssg = $sgh - $sat->deep_arg->cosio * $sat->dps->ssh;
+				$sat->dps->se2 = $sat->dps->ee2;
+				$sat->dps->si2 = $sat->dps->xi2;
+				$sat->dps->sl2 = $sat->dps->xl2;
+				$sat->dps->sgh2 = $sat->dps->xgh2;
+				$sat->dps->sh2 = $sat->dps->xh2;
+				$sat->dps->se3 = $sat->dps->e3;
+				$sat->dps->si3 = $sat->dps->xi3;
+				$sat->dps->sl3 = $sat->dps->xl3;
+				$sat->dps->sgh3 = $sat->dps->xgh3;
+				$sat->dps->sh3 = $sat->dps->xh3;
+				$sat->dps->sl4 = $sat->dps->xl4;
+				$sat->dps->sgh4 = $sat->dps->xgh4;
+				$zcosg = $sat->dps->zcosgl;
+				$zsing = $sat->dps->zsingl;
+				$zcosi = $sat->dps->zcosil;
+				$zsini = $sat->dps->zsinil;
+				$zcosh = $sat->dps->zcoshl * $cosq + $sat->dps->zsinhl * $sinq;
+				$zsinh = $sinq * $sat->dps->zcoshl - $cosq * $sat->dps->zsinhl;
+				$zn = Predict::znl;
+				$cc = Predict::c1l;
+				$ze = Predict::zel;
+				$zmo = $sat->dps->zmol;
+				$sat->flags |= self::LUNAR_TERMS_DONE_FLAG;
+			} /* End of for(;;) */
+
+			$sat->dps->sse = $sat->dps->sse + $se;
+			$sat->dps->ssi = $sat->dps->ssi + $si;
+			$sat->dps->ssl = $sat->dps->ssl + $sl;
+			$sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio / $sat->deep_arg->sinio * $sh;
+			$sat->dps->ssh = $sat->dps->ssh + $sh / $sat->deep_arg->sinio;
+
+			/* Geopotential resonance initialization for 12 hour orbits */
+			$sat->flags &= ~self::RESONANCE_FLAG;
+			$sat->flags &= ~self::SYNCHRONOUS_FLAG;
+
+			if (!(($sat->dps->xnq < 0.0052359877) && ($sat->dps->xnq > 0.0034906585))) {
+				if( ($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924) ) {
+					return;
+				}
+				if ($eq < 0.5) {
+					return;
+				}
+				$sat->flags |= self::RESONANCE_FLAG;
+				$eoc = $eq * $sat->deep_arg->eosq;
+				$g201 = -0.306 - ($eq - 0.64) * 0.440;
+				if ($eq <= 0.65) {
+					$g211 = 3.616 - 13.247 * $eq + 16.290 * $sat->deep_arg->eosq;
+					$g310 = -19.302 + 117.390 * $eq - 228.419 *
+						$sat->deep_arg->eosq + 156.591 * $eoc;
+					$g322 = -18.9068 + 109.7927 * $eq - 214.6334 *
+						$sat->deep_arg->eosq + 146.5816 * $eoc;
+					$g410 = -41.122 + 242.694 * $eq - 471.094 *
+						$sat->deep_arg->eosq + 313.953 * $eoc;
+					$g422 = -146.407 + 841.880 * $eq - 1629.014 *
+						$sat->deep_arg->eosq + 1083.435 * $eoc;
+					$g520 = -532.114 + 3017.977 * $eq - 5740 *
+						$sat->deep_arg->eosq + 3708.276 * $eoc;
+				} else {
+					$g211 = -72.099 + 331.819 * $eq - 508.738 *
+						$sat->deep_arg->eosq + 266.724 * $eoc;
+					$g310 = -346.844 + 1582.851 * $eq - 2415.925 *
+						$sat->deep_arg->eosq + 1246.113 * $eoc;
+					$g322 = -342.585 + 1554.908 * $eq - 2366.899 *
+						$sat->deep_arg->eosq + 1215.972 * $eoc;
+					$g410 = -1052.797 + 4758.686 * $eq - 7193.992 *
+						$sat->deep_arg->eosq + 3651.957 * $eoc;
+					$g422 = -3581.69 + 16178.11 * $eq - 24462.77 *
+						$sat->deep_arg->eosq+ 12422.52 * $eoc;
+					if ($eq <= 0.715) {
+						$g520 = 1464.74 - 4664.75 * $eq + 3763.64 * $sat->deep_arg->eosq;
+					} else {
+						$g520 = -5149.66 + 29936.92 * $eq - 54087.36 *
+							$sat->deep_arg->eosq + 31324.56 * $eoc;
+					}
+				} /* End if (eq <= 0.65) */
+
+				if ($eq < 0.7) {
+					$g533 = -919.2277 + 4988.61 * $eq - 9064.77 *
+						$sat->deep_arg->eosq + 5542.21 * $eoc;
+					$g521 = -822.71072 + 4568.6173 * $eq - 8491.4146 *
+						$sat->deep_arg->eosq + 5337.524 * $eoc;
+					$g532 = -853.666 + 4690.25 * $eq - 8624.77 *
+						$sat->deep_arg->eosq + 5341.4 * $eoc;
+				}
+				else {
+					$g533 = -37995.78 + 161616.52 * $eq - 229838.2*
+						$sat->deep_arg->eosq + 109377.94 * $eoc;
+					$g521 = -51752.104 + 218913.95 * $eq - 309468.16*
+						$sat->deep_arg->eosq + 146349.42 * $eoc;
+					$g532 = -40023.88 + 170470.89 * $eq - 242699.48*
+						$sat->deep_arg->eosq + 115605.82 * $eoc;
+				} /* End if (eq <= 0.7) */
+
+				$sini2 = $sat->deep_arg->sinio * $sat->deep_arg->sinio;
+				$f220 = 0.75 * (1 + 2 * $sat->deep_arg->cosio + $sat->deep_arg->theta2);
+				$f221 = 1.5 * $sini2;
+				$f321 = 1.875 * $sat->deep_arg->sinio * (1 - 2 *
+								  $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
+				$f322 = -1.875 * $sat->deep_arg->sinio * (1 + 2*
+								   $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
+				$f441 = 35 * $sini2 * $f220;
+				$f442 = 39.3750 * $sini2 * $sini2;
+				$f522 = 9.84375 * $sat->deep_arg->sinio * ($sini2 * (1 - 2 * $sat->deep_arg->cosio - 5 *
+									   $sat->deep_arg->theta2) + 0.33333333 * (-2 + 4 * $sat->deep_arg->cosio +
+													 6 * $sat->deep_arg->theta2));
+				$f523 = $sat->deep_arg->sinio * (4.92187512 * $sini2 * (-2 - 4 *
+									  $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2) + 6.56250012
+							* (1 + 2 * $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2));
+				$f542 = 29.53125 * $sat->deep_arg->sinio * (2 - 8 *
+								 $sat->deep_arg->cosio + $sat->deep_arg->theta2 *
+								 (-12 + 8 * $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2));
+				$f543 = 29.53125 * $sat->deep_arg->sinio * (-2 - 8 * $sat->deep_arg->cosio +
+								 $sat->deep_arg->theta2 * (12 + 8 * $sat->deep_arg->cosio - 10 *
+										   $sat->deep_arg->theta2));
+				$xno2 = $sat->dps->xnq * $sat->dps->xnq;
+				$ainv2 = $aqnv * $aqnv;
+				$temp1 = 3 * $xno2 * $ainv2;
+				$temp = $temp1 * Predict::root22;
+				$sat->dps->d2201 = $temp * $f220 * $g201;
+				$sat->dps->d2211 = $temp * $f221 * $g211;
+				$temp1 = $temp1 * $aqnv;
+				$temp = $temp1 * Predict::root32;
+				$sat->dps->d3210 = $temp * $f321 * $g310;
+				$sat->dps->d3222 = $temp * $f322 * $g322;
+				$temp1 = $temp1 * $aqnv;
+				$temp = 2 * $temp1 * Predict::root44;
+				$sat->dps->d4410 = $temp * $f441 * $g410;
+				$sat->dps->d4422 = $temp * $f442 * $g422;
+				$temp1 = $temp1 * $aqnv;
+				$temp = $temp1 * Predict::root52;
+				$sat->dps->d5220 = $temp * $f522 * $g520;
+				$sat->dps->d5232 = $temp * $f523 * $g532;
+				$temp = 2 * $temp1 * Predict::root54;
+				$sat->dps->d5421 = $temp * $f542 * $g521;
+				$sat->dps->d5433 = $temp * $f543 * $g533;
+				$sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->xnodeo - $sat->dps->thgr - $sat->dps->thgr;
+				$bfact = $sat->deep_arg->xmdot + $sat->deep_arg->xnodot +
+					$sat->deep_arg->xnodot - Predict::thdt - Predict::thdt;
+				$bfact = $bfact + $sat->dps->ssl + $sat->dps->ssh + $sat->dps->ssh;
+			} else {
+				$sat->flags |= self::RESONANCE_FLAG;
+				$sat->flags |= self::SYNCHRONOUS_FLAG;
+				/* Synchronous resonance terms initialization */
+				$g200 = 1 + $sat->deep_arg->eosq * (-2.5 + 0.8125 * $sat->deep_arg->eosq);
+				$g310 = 1 + 2 * $sat->deep_arg->eosq;
+				$g300 = 1 + $sat->deep_arg->eosq * (-6 + 6.60937 * $sat->deep_arg->eosq);
+				$f220 = 0.75 * (1 + $sat->deep_arg->cosio) * (1 + $sat->deep_arg->cosio);
+				$f311 = 0.9375 * $sat->deep_arg->sinio * $sat->deep_arg->sinio *
+					(1 + 3 * $sat->deep_arg->cosio) - 0.75 * (1 + $sat->deep_arg->cosio);
+				$f330 = 1 + $sat->deep_arg->cosio;
+				$f330 = 1.875 * $f330 * $f330 * $f330;
+				$sat->dps->del1 = 3 * $sat->dps->xnq * $sat->dps->xnq * $aqnv * $aqnv;
+				$sat->dps->del2 = 2 * $sat->dps->del1 * $f220 * $g200 * Predict::q22;
+				$sat->dps->del3 = 3 * $sat->dps->del1 * $f330 * $g300 * Predict::q33 * $aqnv;
+				$sat->dps->del1 = $sat->dps->del1 * $f311 * $g310 * Predict::q31 * $aqnv;
+				$sat->dps->fasx2 = 0.13130908;
+				$sat->dps->fasx4 = 2.8843198;
+				$sat->dps->fasx6 = 0.37448087;
+				$sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->omegao - $sat->dps->thgr;
+				$bfact = $sat->deep_arg->xmdot + $xpidot - Predict::thdt;
+				$bfact = $bfact + $sat->dps->ssl + $sat->dps->ssg + $sat->dps->ssh;
+			} /* End if( !(xnq < 0.0052359877) && (xnq > 0.0034906585) ) */
+
+			$sat->dps->xfact = $bfact - $sat->dps->xnq;
+
+			/* Initialize integrator */
+			$sat->dps->xli = $sat->dps->xlamo;
+			$sat->dps->xni = $sat->dps->xnq;
+			$sat->dps->atime = 0;
+			$sat->dps->stepp = 720;
+			$sat->dps->stepn = -720;
+			$sat->dps->step2 = 259200;
+			/* End case self::dpinit: */
+			return;
+
+		case self::dpsec: /* Entrance for deep space secular effects */
+			$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl * $sat->deep_arg->t;
+			$sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg * $sat->deep_arg->t;
+			$sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh * $sat->deep_arg->t;
+			$sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse * $sat->deep_arg->t;
+			$sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi * $sat->deep_arg->t;
+			if ($sat->deep_arg->xinc < 0) {
+				$sat->deep_arg->xinc = -$sat->deep_arg->xinc;
+				$sat->deep_arg->xnode = $sat->deep_arg->xnode + Predict::pi;
+				$sat->deep_arg->omgadf = $sat->deep_arg->omgadf - Predict::pi;
+			}
+			if(~$sat->flags & self::RESONANCE_FLAG ) {
+				return;
+			}
+
+			do {
+				if ( ($sat->dps->atime == 0) ||
+					(($sat->deep_arg->t >= 0) && ($sat->dps->atime < 0)) ||
+					(($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0)) ) {
+					/* Epoch restart */
+					if ($sat->deep_arg->t >= 0) {
+						$delt = $sat->dps->stepp;
+					} else {
+						$delt = $sat->dps->stepn;
+					}
+
+					$sat->dps->atime = 0;
+					$sat->dps->xni = $sat->dps->xnq;
+					$sat->dps->xli = $sat->dps->xlamo;
+				} else {
+					if (abs($sat->deep_arg->t) >= abs($sat->dps->atime)) {
+						if ($sat->deep_arg->t > 0) {
+							$delt = $sat->dps->stepp;
+						} else {
+							$delt = $sat->dps->stepn;
+						}
+					}
+				}
+
+				do {
+					if (abs($sat->deep_arg->t - $sat->dps->atime) >= $sat->dps->stepp) {
+						$sat->flags |= self::DO_LOOP_FLAG;
+						$sat->flags &= ~self::EPOCH_RESTART_FLAG;
+					}
+					else {
+						$ft = $sat->deep_arg->t - $sat->dps->atime;
+						$sat->flags &= ~self::DO_LOOP_FLAG;
+					}
+
+					if (abs($sat->deep_arg->t) < abs($sat->dps->atime)) {
+						if ($sat->deep_arg->t >= 0) {
+							$delt = $sat->dps->stepn;
+						} else {
+							$delt = $sat->dps->stepp;
+						}
+						$sat->flags |= (self::DO_LOOP_FLAG | self::EPOCH_RESTART_FLAG);
+					}
+
+					/* Dot terms calculated */
+					if ($sat->flags & self::SYNCHRONOUS_FLAG) {
+						$xndot = $sat->dps->del1 * sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2 * sin(2 * ($sat->dps->xli - $sat->dps->fasx4))
+							+ $sat->dps->del3 * sin(3 * ($sat->dps->xli - $sat->dps->fasx6));
+						$xnddt = $sat->dps->del1 * cos($sat->dps->xli - $sat->dps->fasx2) + 2 * $sat->dps->del2 * cos(2 * ($sat->dps->xli - $sat->dps->fasx4))
+							+ 3 * $sat->dps->del3 * cos(3 * ($sat->dps->xli - $sat->dps->fasx6));
+					} else {
+						$xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot * $sat->dps->atime;
+						$x2omi = $xomi + $xomi;
+						$x2li = $sat->dps->xli + $sat->dps->xli;
+						$xndot = $sat->dps->d2201 * sin($x2omi + $sat->dps->xli - Predict::g22)
+							+ $sat->dps->d2211 * sin($sat->dps->xli - Predict::g22)
+							+ $sat->dps->d3210 * sin($xomi + $sat->dps->xli - Predict::g32)
+							+ $sat->dps->d3222 * sin(-$xomi + $sat->dps->xli - Predict::g32)
+							+ $sat->dps->d4410 * sin($x2omi + $x2li- Predict::g44)
+							+ $sat->dps->d4422 * sin($x2li- Predict::g44)
+							+ $sat->dps->d5220 * sin($xomi + $sat->dps->xli- Predict::g52)
+							+ $sat->dps->d5232 * sin(-$xomi + $sat->dps->xli- Predict::g52)
+							+ $sat->dps->d5421 * sin($xomi + $x2li - Predict::g54)
+							+ $sat->dps->d5433 * sin(-$xomi + $x2li - Predict::g54);
+						$xnddt = $sat->dps->d2201 * cos($x2omi + $sat->dps->xli- Predict::g22)
+							+ $sat->dps->d2211 * cos($sat->dps->xli - Predict::g22)
+							+ $sat->dps->d3210 * cos($xomi + $sat->dps->xli - Predict::g32)
+							+ $sat->dps->d3222 * cos(-$xomi + $sat->dps->xli - Predict::g32)
+							+ $sat->dps->d5220 * cos($xomi + $sat->dps->xli - Predict::g52)
+							+ $sat->dps->d5232 * cos(-$xomi + $sat->dps->xli - Predict::g52)
+							+ 2 * ($sat->dps->d4410 * cos($x2omi + $x2li - Predict::g44)
+								+ $sat->dps->d4422 * cos($x2li - Predict::g44)
+								+ $sat->dps->d5421 * cos($xomi + $x2li - Predict::g54)
+								+ $sat->dps->d5433 * cos(-$xomi + $x2li - Predict::g54));
+					} /* End of if (isFlagSet(SYNCHRONOUS_FLAG)) */
+
+					$xldot = $sat->dps->xni + $sat->dps->xfact;
+					$xnddt = $xnddt * $xldot;
+
+					if ($sat->flags & self::DO_LOOP_FLAG) {
+						$sat->dps->xli = $sat->dps->xli + $xldot * $delt + $xndot * $sat->dps->step2;
+						$sat->dps->xni = $sat->dps->xni + $xndot * $delt + $xnddt * $sat->dps->step2;
+						$sat->dps->atime = $sat->dps->atime + $delt;
+					}
+				} while (($sat->flags & self::DO_LOOP_FLAG) &&
+						(~$sat->flags & self::EPOCH_RESTART_FLAG));
+			}
+			while (($sat->flags & self::DO_LOOP_FLAG) && ($sat->flags & self::EPOCH_RESTART_FLAG));
+
+			$sat->deep_arg->xn = $sat->dps->xni + $xndot * $ft + $xnddt * $ft * $ft * 0.5;
+			$xl = $sat->dps->xli + $xldot * $ft + $xndot * $ft * $ft * 0.5;
+			$temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t * Predict::thdt;
+
+			if (~$sat->flags & self::SYNCHRONOUS_FLAG) {
+				$sat->deep_arg->xll = $xl + $temp + $temp;
+			} else {
+				$sat->deep_arg->xll = $xl - $sat->deep_arg->omgadf + $temp;
+			}
+
+			return;
+			/* End case dpsec: */
+
+		case self::dpper: /* Entrance for lunar-solar periodics */
+			$sinis = sin($sat->deep_arg->xinc);
+			$cosis = cos($sat->deep_arg->xinc);
+			if (abs($sat->dps->savtsn - $sat->deep_arg->t) >= 30) {
+				$sat->dps->savtsn = $sat->deep_arg->t;
+				$zm = $sat->dps->zmos + Predict::zns * $sat->deep_arg->t;
+				$zf = $zm + 2 * Predict::zes * sin($zm);
+				$sinzf = sin($zf);
+				$f2 = 0.5 * $sinzf * $sinzf - 0.25;
+				$f3 = -0.5 * $sinzf * cos($zf);
+				$ses = $sat->dps->se2 * $f2 + $sat->dps->se3 * $f3;
+				$sis = $sat->dps->si2 * $f2 + $sat->dps->si3 * $f3;
+				$sls = $sat->dps->sl2 * $f2 + $sat->dps->sl3 * $f3 + $sat->dps->sl4 * $sinzf;
+				$sat->dps->sghs = $sat->dps->sgh2 * $f2 + $sat->dps->sgh3 * $f3 + $sat->dps->sgh4 * $sinzf;
+				$sat->dps->shs = $sat->dps->sh2 * $f2 + $sat->dps->sh3 * $f3;
+				$zm = $sat->dps->zmol + Predict::znl * $sat->deep_arg->t;
+				$zf = $zm + 2 * Predict::zel * sin($zm);
+				$sinzf = sin($zf);
+				$f2 = 0.5 * $sinzf * $sinzf - 0.25;
+				$f3 = -0.5 * $sinzf * cos($zf);
+				$sel = $sat->dps->ee2 * $f2 + $sat->dps->e3 * $f3;
+				$sil = $sat->dps->xi2 * $f2 + $sat->dps->xi3 * $f3;
+				$sll = $sat->dps->xl2 * $f2 + $sat->dps->xl3 * $f3 + $sat->dps->xl4 * $sinzf;
+				$sat->dps->sghl = $sat->dps->xgh2 * $f2 + $sat->dps->xgh3 * $f3 + $sat->dps->xgh4 * $sinzf;
+				$sat->dps->sh1 = $sat->dps->xh2 * $f2 + $sat->dps->xh3 * $f3;
+				$sat->dps->pe = $ses + $sel;
+				$sat->dps->pinc = $sis + $sil;
+				$sat->dps->pl = $sls + $sll;
+			}
+
+			$pgh = $sat->dps->sghs + $sat->dps->sghl;
+			$ph = $sat->dps->shs + $sat->dps->sh1;
+			$sat->deep_arg->xinc = $sat->deep_arg->xinc + $sat->dps->pinc;
+			$sat->deep_arg->em = $sat->deep_arg->em + $sat->dps->pe;
+
+			if ($sat->dps->xqncl >= 0.2) {
+				/* Apply periodics directly */
+				$ph = $ph / $sat->deep_arg->sinio;
+				$pgh = $pgh - $sat->deep_arg->cosio * $ph;
+				$sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $pgh;
+				$sat->deep_arg->xnode = $sat->deep_arg->xnode + $ph;
+				$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
+			} else {
+				/* Apply periodics with Lyddane modification */
+				$sinok = sin($sat->deep_arg->xnode);
+				$cosok = cos($sat->deep_arg->xnode);
+				$alfdp = $sinis * $sinok;
+				$betdp = $sinis * $cosok;
+				$dalf = $ph * $cosok + $sat->dps->pinc * $cosis * $sinok;
+				$dbet = -$ph * $sinok + $sat->dps->pinc * $cosis * $cosok;
+				$alfdp = $alfdp + $dalf;
+				$betdp = $betdp + $dbet;
+				$sat->deep_arg->xnode = Predict_Math::FMod2p($sat->deep_arg->xnode);
+				$xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis * $sat->deep_arg->xnode;
+				$dls = $sat->dps->pl + $pgh - $sat->dps->pinc * $sat->deep_arg->xnode * $sinis;
+				$xls = $xls + $dls;
+				$xnoh = $sat->deep_arg->xnode;
+				$sat->deep_arg->xnode = Predict_Math::AcTan($alfdp, $betdp);
+
+				/* This is a patch to Lyddane modification */
+				/* suggested by Rob Matson. */
+				if(abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
+					if ($sat->deep_arg->xnode < $xnoh) {
+						$sat->deep_arg->xnode += Predict::twopi;
+					} else {
+						$sat->deep_arg->xnode -= Predict::twopi;
+					}
+				}
+
+				$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
+				$sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc) *
+					$sat->deep_arg->xnode;
+			} /* End case dpper: */
+			return;
+
+		} /* End switch(ientry) */
+
+	} /* End of Deep() */
+
+	/**
+	 * Singleton
+	 *
+	 * @param Predict_Sat $sat The current satellite data instance
+	 *
+	 * @return Predict_SGPSDP
+	 */
+	public static function getInstance(Predict_Sat $sat)
+	{
+		static $instances = array();
+		$catnr = $sat->tle->catnr;
+		if (!isset($instances[$catnr])) {
+			$instances[$catnr] = new self();
+		}
+		return $instances[$catnr];
+	}
 }
 ?>

Switch Indentation +493 added lines, -493 removed lines

@@ -541,499 +541,499 @@
     public function Deep($ientry, Predict_Sat $sat)
     {
         switch ($ientry) {
-        case self::dpinit : /* Entrance for deep space initialization */
-            $sat->dps->thgr = Predict_Time::ThetaG($sat->tle->epoch, $sat->deep_arg);
-            $eq = $sat->tle->eo;
-            $sat->dps->xnq = $sat->deep_arg->xnodp;
-            $aqnv = 1.0 / $sat->deep_arg->aodp;
-            $sat->dps->xqncl = $sat->tle->xincl;
-            $xmao = $sat->tle->xmo;
-            $xpidot = $sat->deep_arg->omgdot + $sat->deep_arg->xnodot;
-            $sinq = sin($sat->tle->xnodeo);
-            $cosq = cos($sat->tle->xnodeo);
-            $sat->dps->omegaq = $sat->tle->omegao;
-            $sat->dps->preep = 0;
-
-            /* Initialize lunar solar terms */
-            $day = $sat->deep_arg->ds50 + 18261.5;  /* Days since 1900 Jan 0.5 */
-            if ($day != $sat->dps->preep) {
-                $sat->dps->preep = $day;
-                $xnodce = 4.5236020 - 9.2422029E-4 * $day;
-                $stem = sin($xnodce);
-                $ctem = cos($xnodce);
-                $sat->dps->zcosil = 0.91375164 - 0.03568096 * $ctem;
-                $sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil * $sat->dps->zcosil);
-                $sat->dps->zsinhl = 0.089683511 * $stem / $sat->dps->zsinil;
-                $sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl * $sat->dps->zsinhl);
-                $c = 4.7199672 + 0.22997150 * $day;
-                $gam = 5.8351514 + 0.0019443680 * $day;
-                $sat->dps->zmol = Predict_Math::FMod2p($c - $gam);
-                $zx = 0.39785416 * $stem / $sat->dps->zsinil;
-                $zy = $sat->dps->zcoshl * $ctem + 0.91744867 * $sat->dps->zsinhl * $stem;
-                $zx = Predict_Math::AcTan($zx, $zy);
-                $zx = $gam + $zx - $xnodce;
-                $sat->dps->zcosgl = cos($zx);
-                $sat->dps->zsingl = sin($zx);
-                $sat->dps->zmos = 6.2565837 + 0.017201977 * $day;
-                $sat->dps->zmos = Predict_Math::FMod2p($sat->dps->zmos);
-            } /* End if(day != preep) */
-
-            /* Do solar terms */
-            $sat->dps->savtsn = 1E20;
-            $zcosg = Predict::zcosgs;
-            $zsing = Predict::zsings;
-            $zcosi = Predict::zcosis;
-            $zsini = Predict::zsinis;
-            $zcosh = $cosq;
-            $zsinh = $sinq;
-            $cc = Predict::c1ss;
-            $zn = Predict::zns;
-            $ze = Predict::zes;
-            $zmo = $sat->dps->zmos;
-            $xnoi = 1.0 / $sat->dps->xnq;
-
-            /* Loop breaks when Solar terms are done a second */
-            /* time, after Lunar terms are initialized        */
-            for(;;) {
-                /* Solar terms done again after Lunar terms are done */
-                $a1 = $zcosg * $zcosh + $zsing * $zcosi * $zsinh;
-                $a3 = -$zsing * $zcosh + $zcosg * $zcosi * $zsinh;
-                $a7 = -$zcosg * $zsinh + $zsing * $zcosi * $zcosh;
-                $a8 = $zsing * $zsini;
-                $a9 = $zsing * $zsinh + $zcosg * $zcosi * $zcosh;
-                $a10 = $zcosg * $zsini;
-                $a2 = $sat->deep_arg->cosio * $a7 + $sat->deep_arg->sinio * $a8;
-                $a4 = $sat->deep_arg->cosio * $a9 + $sat->deep_arg->sinio * $a10;
-                $a5 = -$sat->deep_arg->sinio * $a7 + $sat->deep_arg->cosio * $a8;
-                $a6 = -$sat->deep_arg->sinio * $a9 + $sat->deep_arg->cosio * $a10;
-                $x1 = $a1 * $sat->deep_arg->cosg + $a2 * $sat->deep_arg->sing;
-                $x2 = $a3 * $sat->deep_arg->cosg + $a4 * $sat->deep_arg->sing;
-                $x3 = -$a1 * $sat->deep_arg->sing + $a2 * $sat->deep_arg->cosg;
-                $x4 = -$a3 * $sat->deep_arg->sing + $a4 * $sat->deep_arg->cosg;
-                $x5 = $a5 * $sat->deep_arg->sing;
-                $x6 = $a6 * $sat->deep_arg->sing;
-                $x7 = $a5 * $sat->deep_arg->cosg;
-                $x8 = $a6 * $sat->deep_arg->cosg;
-                $z31 = 12 * $x1 * $x1 - 3 * $x3 * $x3;
-                $z32 = 24 * $x1 * $x2 - 6 * $x3 * $x4;
-                $z33 = 12 * $x2 * $x2 - 3 * $x4 * $x4;
-                $z1 = 3 * ($a1 * $a1 + $a2 * $a2) + $z31 * $sat->deep_arg->eosq;
-                $z2 = 6 * ($a1 * $a3 + $a2 * $a4) + $z32 * $sat->deep_arg->eosq;
-                $z3 = 3 * ($a3 * $a3 + $a4 * $a4) + $z33 * $sat->deep_arg->eosq;
-                $z11 = -6 * $a1 * $a5 + $sat->deep_arg->eosq * (-24 * $x1 * $x7 - 6 * $x3 * $x5);
-                $z12 = -6 * ($a1 * $a6 + $a3 * $a5) + $sat->deep_arg->eosq *
-                    (-24 * ($x2 * $x7 + $x1 * $x8) - 6 * ($x3 * $x6 + $x4 * $x5));
-                $z13 = -6 * $a3 * $a6 + $sat->deep_arg->eosq * (-24 * $x2 * $x8 - 6 * $x4 * $x6);
-                $z21 = 6 * $a2 * $a5 + $sat->deep_arg->eosq * (24 * $x1 * $x5 - 6 * $x3 * $x7);
-                $z22 = 6 * ($a4 * $a5 + $a2 * $a6) + $sat->deep_arg->eosq *
-                    (24 * ($x2 * $x5 + $x1 * $x6) - 6 * ($x4 * $x7 + $x3 * $x8));
-                $z23 = 6 * $a4 * $a6 + $sat->deep_arg->eosq * (24 * $x2 * $x6 - 6 * $x4 * $x8);
-                $z1 = $z1 + $z1 + $sat->deep_arg->betao2 * $z31;
-                $z2 = $z2 + $z2 + $sat->deep_arg->betao2 * $z32;
-                $z3 = $z3 + $z3 + $sat->deep_arg->betao2 * $z33;
-                $s3 = $cc * $xnoi;
-                $s2 = -0.5 * $s3 / $sat->deep_arg->betao;
-                $s4 = $s3 * $sat->deep_arg->betao;
-                $s1 = -15 * $eq * $s4;
-                $s5 = $x1 * $x3 + $x2 * $x4;
-                $s6 = $x2 * $x3 + $x1 * $x4;
-                $s7 = $x2 * $x4 - $x1 * $x3;
-                $se = $s1 * $zn * $s5;
-                $si = $s2 * $zn * ($z11 + $z13);
-                $sl = -$zn * $s3 * ($z1 + $z3 - 14 - 6 * $sat->deep_arg->eosq);
-                $sgh = $s4 * $zn * ($z31 + $z33 - 6);
-                $sh = -$zn * $s2 * ($z21 + $z23);
-                if ($sat->dps->xqncl < 5.2359877E-2) {
-                    $sh = 0;
-                }
-                $sat->dps->ee2 = 2 * $s1 * $s6;
-                $sat->dps->e3 = 2 * $s1 * $s7;
-                $sat->dps->xi2 = 2 * $s2 * $z12;
-                $sat->dps->xi3 = 2 * $s2 * ($z13 - $z11);
-                $sat->dps->xl2 = -2 * $s3 * $z2;
-                $sat->dps->xl3 = -2 * $s3 * ($z3 - $z1);
-                $sat->dps->xl4 = -2 * $s3 * (-21 - 9 * $sat->deep_arg->eosq) * $ze;
-                $sat->dps->xgh2 = 2 * $s4 * $z32;
-                $sat->dps->xgh3 = 2 * $s4 * ($z33 - $z31);
-                $sat->dps->xgh4 = -18 * $s4 * $ze;
-                $sat->dps->xh2 = -2 * $s2 * $z22;
-                $sat->dps->xh3 = -2 * $s2 * ($z23 - $z21);
-
-                if ($sat->flags & self::LUNAR_TERMS_DONE_FLAG) {
-                    break;
-                }
-
-                /* Do lunar terms */
-                $sat->dps->sse = $se;
-                $sat->dps->ssi = $si;
-                $sat->dps->ssl = $sl;
-                $sat->dps->ssh = $sh / $sat->deep_arg->sinio;
-                $sat->dps->ssg = $sgh - $sat->deep_arg->cosio * $sat->dps->ssh;
-                $sat->dps->se2 = $sat->dps->ee2;
-                $sat->dps->si2 = $sat->dps->xi2;
-                $sat->dps->sl2 = $sat->dps->xl2;
-                $sat->dps->sgh2 = $sat->dps->xgh2;
-                $sat->dps->sh2 = $sat->dps->xh2;
-                $sat->dps->se3 = $sat->dps->e3;
-                $sat->dps->si3 = $sat->dps->xi3;
-                $sat->dps->sl3 = $sat->dps->xl3;
-                $sat->dps->sgh3 = $sat->dps->xgh3;
-                $sat->dps->sh3 = $sat->dps->xh3;
-                $sat->dps->sl4 = $sat->dps->xl4;
-                $sat->dps->sgh4 = $sat->dps->xgh4;
-                $zcosg = $sat->dps->zcosgl;
-                $zsing = $sat->dps->zsingl;
-                $zcosi = $sat->dps->zcosil;
-                $zsini = $sat->dps->zsinil;
-                $zcosh = $sat->dps->zcoshl * $cosq + $sat->dps->zsinhl * $sinq;
-                $zsinh = $sinq * $sat->dps->zcoshl - $cosq * $sat->dps->zsinhl;
-                $zn = Predict::znl;
-                $cc = Predict::c1l;
-                $ze = Predict::zel;
-                $zmo = $sat->dps->zmol;
-                $sat->flags |= self::LUNAR_TERMS_DONE_FLAG;
-            } /* End of for(;;) */
-
-            $sat->dps->sse = $sat->dps->sse + $se;
-            $sat->dps->ssi = $sat->dps->ssi + $si;
-            $sat->dps->ssl = $sat->dps->ssl + $sl;
-            $sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio / $sat->deep_arg->sinio * $sh;
-            $sat->dps->ssh = $sat->dps->ssh + $sh / $sat->deep_arg->sinio;
-
-            /* Geopotential resonance initialization for 12 hour orbits */
-            $sat->flags &= ~self::RESONANCE_FLAG;
-            $sat->flags &= ~self::SYNCHRONOUS_FLAG;
-
-            if (!(($sat->dps->xnq < 0.0052359877) && ($sat->dps->xnq > 0.0034906585))) {
-                if( ($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924) ) {
-                    return;
-                }
-                if ($eq < 0.5) {
-                    return;
-                }
-                $sat->flags |= self::RESONANCE_FLAG;
-                $eoc = $eq * $sat->deep_arg->eosq;
-                $g201 = -0.306 - ($eq - 0.64) * 0.440;
-                if ($eq <= 0.65) {
-                    $g211 = 3.616 - 13.247 * $eq + 16.290 * $sat->deep_arg->eosq;
-                    $g310 = -19.302 + 117.390 * $eq - 228.419 *
-                        $sat->deep_arg->eosq + 156.591 * $eoc;
-                    $g322 = -18.9068 + 109.7927 * $eq - 214.6334 *
-                        $sat->deep_arg->eosq + 146.5816 * $eoc;
-                    $g410 = -41.122 + 242.694 * $eq - 471.094 *
-                        $sat->deep_arg->eosq + 313.953 * $eoc;
-                    $g422 = -146.407 + 841.880 * $eq - 1629.014 *
-                        $sat->deep_arg->eosq + 1083.435 * $eoc;
-                    $g520 = -532.114 + 3017.977 * $eq - 5740 *
-                        $sat->deep_arg->eosq + 3708.276 * $eoc;
-                } else {
-                    $g211 = -72.099 + 331.819 * $eq - 508.738 *
-                        $sat->deep_arg->eosq + 266.724 * $eoc;
-                    $g310 = -346.844 + 1582.851 * $eq - 2415.925 *
-                        $sat->deep_arg->eosq + 1246.113 * $eoc;
-                    $g322 = -342.585 + 1554.908 * $eq - 2366.899 *
-                        $sat->deep_arg->eosq + 1215.972 * $eoc;
-                    $g410 = -1052.797 + 4758.686 * $eq - 7193.992 *
-                        $sat->deep_arg->eosq + 3651.957 * $eoc;
-                    $g422 = -3581.69 + 16178.11 * $eq - 24462.77 *
-                        $sat->deep_arg->eosq+ 12422.52 * $eoc;
-                    if ($eq <= 0.715) {
-                        $g520 = 1464.74 - 4664.75 * $eq + 3763.64 * $sat->deep_arg->eosq;
-                    } else {
-                        $g520 = -5149.66 + 29936.92 * $eq - 54087.36 *
-                            $sat->deep_arg->eosq + 31324.56 * $eoc;
-                    }
-                } /* End if (eq <= 0.65) */
-
-                if ($eq < 0.7) {
-                    $g533 = -919.2277 + 4988.61 * $eq - 9064.77 *
-                        $sat->deep_arg->eosq + 5542.21 * $eoc;
-                    $g521 = -822.71072 + 4568.6173 * $eq - 8491.4146 *
-                        $sat->deep_arg->eosq + 5337.524 * $eoc;
-                    $g532 = -853.666 + 4690.25 * $eq - 8624.77 *
-                        $sat->deep_arg->eosq + 5341.4 * $eoc;
-                }
-                else {
-                    $g533 = -37995.78 + 161616.52 * $eq - 229838.2*
-                        $sat->deep_arg->eosq + 109377.94 * $eoc;
-                    $g521 = -51752.104 + 218913.95 * $eq - 309468.16*
-                        $sat->deep_arg->eosq + 146349.42 * $eoc;
-                    $g532 = -40023.88 + 170470.89 * $eq - 242699.48*
-                        $sat->deep_arg->eosq + 115605.82 * $eoc;
-                } /* End if (eq <= 0.7) */
-
-                $sini2 = $sat->deep_arg->sinio * $sat->deep_arg->sinio;
-                $f220 = 0.75 * (1 + 2 * $sat->deep_arg->cosio + $sat->deep_arg->theta2);
-                $f221 = 1.5 * $sini2;
-                $f321 = 1.875 * $sat->deep_arg->sinio * (1 - 2 *
-                                  $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f322 = -1.875 * $sat->deep_arg->sinio * (1 + 2*
-                                   $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f441 = 35 * $sini2 * $f220;
-                $f442 = 39.3750 * $sini2 * $sini2;
-                $f522 = 9.84375 * $sat->deep_arg->sinio * ($sini2 * (1 - 2 * $sat->deep_arg->cosio - 5 *
-                                       $sat->deep_arg->theta2) + 0.33333333 * (-2 + 4 * $sat->deep_arg->cosio +
-                                                     6 * $sat->deep_arg->theta2));
-                $f523 = $sat->deep_arg->sinio * (4.92187512 * $sini2 * (-2 - 4 *
-                                      $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2) + 6.56250012
-                            * (1 + 2 * $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2));
-                $f542 = 29.53125 * $sat->deep_arg->sinio * (2 - 8 *
-                                 $sat->deep_arg->cosio + $sat->deep_arg->theta2 *
-                                 (-12 + 8 * $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2));
-                $f543 = 29.53125 * $sat->deep_arg->sinio * (-2 - 8 * $sat->deep_arg->cosio +
-                                 $sat->deep_arg->theta2 * (12 + 8 * $sat->deep_arg->cosio - 10 *
-                                           $sat->deep_arg->theta2));
-                $xno2 = $sat->dps->xnq * $sat->dps->xnq;
-                $ainv2 = $aqnv * $aqnv;
-                $temp1 = 3 * $xno2 * $ainv2;
-                $temp = $temp1 * Predict::root22;
-                $sat->dps->d2201 = $temp * $f220 * $g201;
-                $sat->dps->d2211 = $temp * $f221 * $g211;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root32;
-                $sat->dps->d3210 = $temp * $f321 * $g310;
-                $sat->dps->d3222 = $temp * $f322 * $g322;
-                $temp1 = $temp1 * $aqnv;
-                $temp = 2 * $temp1 * Predict::root44;
-                $sat->dps->d4410 = $temp * $f441 * $g410;
-                $sat->dps->d4422 = $temp * $f442 * $g422;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root52;
-                $sat->dps->d5220 = $temp * $f522 * $g520;
-                $sat->dps->d5232 = $temp * $f523 * $g532;
-                $temp = 2 * $temp1 * Predict::root54;
-                $sat->dps->d5421 = $temp * $f542 * $g521;
-                $sat->dps->d5433 = $temp * $f543 * $g533;
-                $sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->xnodeo - $sat->dps->thgr - $sat->dps->thgr;
-                $bfact = $sat->deep_arg->xmdot + $sat->deep_arg->xnodot +
-                    $sat->deep_arg->xnodot - Predict::thdt - Predict::thdt;
-                $bfact = $bfact + $sat->dps->ssl + $sat->dps->ssh + $sat->dps->ssh;
-            } else {
-                $sat->flags |= self::RESONANCE_FLAG;
-                $sat->flags |= self::SYNCHRONOUS_FLAG;
-                /* Synchronous resonance terms initialization */
-                $g200 = 1 + $sat->deep_arg->eosq * (-2.5 + 0.8125 * $sat->deep_arg->eosq);
-                $g310 = 1 + 2 * $sat->deep_arg->eosq;
-                $g300 = 1 + $sat->deep_arg->eosq * (-6 + 6.60937 * $sat->deep_arg->eosq);
-                $f220 = 0.75 * (1 + $sat->deep_arg->cosio) * (1 + $sat->deep_arg->cosio);
-                $f311 = 0.9375 * $sat->deep_arg->sinio * $sat->deep_arg->sinio *
-                    (1 + 3 * $sat->deep_arg->cosio) - 0.75 * (1 + $sat->deep_arg->cosio);
-                $f330 = 1 + $sat->deep_arg->cosio;
-                $f330 = 1.875 * $f330 * $f330 * $f330;
-                $sat->dps->del1 = 3 * $sat->dps->xnq * $sat->dps->xnq * $aqnv * $aqnv;
-                $sat->dps->del2 = 2 * $sat->dps->del1 * $f220 * $g200 * Predict::q22;
-                $sat->dps->del3 = 3 * $sat->dps->del1 * $f330 * $g300 * Predict::q33 * $aqnv;
-                $sat->dps->del1 = $sat->dps->del1 * $f311 * $g310 * Predict::q31 * $aqnv;
-                $sat->dps->fasx2 = 0.13130908;
-                $sat->dps->fasx4 = 2.8843198;
-                $sat->dps->fasx6 = 0.37448087;
-                $sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->omegao - $sat->dps->thgr;
-                $bfact = $sat->deep_arg->xmdot + $xpidot - Predict::thdt;
-                $bfact = $bfact + $sat->dps->ssl + $sat->dps->ssg + $sat->dps->ssh;
-            } /* End if( !(xnq < 0.0052359877) && (xnq > 0.0034906585) ) */
-
-            $sat->dps->xfact = $bfact - $sat->dps->xnq;
-
-            /* Initialize integrator */
-            $sat->dps->xli = $sat->dps->xlamo;
-            $sat->dps->xni = $sat->dps->xnq;
-            $sat->dps->atime = 0;
-            $sat->dps->stepp = 720;
-            $sat->dps->stepn = -720;
-            $sat->dps->step2 = 259200;
-            /* End case self::dpinit: */
-            return;
-
-        case self::dpsec: /* Entrance for deep space secular effects */
-            $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl * $sat->deep_arg->t;
-            $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg * $sat->deep_arg->t;
-            $sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh * $sat->deep_arg->t;
-            $sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse * $sat->deep_arg->t;
-            $sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi * $sat->deep_arg->t;
-            if ($sat->deep_arg->xinc < 0) {
-                $sat->deep_arg->xinc = -$sat->deep_arg->xinc;
-                $sat->deep_arg->xnode = $sat->deep_arg->xnode + Predict::pi;
-                $sat->deep_arg->omgadf = $sat->deep_arg->omgadf - Predict::pi;
-            }
-            if(~$sat->flags & self::RESONANCE_FLAG ) {
-                return;
-            }
-
-            do {
-                if ( ($sat->dps->atime == 0) ||
-                    (($sat->deep_arg->t >= 0) && ($sat->dps->atime < 0)) ||
-                    (($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0)) ) {
-                    /* Epoch restart */
-                    if ($sat->deep_arg->t >= 0) {
-                        $delt = $sat->dps->stepp;
-                    } else {
-                        $delt = $sat->dps->stepn;
-                    }
-
-                    $sat->dps->atime = 0;
-                    $sat->dps->xni = $sat->dps->xnq;
-                    $sat->dps->xli = $sat->dps->xlamo;
-                } else {
-                    if (abs($sat->deep_arg->t) >= abs($sat->dps->atime)) {
-                        if ($sat->deep_arg->t > 0) {
-                            $delt = $sat->dps->stepp;
-                        } else {
-                            $delt = $sat->dps->stepn;
-                        }
-                    }
-                }
-
-                do {
-                    if (abs($sat->deep_arg->t - $sat->dps->atime) >= $sat->dps->stepp) {
-                        $sat->flags |= self::DO_LOOP_FLAG;
-                        $sat->flags &= ~self::EPOCH_RESTART_FLAG;
-                    }
-                    else {
-                        $ft = $sat->deep_arg->t - $sat->dps->atime;
-                        $sat->flags &= ~self::DO_LOOP_FLAG;
-                    }
-
-                    if (abs($sat->deep_arg->t) < abs($sat->dps->atime)) {
-                        if ($sat->deep_arg->t >= 0) {
-                            $delt = $sat->dps->stepn;
-                        } else {
-                            $delt = $sat->dps->stepp;
-                        }
-                        $sat->flags |= (self::DO_LOOP_FLAG | self::EPOCH_RESTART_FLAG);
-                    }
-
-                    /* Dot terms calculated */
-                    if ($sat->flags & self::SYNCHRONOUS_FLAG) {
-                        $xndot = $sat->dps->del1 * sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2 * sin(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + $sat->dps->del3 * sin(3 * ($sat->dps->xli - $sat->dps->fasx6));
-                        $xnddt = $sat->dps->del1 * cos($sat->dps->xli - $sat->dps->fasx2) + 2 * $sat->dps->del2 * cos(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + 3 * $sat->dps->del3 * cos(3 * ($sat->dps->xli - $sat->dps->fasx6));
-                    } else {
-                        $xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot * $sat->dps->atime;
-                        $x2omi = $xomi + $xomi;
-                        $x2li = $sat->dps->xli + $sat->dps->xli;
-                        $xndot = $sat->dps->d2201 * sin($x2omi + $sat->dps->xli - Predict::g22)
-                            + $sat->dps->d2211 * sin($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * sin($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * sin(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d4410 * sin($x2omi + $x2li- Predict::g44)
-                            + $sat->dps->d4422 * sin($x2li- Predict::g44)
-                            + $sat->dps->d5220 * sin($xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5232 * sin(-$xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5421 * sin($xomi + $x2li - Predict::g54)
-                            + $sat->dps->d5433 * sin(-$xomi + $x2li - Predict::g54);
-                        $xnddt = $sat->dps->d2201 * cos($x2omi + $sat->dps->xli- Predict::g22)
-                            + $sat->dps->d2211 * cos($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * cos($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * cos(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d5220 * cos($xomi + $sat->dps->xli - Predict::g52)
-                            + $sat->dps->d5232 * cos(-$xomi + $sat->dps->xli - Predict::g52)
-                            + 2 * ($sat->dps->d4410 * cos($x2omi + $x2li - Predict::g44)
-                                + $sat->dps->d4422 * cos($x2li - Predict::g44)
-                                + $sat->dps->d5421 * cos($xomi + $x2li - Predict::g54)
-                                + $sat->dps->d5433 * cos(-$xomi + $x2li - Predict::g54));
-                    } /* End of if (isFlagSet(SYNCHRONOUS_FLAG)) */
-
-                    $xldot = $sat->dps->xni + $sat->dps->xfact;
-                    $xnddt = $xnddt * $xldot;
-
-                    if ($sat->flags & self::DO_LOOP_FLAG) {
-                        $sat->dps->xli = $sat->dps->xli + $xldot * $delt + $xndot * $sat->dps->step2;
-                        $sat->dps->xni = $sat->dps->xni + $xndot * $delt + $xnddt * $sat->dps->step2;
-                        $sat->dps->atime = $sat->dps->atime + $delt;
-                    }
-                } while (($sat->flags & self::DO_LOOP_FLAG) &&
-                        (~$sat->flags & self::EPOCH_RESTART_FLAG));
-            }
-            while (($sat->flags & self::DO_LOOP_FLAG) && ($sat->flags & self::EPOCH_RESTART_FLAG));
-
-            $sat->deep_arg->xn = $sat->dps->xni + $xndot * $ft + $xnddt * $ft * $ft * 0.5;
-            $xl = $sat->dps->xli + $xldot * $ft + $xndot * $ft * $ft * 0.5;
-            $temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t * Predict::thdt;
-
-            if (~$sat->flags & self::SYNCHRONOUS_FLAG) {
-                $sat->deep_arg->xll = $xl + $temp + $temp;
-            } else {
-                $sat->deep_arg->xll = $xl - $sat->deep_arg->omgadf + $temp;
-            }
-
-            return;
-            /* End case dpsec: */
-
-        case self::dpper: /* Entrance for lunar-solar periodics */
-            $sinis = sin($sat->deep_arg->xinc);
-            $cosis = cos($sat->deep_arg->xinc);
-            if (abs($sat->dps->savtsn - $sat->deep_arg->t) >= 30) {
-                $sat->dps->savtsn = $sat->deep_arg->t;
-                $zm = $sat->dps->zmos + Predict::zns * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zes * sin($zm);
-                $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $ses = $sat->dps->se2 * $f2 + $sat->dps->se3 * $f3;
-                $sis = $sat->dps->si2 * $f2 + $sat->dps->si3 * $f3;
-                $sls = $sat->dps->sl2 * $f2 + $sat->dps->sl3 * $f3 + $sat->dps->sl4 * $sinzf;
-                $sat->dps->sghs = $sat->dps->sgh2 * $f2 + $sat->dps->sgh3 * $f3 + $sat->dps->sgh4 * $sinzf;
-                $sat->dps->shs = $sat->dps->sh2 * $f2 + $sat->dps->sh3 * $f3;
-                $zm = $sat->dps->zmol + Predict::znl * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zel * sin($zm);
-                $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $sel = $sat->dps->ee2 * $f2 + $sat->dps->e3 * $f3;
-                $sil = $sat->dps->xi2 * $f2 + $sat->dps->xi3 * $f3;
-                $sll = $sat->dps->xl2 * $f2 + $sat->dps->xl3 * $f3 + $sat->dps->xl4 * $sinzf;
-                $sat->dps->sghl = $sat->dps->xgh2 * $f2 + $sat->dps->xgh3 * $f3 + $sat->dps->xgh4 * $sinzf;
-                $sat->dps->sh1 = $sat->dps->xh2 * $f2 + $sat->dps->xh3 * $f3;
-                $sat->dps->pe = $ses + $sel;
-                $sat->dps->pinc = $sis + $sil;
-                $sat->dps->pl = $sls + $sll;
-            }
-
-            $pgh = $sat->dps->sghs + $sat->dps->sghl;
-            $ph = $sat->dps->shs + $sat->dps->sh1;
-            $sat->deep_arg->xinc = $sat->deep_arg->xinc + $sat->dps->pinc;
-            $sat->deep_arg->em = $sat->deep_arg->em + $sat->dps->pe;
-
-            if ($sat->dps->xqncl >= 0.2) {
-                /* Apply periodics directly */
-                $ph = $ph / $sat->deep_arg->sinio;
-                $pgh = $pgh - $sat->deep_arg->cosio * $ph;
-                $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $pgh;
-                $sat->deep_arg->xnode = $sat->deep_arg->xnode + $ph;
-                $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
-            } else {
-                /* Apply periodics with Lyddane modification */
-                $sinok = sin($sat->deep_arg->xnode);
-                $cosok = cos($sat->deep_arg->xnode);
-                $alfdp = $sinis * $sinok;
-                $betdp = $sinis * $cosok;
-                $dalf = $ph * $cosok + $sat->dps->pinc * $cosis * $sinok;
-                $dbet = -$ph * $sinok + $sat->dps->pinc * $cosis * $cosok;
-                $alfdp = $alfdp + $dalf;
-                $betdp = $betdp + $dbet;
-                $sat->deep_arg->xnode = Predict_Math::FMod2p($sat->deep_arg->xnode);
-                $xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis * $sat->deep_arg->xnode;
-                $dls = $sat->dps->pl + $pgh - $sat->dps->pinc * $sat->deep_arg->xnode * $sinis;
-                $xls = $xls + $dls;
-                $xnoh = $sat->deep_arg->xnode;
-                $sat->deep_arg->xnode = Predict_Math::AcTan($alfdp, $betdp);
-
-                /* This is a patch to Lyddane modification */
-                /* suggested by Rob Matson. */
-                if(abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
-                    if ($sat->deep_arg->xnode < $xnoh) {
-                        $sat->deep_arg->xnode += Predict::twopi;
-                    } else {
-                        $sat->deep_arg->xnode -= Predict::twopi;
-                    }
-                }
-
-                $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
-                $sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc) *
-                    $sat->deep_arg->xnode;
-            } /* End case dpper: */
-            return;
+        	case self::dpinit : /* Entrance for deep space initialization */
+            	$sat->dps->thgr = Predict_Time::ThetaG($sat->tle->epoch, $sat->deep_arg);
+            	$eq = $sat->tle->eo;
+            	$sat->dps->xnq = $sat->deep_arg->xnodp;
+            	$aqnv = 1.0 / $sat->deep_arg->aodp;
+            	$sat->dps->xqncl = $sat->tle->xincl;
+            	$xmao = $sat->tle->xmo;
+            	$xpidot = $sat->deep_arg->omgdot + $sat->deep_arg->xnodot;
+            	$sinq = sin($sat->tle->xnodeo);
+            	$cosq = cos($sat->tle->xnodeo);
+            	$sat->dps->omegaq = $sat->tle->omegao;
+            	$sat->dps->preep = 0;
+
+            	/* Initialize lunar solar terms */
+            	$day = $sat->deep_arg->ds50 + 18261.5;  /* Days since 1900 Jan 0.5 */
+            	if ($day != $sat->dps->preep) {
+                	$sat->dps->preep = $day;
+                	$xnodce = 4.5236020 - 9.2422029E-4 * $day;
+                	$stem = sin($xnodce);
+                	$ctem = cos($xnodce);
+                	$sat->dps->zcosil = 0.91375164 - 0.03568096 * $ctem;
+                	$sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil * $sat->dps->zcosil);
+                	$sat->dps->zsinhl = 0.089683511 * $stem / $sat->dps->zsinil;
+                	$sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl * $sat->dps->zsinhl);
+                	$c = 4.7199672 + 0.22997150 * $day;
+                	$gam = 5.8351514 + 0.0019443680 * $day;
+                	$sat->dps->zmol = Predict_Math::FMod2p($c - $gam);
+                	$zx = 0.39785416 * $stem / $sat->dps->zsinil;
+                	$zy = $sat->dps->zcoshl * $ctem + 0.91744867 * $sat->dps->zsinhl * $stem;
+                	$zx = Predict_Math::AcTan($zx, $zy);
+                	$zx = $gam + $zx - $xnodce;
+                	$sat->dps->zcosgl = cos($zx);
+                	$sat->dps->zsingl = sin($zx);
+                	$sat->dps->zmos = 6.2565837 + 0.017201977 * $day;
+                	$sat->dps->zmos = Predict_Math::FMod2p($sat->dps->zmos);
+            	} /* End if(day != preep) */
+
+            	/* Do solar terms */
+            	$sat->dps->savtsn = 1E20;
+            	$zcosg = Predict::zcosgs;
+            	$zsing = Predict::zsings;
+            	$zcosi = Predict::zcosis;
+            	$zsini = Predict::zsinis;
+            	$zcosh = $cosq;
+            	$zsinh = $sinq;
+            	$cc = Predict::c1ss;
+            	$zn = Predict::zns;
+            	$ze = Predict::zes;
+            	$zmo = $sat->dps->zmos;
+            	$xnoi = 1.0 / $sat->dps->xnq;
+
+            	/* Loop breaks when Solar terms are done a second */
+            	/* time, after Lunar terms are initialized        */
+            	for(;;) {
+                	/* Solar terms done again after Lunar terms are done */
+                	$a1 = $zcosg * $zcosh + $zsing * $zcosi * $zsinh;
+                	$a3 = -$zsing * $zcosh + $zcosg * $zcosi * $zsinh;
+                	$a7 = -$zcosg * $zsinh + $zsing * $zcosi * $zcosh;
+                	$a8 = $zsing * $zsini;
+                	$a9 = $zsing * $zsinh + $zcosg * $zcosi * $zcosh;
+                	$a10 = $zcosg * $zsini;
+                	$a2 = $sat->deep_arg->cosio * $a7 + $sat->deep_arg->sinio * $a8;
+                	$a4 = $sat->deep_arg->cosio * $a9 + $sat->deep_arg->sinio * $a10;
+                	$a5 = -$sat->deep_arg->sinio * $a7 + $sat->deep_arg->cosio * $a8;
+                	$a6 = -$sat->deep_arg->sinio * $a9 + $sat->deep_arg->cosio * $a10;
+                	$x1 = $a1 * $sat->deep_arg->cosg + $a2 * $sat->deep_arg->sing;
+                	$x2 = $a3 * $sat->deep_arg->cosg + $a4 * $sat->deep_arg->sing;
+                	$x3 = -$a1 * $sat->deep_arg->sing + $a2 * $sat->deep_arg->cosg;
+                	$x4 = -$a3 * $sat->deep_arg->sing + $a4 * $sat->deep_arg->cosg;
+                	$x5 = $a5 * $sat->deep_arg->sing;
+                	$x6 = $a6 * $sat->deep_arg->sing;
+                	$x7 = $a5 * $sat->deep_arg->cosg;
+                	$x8 = $a6 * $sat->deep_arg->cosg;
+                	$z31 = 12 * $x1 * $x1 - 3 * $x3 * $x3;
+                	$z32 = 24 * $x1 * $x2 - 6 * $x3 * $x4;
+                	$z33 = 12 * $x2 * $x2 - 3 * $x4 * $x4;
+                	$z1 = 3 * ($a1 * $a1 + $a2 * $a2) + $z31 * $sat->deep_arg->eosq;
+                	$z2 = 6 * ($a1 * $a3 + $a2 * $a4) + $z32 * $sat->deep_arg->eosq;
+                	$z3 = 3 * ($a3 * $a3 + $a4 * $a4) + $z33 * $sat->deep_arg->eosq;
+                	$z11 = -6 * $a1 * $a5 + $sat->deep_arg->eosq * (-24 * $x1 * $x7 - 6 * $x3 * $x5);
+                	$z12 = -6 * ($a1 * $a6 + $a3 * $a5) + $sat->deep_arg->eosq *
+                    	(-24 * ($x2 * $x7 + $x1 * $x8) - 6 * ($x3 * $x6 + $x4 * $x5));
+                	$z13 = -6 * $a3 * $a6 + $sat->deep_arg->eosq * (-24 * $x2 * $x8 - 6 * $x4 * $x6);
+                	$z21 = 6 * $a2 * $a5 + $sat->deep_arg->eosq * (24 * $x1 * $x5 - 6 * $x3 * $x7);
+                	$z22 = 6 * ($a4 * $a5 + $a2 * $a6) + $sat->deep_arg->eosq *
+                    	(24 * ($x2 * $x5 + $x1 * $x6) - 6 * ($x4 * $x7 + $x3 * $x8));
+                	$z23 = 6 * $a4 * $a6 + $sat->deep_arg->eosq * (24 * $x2 * $x6 - 6 * $x4 * $x8);
+                	$z1 = $z1 + $z1 + $sat->deep_arg->betao2 * $z31;
+                	$z2 = $z2 + $z2 + $sat->deep_arg->betao2 * $z32;
+                	$z3 = $z3 + $z3 + $sat->deep_arg->betao2 * $z33;
+                	$s3 = $cc * $xnoi;
+                	$s2 = -0.5 * $s3 / $sat->deep_arg->betao;
+                	$s4 = $s3 * $sat->deep_arg->betao;
+                	$s1 = -15 * $eq * $s4;
+                	$s5 = $x1 * $x3 + $x2 * $x4;
+                	$s6 = $x2 * $x3 + $x1 * $x4;
+                	$s7 = $x2 * $x4 - $x1 * $x3;
+                	$se = $s1 * $zn * $s5;
+                	$si = $s2 * $zn * ($z11 + $z13);
+                	$sl = -$zn * $s3 * ($z1 + $z3 - 14 - 6 * $sat->deep_arg->eosq);
+                	$sgh = $s4 * $zn * ($z31 + $z33 - 6);
+                	$sh = -$zn * $s2 * ($z21 + $z23);
+                	if ($sat->dps->xqncl < 5.2359877E-2) {
+                    	$sh = 0;
+                	}
+                	$sat->dps->ee2 = 2 * $s1 * $s6;
+                	$sat->dps->e3 = 2 * $s1 * $s7;
+                	$sat->dps->xi2 = 2 * $s2 * $z12;
+                	$sat->dps->xi3 = 2 * $s2 * ($z13 - $z11);
+                	$sat->dps->xl2 = -2 * $s3 * $z2;
+                	$sat->dps->xl3 = -2 * $s3 * ($z3 - $z1);
+                	$sat->dps->xl4 = -2 * $s3 * (-21 - 9 * $sat->deep_arg->eosq) * $ze;
+                	$sat->dps->xgh2 = 2 * $s4 * $z32;
+                	$sat->dps->xgh3 = 2 * $s4 * ($z33 - $z31);
+                	$sat->dps->xgh4 = -18 * $s4 * $ze;
+                	$sat->dps->xh2 = -2 * $s2 * $z22;
+                	$sat->dps->xh3 = -2 * $s2 * ($z23 - $z21);
+
+                	if ($sat->flags & self::LUNAR_TERMS_DONE_FLAG) {
+                    	break;
+                	}
+
+                	/* Do lunar terms */
+                	$sat->dps->sse = $se;
+                	$sat->dps->ssi = $si;
+                	$sat->dps->ssl = $sl;
+                	$sat->dps->ssh = $sh / $sat->deep_arg->sinio;
+                	$sat->dps->ssg = $sgh - $sat->deep_arg->cosio * $sat->dps->ssh;
+                	$sat->dps->se2 = $sat->dps->ee2;
+                	$sat->dps->si2 = $sat->dps->xi2;
+                	$sat->dps->sl2 = $sat->dps->xl2;
+                	$sat->dps->sgh2 = $sat->dps->xgh2;
+                	$sat->dps->sh2 = $sat->dps->xh2;
+                	$sat->dps->se3 = $sat->dps->e3;
+                	$sat->dps->si3 = $sat->dps->xi3;
+                	$sat->dps->sl3 = $sat->dps->xl3;
+                	$sat->dps->sgh3 = $sat->dps->xgh3;
+                	$sat->dps->sh3 = $sat->dps->xh3;
+                	$sat->dps->sl4 = $sat->dps->xl4;
+                	$sat->dps->sgh4 = $sat->dps->xgh4;
+                	$zcosg = $sat->dps->zcosgl;
+                	$zsing = $sat->dps->zsingl;
+                	$zcosi = $sat->dps->zcosil;
+                	$zsini = $sat->dps->zsinil;
+                	$zcosh = $sat->dps->zcoshl * $cosq + $sat->dps->zsinhl * $sinq;
+                	$zsinh = $sinq * $sat->dps->zcoshl - $cosq * $sat->dps->zsinhl;
+                	$zn = Predict::znl;
+                	$cc = Predict::c1l;
+                	$ze = Predict::zel;
+                	$zmo = $sat->dps->zmol;
+                	$sat->flags |= self::LUNAR_TERMS_DONE_FLAG;
+            	} /* End of for(;;) */
+
+            	$sat->dps->sse = $sat->dps->sse + $se;
+            	$sat->dps->ssi = $sat->dps->ssi + $si;
+            	$sat->dps->ssl = $sat->dps->ssl + $sl;
+            	$sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio / $sat->deep_arg->sinio * $sh;
+            	$sat->dps->ssh = $sat->dps->ssh + $sh / $sat->deep_arg->sinio;
+
+            	/* Geopotential resonance initialization for 12 hour orbits */
+            	$sat->flags &= ~self::RESONANCE_FLAG;
+            	$sat->flags &= ~self::SYNCHRONOUS_FLAG;
+
+            	if (!(($sat->dps->xnq < 0.0052359877) && ($sat->dps->xnq > 0.0034906585))) {
+                	if( ($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924) ) {
+                    	return;
+                	}
+                	if ($eq < 0.5) {
+                    	return;
+                	}
+                	$sat->flags |= self::RESONANCE_FLAG;
+                	$eoc = $eq * $sat->deep_arg->eosq;
+                	$g201 = -0.306 - ($eq - 0.64) * 0.440;
+                	if ($eq <= 0.65) {
+                    	$g211 = 3.616 - 13.247 * $eq + 16.290 * $sat->deep_arg->eosq;
+                    	$g310 = -19.302 + 117.390 * $eq - 228.419 *
+                        	$sat->deep_arg->eosq + 156.591 * $eoc;
+                    	$g322 = -18.9068 + 109.7927 * $eq - 214.6334 *
+                        	$sat->deep_arg->eosq + 146.5816 * $eoc;
+                    	$g410 = -41.122 + 242.694 * $eq - 471.094 *
+                        	$sat->deep_arg->eosq + 313.953 * $eoc;
+                    	$g422 = -146.407 + 841.880 * $eq - 1629.014 *
+                        	$sat->deep_arg->eosq + 1083.435 * $eoc;
+                    	$g520 = -532.114 + 3017.977 * $eq - 5740 *
+                        	$sat->deep_arg->eosq + 3708.276 * $eoc;
+                	} else {
+                    	$g211 = -72.099 + 331.819 * $eq - 508.738 *
+                        	$sat->deep_arg->eosq + 266.724 * $eoc;
+                    	$g310 = -346.844 + 1582.851 * $eq - 2415.925 *
+                        	$sat->deep_arg->eosq + 1246.113 * $eoc;
+                    	$g322 = -342.585 + 1554.908 * $eq - 2366.899 *
+                        	$sat->deep_arg->eosq + 1215.972 * $eoc;
+                    	$g410 = -1052.797 + 4758.686 * $eq - 7193.992 *
+                        	$sat->deep_arg->eosq + 3651.957 * $eoc;
+                    	$g422 = -3581.69 + 16178.11 * $eq - 24462.77 *
+                        	$sat->deep_arg->eosq+ 12422.52 * $eoc;
+                    	if ($eq <= 0.715) {
+                        	$g520 = 1464.74 - 4664.75 * $eq + 3763.64 * $sat->deep_arg->eosq;
+                    	} else {
+                        	$g520 = -5149.66 + 29936.92 * $eq - 54087.36 *
+                            	$sat->deep_arg->eosq + 31324.56 * $eoc;
+                    	}
+                	} /* End if (eq <= 0.65) */
+
+                	if ($eq < 0.7) {
+                    	$g533 = -919.2277 + 4988.61 * $eq - 9064.77 *
+                        	$sat->deep_arg->eosq + 5542.21 * $eoc;
+                    	$g521 = -822.71072 + 4568.6173 * $eq - 8491.4146 *
+                        	$sat->deep_arg->eosq + 5337.524 * $eoc;
+                    	$g532 = -853.666 + 4690.25 * $eq - 8624.77 *
+                        	$sat->deep_arg->eosq + 5341.4 * $eoc;
+                	}
+                	else {
+                    	$g533 = -37995.78 + 161616.52 * $eq - 229838.2*
+                        	$sat->deep_arg->eosq + 109377.94 * $eoc;
+                    	$g521 = -51752.104 + 218913.95 * $eq - 309468.16*
+                        	$sat->deep_arg->eosq + 146349.42 * $eoc;
+                    	$g532 = -40023.88 + 170470.89 * $eq - 242699.48*
+                        	$sat->deep_arg->eosq + 115605.82 * $eoc;
+                	} /* End if (eq <= 0.7) */
+
+                	$sini2 = $sat->deep_arg->sinio * $sat->deep_arg->sinio;
+                	$f220 = 0.75 * (1 + 2 * $sat->deep_arg->cosio + $sat->deep_arg->theta2);
+                	$f221 = 1.5 * $sini2;
+                	$f321 = 1.875 * $sat->deep_arg->sinio * (1 - 2 *
+                                  	$sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
+                	$f322 = -1.875 * $sat->deep_arg->sinio * (1 + 2*
+                                   	$sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
+                	$f441 = 35 * $sini2 * $f220;
+                	$f442 = 39.3750 * $sini2 * $sini2;
+                	$f522 = 9.84375 * $sat->deep_arg->sinio * ($sini2 * (1 - 2 * $sat->deep_arg->cosio - 5 *
+                                       	$sat->deep_arg->theta2) + 0.33333333 * (-2 + 4 * $sat->deep_arg->cosio +
+                                                     	6 * $sat->deep_arg->theta2));
+                	$f523 = $sat->deep_arg->sinio * (4.92187512 * $sini2 * (-2 - 4 *
+                                      	$sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2) + 6.56250012
+                            	* (1 + 2 * $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2));
+                	$f542 = 29.53125 * $sat->deep_arg->sinio * (2 - 8 *
+                                 	$sat->deep_arg->cosio + $sat->deep_arg->theta2 *
+                                 	(-12 + 8 * $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2));
+                	$f543 = 29.53125 * $sat->deep_arg->sinio * (-2 - 8 * $sat->deep_arg->cosio +
+                                 	$sat->deep_arg->theta2 * (12 + 8 * $sat->deep_arg->cosio - 10 *
+                                           	$sat->deep_arg->theta2));
+                	$xno2 = $sat->dps->xnq * $sat->dps->xnq;
+                	$ainv2 = $aqnv * $aqnv;
+                	$temp1 = 3 * $xno2 * $ainv2;
+                	$temp = $temp1 * Predict::root22;
+                	$sat->dps->d2201 = $temp * $f220 * $g201;
+                	$sat->dps->d2211 = $temp * $f221 * $g211;
+                	$temp1 = $temp1 * $aqnv;
+                	$temp = $temp1 * Predict::root32;
+                	$sat->dps->d3210 = $temp * $f321 * $g310;
+                	$sat->dps->d3222 = $temp * $f322 * $g322;
+                	$temp1 = $temp1 * $aqnv;
+                	$temp = 2 * $temp1 * Predict::root44;
+                	$sat->dps->d4410 = $temp * $f441 * $g410;
+                	$sat->dps->d4422 = $temp * $f442 * $g422;
+                	$temp1 = $temp1 * $aqnv;
+                	$temp = $temp1 * Predict::root52;
+                	$sat->dps->d5220 = $temp * $f522 * $g520;
+                	$sat->dps->d5232 = $temp * $f523 * $g532;
+                	$temp = 2 * $temp1 * Predict::root54;
+                	$sat->dps->d5421 = $temp * $f542 * $g521;
+                	$sat->dps->d5433 = $temp * $f543 * $g533;
+                	$sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->xnodeo - $sat->dps->thgr - $sat->dps->thgr;
+                	$bfact = $sat->deep_arg->xmdot + $sat->deep_arg->xnodot +
+                    	$sat->deep_arg->xnodot - Predict::thdt - Predict::thdt;
+                	$bfact = $bfact + $sat->dps->ssl + $sat->dps->ssh + $sat->dps->ssh;
+            	} else {
+                	$sat->flags |= self::RESONANCE_FLAG;
+                	$sat->flags |= self::SYNCHRONOUS_FLAG;
+                	/* Synchronous resonance terms initialization */
+                	$g200 = 1 + $sat->deep_arg->eosq * (-2.5 + 0.8125 * $sat->deep_arg->eosq);
+                	$g310 = 1 + 2 * $sat->deep_arg->eosq;
+                	$g300 = 1 + $sat->deep_arg->eosq * (-6 + 6.60937 * $sat->deep_arg->eosq);
+                	$f220 = 0.75 * (1 + $sat->deep_arg->cosio) * (1 + $sat->deep_arg->cosio);
+                	$f311 = 0.9375 * $sat->deep_arg->sinio * $sat->deep_arg->sinio *
+                    	(1 + 3 * $sat->deep_arg->cosio) - 0.75 * (1 + $sat->deep_arg->cosio);
+                	$f330 = 1 + $sat->deep_arg->cosio;
+                	$f330 = 1.875 * $f330 * $f330 * $f330;
+                	$sat->dps->del1 = 3 * $sat->dps->xnq * $sat->dps->xnq * $aqnv * $aqnv;
+                	$sat->dps->del2 = 2 * $sat->dps->del1 * $f220 * $g200 * Predict::q22;
+                	$sat->dps->del3 = 3 * $sat->dps->del1 * $f330 * $g300 * Predict::q33 * $aqnv;
+                	$sat->dps->del1 = $sat->dps->del1 * $f311 * $g310 * Predict::q31 * $aqnv;
+                	$sat->dps->fasx2 = 0.13130908;
+                	$sat->dps->fasx4 = 2.8843198;
+                	$sat->dps->fasx6 = 0.37448087;
+                	$sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->omegao - $sat->dps->thgr;
+                	$bfact = $sat->deep_arg->xmdot + $xpidot - Predict::thdt;
+                	$bfact = $bfact + $sat->dps->ssl + $sat->dps->ssg + $sat->dps->ssh;
+            	} /* End if( !(xnq < 0.0052359877) && (xnq > 0.0034906585) ) */
+
+            	$sat->dps->xfact = $bfact - $sat->dps->xnq;
+
+            	/* Initialize integrator */
+            	$sat->dps->xli = $sat->dps->xlamo;
+            	$sat->dps->xni = $sat->dps->xnq;
+            	$sat->dps->atime = 0;
+            	$sat->dps->stepp = 720;
+            	$sat->dps->stepn = -720;
+            	$sat->dps->step2 = 259200;
+            	/* End case self::dpinit: */
+            	return;
+
+        	case self::dpsec: /* Entrance for deep space secular effects */
+            	$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl * $sat->deep_arg->t;
+            	$sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg * $sat->deep_arg->t;
+            	$sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh * $sat->deep_arg->t;
+            	$sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse * $sat->deep_arg->t;
+            	$sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi * $sat->deep_arg->t;
+            	if ($sat->deep_arg->xinc < 0) {
+                	$sat->deep_arg->xinc = -$sat->deep_arg->xinc;
+                	$sat->deep_arg->xnode = $sat->deep_arg->xnode + Predict::pi;
+                	$sat->deep_arg->omgadf = $sat->deep_arg->omgadf - Predict::pi;
+            	}
+            	if(~$sat->flags & self::RESONANCE_FLAG ) {
+                	return;
+            	}
+
+            	do {
+                	if ( ($sat->dps->atime == 0) ||
+                    	(($sat->deep_arg->t >= 0) && ($sat->dps->atime < 0)) ||
+                    	(($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0)) ) {
+                    	/* Epoch restart */
+                    	if ($sat->deep_arg->t >= 0) {
+                        	$delt = $sat->dps->stepp;
+                    	} else {
+                        	$delt = $sat->dps->stepn;
+                    	}
+
+                    	$sat->dps->atime = 0;
+                    	$sat->dps->xni = $sat->dps->xnq;
+                    	$sat->dps->xli = $sat->dps->xlamo;
+                	} else {
+                    	if (abs($sat->deep_arg->t) >= abs($sat->dps->atime)) {
+                        	if ($sat->deep_arg->t > 0) {
+                            	$delt = $sat->dps->stepp;
+                        	} else {
+                            	$delt = $sat->dps->stepn;
+                        	}
+                    	}
+                	}
+
+                	do {
+                    	if (abs($sat->deep_arg->t - $sat->dps->atime) >= $sat->dps->stepp) {
+                        	$sat->flags |= self::DO_LOOP_FLAG;
+                        	$sat->flags &= ~self::EPOCH_RESTART_FLAG;
+                    	}
+                    	else {
+                        	$ft = $sat->deep_arg->t - $sat->dps->atime;
+                        	$sat->flags &= ~self::DO_LOOP_FLAG;
+                    	}
+
+                    	if (abs($sat->deep_arg->t) < abs($sat->dps->atime)) {
+                        	if ($sat->deep_arg->t >= 0) {
+                            	$delt = $sat->dps->stepn;
+                        	} else {
+                            	$delt = $sat->dps->stepp;
+                        	}
+                        	$sat->flags |= (self::DO_LOOP_FLAG | self::EPOCH_RESTART_FLAG);
+                    	}
+
+                    	/* Dot terms calculated */
+                    	if ($sat->flags & self::SYNCHRONOUS_FLAG) {
+                        	$xndot = $sat->dps->del1 * sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2 * sin(2 * ($sat->dps->xli - $sat->dps->fasx4))
+                            	+ $sat->dps->del3 * sin(3 * ($sat->dps->xli - $sat->dps->fasx6));
+                        	$xnddt = $sat->dps->del1 * cos($sat->dps->xli - $sat->dps->fasx2) + 2 * $sat->dps->del2 * cos(2 * ($sat->dps->xli - $sat->dps->fasx4))
+                            	+ 3 * $sat->dps->del3 * cos(3 * ($sat->dps->xli - $sat->dps->fasx6));
+                    	} else {
+                        	$xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot * $sat->dps->atime;
+                        	$x2omi = $xomi + $xomi;
+                        	$x2li = $sat->dps->xli + $sat->dps->xli;
+                        	$xndot = $sat->dps->d2201 * sin($x2omi + $sat->dps->xli - Predict::g22)
+                            	+ $sat->dps->d2211 * sin($sat->dps->xli - Predict::g22)
+                            	+ $sat->dps->d3210 * sin($xomi + $sat->dps->xli - Predict::g32)
+                            	+ $sat->dps->d3222 * sin(-$xomi + $sat->dps->xli - Predict::g32)
+                            	+ $sat->dps->d4410 * sin($x2omi + $x2li- Predict::g44)
+                            	+ $sat->dps->d4422 * sin($x2li- Predict::g44)
+                            	+ $sat->dps->d5220 * sin($xomi + $sat->dps->xli- Predict::g52)
+                            	+ $sat->dps->d5232 * sin(-$xomi + $sat->dps->xli- Predict::g52)
+                            	+ $sat->dps->d5421 * sin($xomi + $x2li - Predict::g54)
+                            	+ $sat->dps->d5433 * sin(-$xomi + $x2li - Predict::g54);
+                        	$xnddt = $sat->dps->d2201 * cos($x2omi + $sat->dps->xli- Predict::g22)
+                            	+ $sat->dps->d2211 * cos($sat->dps->xli - Predict::g22)
+                            	+ $sat->dps->d3210 * cos($xomi + $sat->dps->xli - Predict::g32)
+                            	+ $sat->dps->d3222 * cos(-$xomi + $sat->dps->xli - Predict::g32)
+                            	+ $sat->dps->d5220 * cos($xomi + $sat->dps->xli - Predict::g52)
+                            	+ $sat->dps->d5232 * cos(-$xomi + $sat->dps->xli - Predict::g52)
+                            	+ 2 * ($sat->dps->d4410 * cos($x2omi + $x2li - Predict::g44)
+                                	+ $sat->dps->d4422 * cos($x2li - Predict::g44)
+                                	+ $sat->dps->d5421 * cos($xomi + $x2li - Predict::g54)
+                                	+ $sat->dps->d5433 * cos(-$xomi + $x2li - Predict::g54));
+                    	} /* End of if (isFlagSet(SYNCHRONOUS_FLAG)) */
+
+                    	$xldot = $sat->dps->xni + $sat->dps->xfact;
+                    	$xnddt = $xnddt * $xldot;
+
+                    	if ($sat->flags & self::DO_LOOP_FLAG) {
+                        	$sat->dps->xli = $sat->dps->xli + $xldot * $delt + $xndot * $sat->dps->step2;
+                        	$sat->dps->xni = $sat->dps->xni + $xndot * $delt + $xnddt * $sat->dps->step2;
+                        	$sat->dps->atime = $sat->dps->atime + $delt;
+                    	}
+                	} while (($sat->flags & self::DO_LOOP_FLAG) &&
+                        	(~$sat->flags & self::EPOCH_RESTART_FLAG));
+            	}
+            	while (($sat->flags & self::DO_LOOP_FLAG) && ($sat->flags & self::EPOCH_RESTART_FLAG));
+
+            	$sat->deep_arg->xn = $sat->dps->xni + $xndot * $ft + $xnddt * $ft * $ft * 0.5;
+            	$xl = $sat->dps->xli + $xldot * $ft + $xndot * $ft * $ft * 0.5;
+            	$temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t * Predict::thdt;
+
+            	if (~$sat->flags & self::SYNCHRONOUS_FLAG) {
+                	$sat->deep_arg->xll = $xl + $temp + $temp;
+            	} else {
+                	$sat->deep_arg->xll = $xl - $sat->deep_arg->omgadf + $temp;
+            	}
+
+            	return;
+            	/* End case dpsec: */
+
+        	case self::dpper: /* Entrance for lunar-solar periodics */
+            	$sinis = sin($sat->deep_arg->xinc);
+            	$cosis = cos($sat->deep_arg->xinc);
+            	if (abs($sat->dps->savtsn - $sat->deep_arg->t) >= 30) {
+                	$sat->dps->savtsn = $sat->deep_arg->t;
+                	$zm = $sat->dps->zmos + Predict::zns * $sat->deep_arg->t;
+                	$zf = $zm + 2 * Predict::zes * sin($zm);
+                	$sinzf = sin($zf);
+                	$f2 = 0.5 * $sinzf * $sinzf - 0.25;
+                	$f3 = -0.5 * $sinzf * cos($zf);
+                	$ses = $sat->dps->se2 * $f2 + $sat->dps->se3 * $f3;
+                	$sis = $sat->dps->si2 * $f2 + $sat->dps->si3 * $f3;
+                	$sls = $sat->dps->sl2 * $f2 + $sat->dps->sl3 * $f3 + $sat->dps->sl4 * $sinzf;
+                	$sat->dps->sghs = $sat->dps->sgh2 * $f2 + $sat->dps->sgh3 * $f3 + $sat->dps->sgh4 * $sinzf;
+                	$sat->dps->shs = $sat->dps->sh2 * $f2 + $sat->dps->sh3 * $f3;
+                	$zm = $sat->dps->zmol + Predict::znl * $sat->deep_arg->t;
+                	$zf = $zm + 2 * Predict::zel * sin($zm);
+                	$sinzf = sin($zf);
+                	$f2 = 0.5 * $sinzf * $sinzf - 0.25;
+                	$f3 = -0.5 * $sinzf * cos($zf);
+                	$sel = $sat->dps->ee2 * $f2 + $sat->dps->e3 * $f3;
+                	$sil = $sat->dps->xi2 * $f2 + $sat->dps->xi3 * $f3;
+                	$sll = $sat->dps->xl2 * $f2 + $sat->dps->xl3 * $f3 + $sat->dps->xl4 * $sinzf;
+                	$sat->dps->sghl = $sat->dps->xgh2 * $f2 + $sat->dps->xgh3 * $f3 + $sat->dps->xgh4 * $sinzf;
+                	$sat->dps->sh1 = $sat->dps->xh2 * $f2 + $sat->dps->xh3 * $f3;
+                	$sat->dps->pe = $ses + $sel;
+                	$sat->dps->pinc = $sis + $sil;
+                	$sat->dps->pl = $sls + $sll;
+            	}
+
+            	$pgh = $sat->dps->sghs + $sat->dps->sghl;
+            	$ph = $sat->dps->shs + $sat->dps->sh1;
+            	$sat->deep_arg->xinc = $sat->deep_arg->xinc + $sat->dps->pinc;
+            	$sat->deep_arg->em = $sat->deep_arg->em + $sat->dps->pe;
+
+            	if ($sat->dps->xqncl >= 0.2) {
+                	/* Apply periodics directly */
+                	$ph = $ph / $sat->deep_arg->sinio;
+                	$pgh = $pgh - $sat->deep_arg->cosio * $ph;
+                	$sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $pgh;
+                	$sat->deep_arg->xnode = $sat->deep_arg->xnode + $ph;
+                	$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
+            	} else {
+                	/* Apply periodics with Lyddane modification */
+                	$sinok = sin($sat->deep_arg->xnode);
+                	$cosok = cos($sat->deep_arg->xnode);
+                	$alfdp = $sinis * $sinok;
+                	$betdp = $sinis * $cosok;
+                	$dalf = $ph * $cosok + $sat->dps->pinc * $cosis * $sinok;
+                	$dbet = -$ph * $sinok + $sat->dps->pinc * $cosis * $cosok;
+                	$alfdp = $alfdp + $dalf;
+                	$betdp = $betdp + $dbet;
+                	$sat->deep_arg->xnode = Predict_Math::FMod2p($sat->deep_arg->xnode);
+                	$xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis * $sat->deep_arg->xnode;
+                	$dls = $sat->dps->pl + $pgh - $sat->dps->pinc * $sat->deep_arg->xnode * $sinis;
+                	$xls = $xls + $dls;
+                	$xnoh = $sat->deep_arg->xnode;
+                	$sat->deep_arg->xnode = Predict_Math::AcTan($alfdp, $betdp);
+
+                	/* This is a patch to Lyddane modification */
+                	/* suggested by Rob Matson. */
+                	if(abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
+                    	if ($sat->deep_arg->xnode < $xnoh) {
+                        	$sat->deep_arg->xnode += Predict::twopi;
+                    	} else {
+                        	$sat->deep_arg->xnode -= Predict::twopi;
+                    	}
+                	}
+
+                	$sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
+                	$sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc) *
+                    	$sat->deep_arg->xnode;
+            	} /* End case dpper: */
+            	return;
 
         } /* End switch(ientry) */
 

Spacing +511 added lines, -511 removed lines

@@ -42,10 +42,10 @@ 
 
     /* orbit_type_t struct */
     const ORBIT_TYPE_UNKNOWN = 0;
-    const ORBIT_TYPE_LEO     = 1;            /*!< Low Earth orbit, up to 1200 km. */
-    const ORBIT_TYPE_ICO     = 2;            /*!< Intermediate Circular Orbit, up to 1400 km. */
-    const ORBIT_TYPE_GEO     = 3;            /*!< Geostationary. */
-    const ORBIT_TYPE_GSO     = 4;            /*!< Geosynchronuous. */
+    const ORBIT_TYPE_LEO     = 1; /*!< Low Earth orbit, up to 1200 km. */
+    const ORBIT_TYPE_ICO     = 2; /*!< Intermediate Circular Orbit, up to 1400 km. */
+    const ORBIT_TYPE_GEO     = 3; /*!< Geostationary. */
+    const ORBIT_TYPE_GSO     = 4; /*!< Geosynchronuous. */
     const ORBIT_TYPE_MOLNIYA = 5;
     const ORBIT_TYPE_TUNDRA  = 6;
     const ORBIT_TYPE_POLAR   = 7;
@@ -70,29 +70,29 @@ 
     public function SGP4(Predict_Sat $sat, $tsince)
     {
         /* Initialization */
-        if (~$sat->flags & self::SGP4_INITIALIZED_FLAG) {
+        if (~$sat->flags&self::SGP4_INITIALIZED_FLAG) {
             $sat->flags |= self::SGP4_INITIALIZED_FLAG;
 
             /* Recover original mean motion (xnodp) and   */
             /* semimajor axis (aodp) from input elements. */
-            $a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
+            $a1 = pow(Predict::xke/$sat->tle->xno, Predict::tothrd);
             $sat->sgps->cosio = cos($sat->tle->xincl);
-            $theta2 = $sat->sgps->cosio * $sat->sgps->cosio;
-            $sat->sgps->x3thm1 = 3 * $theta2 - 1.0;
-            $eosq = $sat->tle->eo * $sat->tle->eo;
+            $theta2 = $sat->sgps->cosio*$sat->sgps->cosio;
+            $sat->sgps->x3thm1 = 3*$theta2 - 1.0;
+            $eosq = $sat->tle->eo*$sat->tle->eo;
             $betao2 = 1 - $eosq;
             $betao = sqrt($betao2);
-            $del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($a1 * $a1 * $betao * $betao2);
-            $ao = $a1 * (1 - $del1 * (0.5 * Predict::tothrd + $del1 * (1 + 134.0 / 81.0 * $del1)));
-            $delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 / ($ao * $ao * $betao * $betao2);
-            $sat->sgps->xnodp = $sat->tle->xno / (1.0 + $delo);
-            $sat->sgps->aodp = $ao / (1.0 - $delo);
+            $del1 = 1.5*Predict::ck2*$sat->sgps->x3thm1/($a1*$a1*$betao*$betao2);
+            $ao = $a1*(1 - $del1*(0.5*Predict::tothrd + $del1*(1 + 134.0/81.0*$del1)));
+            $delo = 1.5*Predict::ck2*$sat->sgps->x3thm1/($ao*$ao*$betao*$betao2);
+            $sat->sgps->xnodp = $sat->tle->xno/(1.0 + $delo);
+            $sat->sgps->aodp = $ao/(1.0 - $delo);
 
             /* For perigee less than 220 kilometers, the "simple" flag is set */
             /* and the equations are truncated to linear variation in sqrt a  */
             /* and quadratic variation in mean anomaly.  Also, the c3 term,   */
             /* the delta omega term, and the delta m term are dropped.        */
-            if (($sat->sgps->aodp * (1.0 - $sat->tle->eo) / Predict::ae) < (220.0 / Predict::xkmper + Predict::ae)) {
+            if (($sat->sgps->aodp*(1.0 - $sat->tle->eo)/Predict::ae) < (220.0/Predict::xkmper + Predict::ae)) {
                 $sat->flags |= self::SIMPLE_FLAG;
             } else {
                 $sat->flags &= ~self::SIMPLE_FLAG;
@@ -102,121 +102,121 @@ 
             /* values of s and qoms2t are altered. */
             $s4 = Predict::__s__;
             $qoms24 = Predict::qoms2t;
-            $perige = ($sat->sgps->aodp * (1 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
+            $perige = ($sat->sgps->aodp*(1 - $sat->tle->eo) - Predict::ae)*Predict::xkmper;
             if ($perige < 156.0) {
                 if ($perige <= 98.0) {
                     $s4 = 20.0;
                 } else {
                     $s4 = $perige - 78.0;
                 }
-                $qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
-                $s4 = $s4 / Predict::xkmper + Predict::ae;
+                $qoms24 = pow((120.0 - $s4)*Predict::ae/Predict::xkmper, 4);
+                $s4 = $s4/Predict::xkmper + Predict::ae;
             }; /* FIXME FIXME: End of if(perige <= 98) NO WAY!!!! */
 
-            $pinvsq = 1.0 / ($sat->sgps->aodp * $sat->sgps->aodp * $betao2 * $betao2);
-            $tsi = 1.0 / ($sat->sgps->aodp - $s4);
-            $sat->sgps->eta = $sat->sgps->aodp * $sat->tle->eo * $tsi;
-            $etasq = $sat->sgps->eta * $sat->sgps->eta;
-            $eeta = $sat->tle->eo * $sat->sgps->eta;
+            $pinvsq = 1.0/($sat->sgps->aodp*$sat->sgps->aodp*$betao2*$betao2);
+            $tsi = 1.0/($sat->sgps->aodp - $s4);
+            $sat->sgps->eta = $sat->sgps->aodp*$sat->tle->eo*$tsi;
+            $etasq = $sat->sgps->eta*$sat->sgps->eta;
+            $eeta = $sat->tle->eo*$sat->sgps->eta;
             $psisq = abs(1.0 - $etasq);
-            $coef = $qoms24 * pow($tsi, 4);
-            $coef1 = $coef / pow($psisq, 3.5);
-            $c2 = $coef1 * $sat->sgps->xnodp * ($sat->sgps->aodp *
-                            (1.0 + 1.5 * $etasq + $eeta * (4.0 + $etasq)) +
-                            0.75 * Predict::ck2 * $tsi / $psisq * $sat->sgps->x3thm1 *
-                            (8.0 + 3.0 * $etasq * (8 + $etasq)));
-            $sat->sgps->c1 = $c2 * $sat->tle->bstar;
+            $coef = $qoms24*pow($tsi, 4);
+            $coef1 = $coef/pow($psisq, 3.5);
+            $c2 = $coef1*$sat->sgps->xnodp*($sat->sgps->aodp*
+                            (1.0 + 1.5*$etasq + $eeta*(4.0 + $etasq)) +
+                            0.75*Predict::ck2*$tsi/$psisq*$sat->sgps->x3thm1*
+                            (8.0 + 3.0*$etasq*(8 + $etasq)));
+            $sat->sgps->c1 = $c2*$sat->tle->bstar;
             $sat->sgps->sinio = sin($sat->tle->xincl);
-            $a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
-            $c3 = $coef * $tsi * $a3ovk2 * $sat->sgps->xnodp * Predict::ae * $sat->sgps->sinio / $sat->tle->eo;
+            $a3ovk2 = -Predict::xj3/Predict::ck2*pow(Predict::ae, 3);
+            $c3 = $coef*$tsi*$a3ovk2*$sat->sgps->xnodp*Predict::ae*$sat->sgps->sinio/$sat->tle->eo;
             $sat->sgps->x1mth2 = 1.0 - $theta2;
-            $sat->sgps->c4 = 2.0 * $sat->sgps->xnodp * $coef1 * $sat->sgps->aodp * $betao2 *
-                ($sat->sgps->eta * (2.0 + 0.5 * $etasq) +
-                 $sat->tle->eo * (0.5 + 2.0 * $etasq) -
-                 2.0 * Predict::ck2 * $tsi / ($sat->sgps->aodp * $psisq) *
-                 (-3.0 * $sat->sgps->x3thm1 * (1.0 - 2.0 * $eeta + $etasq * (1.5 - 0.5 * $eeta)) +
-                  0.75 * $sat->sgps->x1mth2 * (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
-                  cos(2.0 * $sat->tle->omegao)));
-            $sat->sgps->c5 = 2.0 * $coef1 * $sat->sgps->aodp * $betao2 *
-                (1.0 + 2.75 * ($etasq + $eeta) + $eeta * $etasq);
-            $theta4 = $theta2 * $theta2;
-            $temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->sgps->xnodp;
-            $temp2 = $temp1 * Predict::ck2 * $pinvsq;
-            $temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->sgps->xnodp;
-            $sat->sgps->xmdot = $sat->sgps->xnodp + 0.5 * $temp1 * $betao * $sat->sgps->x3thm1 +
-                0.0625 * $temp2 * $betao * (13.0 - 78.0 * $theta2 + 137.0 * $theta4);
-            $x1m5th = 1.0 - 5.0 * $theta2;
-            $sat->sgps->omgdot = -0.5 * $temp1 * $x1m5th +
-                0.0625 * $temp2 * (7.0 - 114.0 * $theta2 + 395.0 * $theta4) +
-                $temp3 * (3.0 - 36.0 * $theta2 + 49.0 * $theta4);
-            $xhdot1 = -$temp1 * $sat->sgps->cosio;
-            $sat->sgps->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $theta2) +
-                             2.0 * $temp3 * (3.0 - 7.0 * $theta2)) * $sat->sgps->cosio;
-            $sat->sgps->omgcof = $sat->tle->bstar * $c3 * cos($sat->tle->omegao);
-            $sat->sgps->xmcof = -Predict::tothrd * $coef * $sat->tle->bstar * Predict::ae / $eeta;
-            $sat->sgps->xnodcf = 3.5 * $betao2 * $xhdot1 * $sat->sgps->c1;
-            $sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
-            $sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->sgps->sinio *
-                (3.0 + 5.0 * $sat->sgps->cosio) / (1.0 + $sat->sgps->cosio);
-            $sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->sgps->sinio;
-            $sat->sgps->delmo = pow(1.0 + $sat->sgps->eta * cos($sat->tle->xmo), 3);
+            $sat->sgps->c4 = 2.0*$sat->sgps->xnodp*$coef1*$sat->sgps->aodp*$betao2*
+                ($sat->sgps->eta*(2.0 + 0.5*$etasq) +
+                 $sat->tle->eo*(0.5 + 2.0*$etasq) -
+                 2.0*Predict::ck2*$tsi/($sat->sgps->aodp*$psisq)*
+                 (-3.0*$sat->sgps->x3thm1*(1.0 - 2.0*$eeta + $etasq*(1.5 - 0.5*$eeta)) +
+                  0.75*$sat->sgps->x1mth2*(2.0*$etasq - $eeta*(1.0 + $etasq))*
+                  cos(2.0*$sat->tle->omegao)));
+            $sat->sgps->c5 = 2.0*$coef1*$sat->sgps->aodp*$betao2*
+                (1.0 + 2.75*($etasq + $eeta) + $eeta*$etasq);
+            $theta4 = $theta2*$theta2;
+            $temp1 = 3.0*Predict::ck2*$pinvsq*$sat->sgps->xnodp;
+            $temp2 = $temp1*Predict::ck2*$pinvsq;
+            $temp3 = 1.25*Predict::ck4*$pinvsq*$pinvsq*$sat->sgps->xnodp;
+            $sat->sgps->xmdot = $sat->sgps->xnodp + 0.5*$temp1*$betao*$sat->sgps->x3thm1 +
+                0.0625*$temp2*$betao*(13.0 - 78.0*$theta2 + 137.0*$theta4);
+            $x1m5th = 1.0 - 5.0*$theta2;
+            $sat->sgps->omgdot = -0.5*$temp1*$x1m5th +
+                0.0625*$temp2*(7.0 - 114.0*$theta2 + 395.0*$theta4) +
+                $temp3*(3.0 - 36.0*$theta2 + 49.0*$theta4);
+            $xhdot1 = -$temp1*$sat->sgps->cosio;
+            $sat->sgps->xnodot = $xhdot1 + (0.5*$temp2*(4.0 - 19.0*$theta2) +
+                             2.0*$temp3*(3.0 - 7.0*$theta2))*$sat->sgps->cosio;
+            $sat->sgps->omgcof = $sat->tle->bstar*$c3*cos($sat->tle->omegao);
+            $sat->sgps->xmcof = -Predict::tothrd*$coef*$sat->tle->bstar*Predict::ae/$eeta;
+            $sat->sgps->xnodcf = 3.5*$betao2*$xhdot1*$sat->sgps->c1;
+            $sat->sgps->t2cof = 1.5*$sat->sgps->c1;
+            $sat->sgps->xlcof = 0.125*$a3ovk2*$sat->sgps->sinio*
+                (3.0 + 5.0*$sat->sgps->cosio)/(1.0 + $sat->sgps->cosio);
+            $sat->sgps->aycof = 0.25*$a3ovk2*$sat->sgps->sinio;
+            $sat->sgps->delmo = pow(1.0 + $sat->sgps->eta*cos($sat->tle->xmo), 3);
             $sat->sgps->sinmo = sin($sat->tle->xmo);
-            $sat->sgps->x7thm1 = 7.0 * $theta2 - 1.0;
-            if (~$sat->flags & self::SIMPLE_FLAG) {
-                $c1sq = $sat->sgps->c1 * $sat->sgps->c1;
-                $sat->sgps->d2 = 4.0 * $sat->sgps->aodp * $tsi * $c1sq;
-                $temp = $sat->sgps->d2 * $tsi * $sat->sgps->c1 / 3.0;
-                $sat->sgps->d3 = (17.0 * $sat->sgps->aodp + $s4) * $temp;
-                $sat->sgps->d4 = 0.5 * $temp * $sat->sgps->aodp * $tsi *
-                    (221.0 * $sat->sgps->aodp + 31.0 * $s4) * $sat->sgps->c1;
-                $sat->sgps->t3cof = $sat->sgps->d2 + 2.0 * $c1sq;
-                $sat->sgps->t4cof = 0.25 * (3.0 * $sat->sgps->d3 + $sat->sgps->c1 *
-                              (12.0 * $sat->sgps->d2 + 10.0 * $c1sq));
-                $sat->sgps->t5cof = 0.2 * (3.0 * $sat->sgps->d4 +
-                             12.0 * $sat->sgps->c1 * $sat->sgps->d3 +
-                             6.0 * $sat->sgps->d2 * $sat->sgps->d2 +
-                             15.0 * $c1sq * (2.0 * $sat->sgps->d2 + $c1sq));
+            $sat->sgps->x7thm1 = 7.0*$theta2 - 1.0;
+            if (~$sat->flags&self::SIMPLE_FLAG) {
+                $c1sq = $sat->sgps->c1*$sat->sgps->c1;
+                $sat->sgps->d2 = 4.0*$sat->sgps->aodp*$tsi*$c1sq;
+                $temp = $sat->sgps->d2*$tsi*$sat->sgps->c1/3.0;
+                $sat->sgps->d3 = (17.0*$sat->sgps->aodp + $s4)*$temp;
+                $sat->sgps->d4 = 0.5*$temp*$sat->sgps->aodp*$tsi*
+                    (221.0*$sat->sgps->aodp + 31.0*$s4)*$sat->sgps->c1;
+                $sat->sgps->t3cof = $sat->sgps->d2 + 2.0*$c1sq;
+                $sat->sgps->t4cof = 0.25*(3.0*$sat->sgps->d3 + $sat->sgps->c1*
+                              (12.0*$sat->sgps->d2 + 10.0*$c1sq));
+                $sat->sgps->t5cof = 0.2*(3.0*$sat->sgps->d4 +
+                             12.0*$sat->sgps->c1*$sat->sgps->d3 +
+                             6.0*$sat->sgps->d2*$sat->sgps->d2 +
+                             15.0*$c1sq*(2.0*$sat->sgps->d2 + $c1sq));
             }; /* End of if (isFlagClear(SIMPLE_FLAG)) */
         }; /* End of SGP4() initialization */
 
         /* Update for secular gravity and atmospheric drag. */
-        $xmdf = $sat->tle->xmo + $sat->sgps->xmdot * $tsince;
-        $omgadf = $sat->tle->omegao + $sat->sgps->omgdot * $tsince;
-        $xnoddf = $sat->tle->xnodeo + $sat->sgps->xnodot * $tsince;
+        $xmdf = $sat->tle->xmo + $sat->sgps->xmdot*$tsince;
+        $omgadf = $sat->tle->omegao + $sat->sgps->omgdot*$tsince;
+        $xnoddf = $sat->tle->xnodeo + $sat->sgps->xnodot*$tsince;
         $omega = $omgadf;
         $xmp = $xmdf;
-        $tsq = $tsince * $tsince;
-        $xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
-        $tempa = 1.0 - $sat->sgps->c1 * $tsince;
-        $tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
-        $templ = $sat->sgps->t2cof * $tsq;
-        if (~$sat->flags & self::SIMPLE_FLAG) {
-            $delomg = $sat->sgps->omgcof * $tsince;
-            $delm = $sat->sgps->xmcof * (pow(1 + $sat->sgps->eta * cos($xmdf), 3) - $sat->sgps->delmo);
+        $tsq = $tsince*$tsince;
+        $xnode = $xnoddf + $sat->sgps->xnodcf*$tsq;
+        $tempa = 1.0 - $sat->sgps->c1*$tsince;
+        $tempe = $sat->tle->bstar*$sat->sgps->c4*$tsince;
+        $templ = $sat->sgps->t2cof*$tsq;
+        if (~$sat->flags&self::SIMPLE_FLAG) {
+            $delomg = $sat->sgps->omgcof*$tsince;
+            $delm = $sat->sgps->xmcof*(pow(1 + $sat->sgps->eta*cos($xmdf), 3) - $sat->sgps->delmo);
             $temp = $delomg + $delm;
             $xmp = $xmdf + $temp;
             $omega = $omgadf - $temp;
-            $tcube = $tsq * $tsince;
-            $tfour = $tsince * $tcube;
-            $tempa = $tempa - $sat->sgps->d2 * $tsq - $sat->sgps->d3 * $tcube - $sat->sgps->d4 * $tfour;
-            $tempe = $tempe + $sat->tle->bstar * $sat->sgps->c5 * (sin($xmp) - $sat->sgps->sinmo);
-            $templ = $templ + $sat->sgps->t3cof * $tcube + $tfour *
-                ($sat->sgps->t4cof + $tsince * $sat->sgps->t5cof);
+            $tcube = $tsq*$tsince;
+            $tfour = $tsince*$tcube;
+            $tempa = $tempa - $sat->sgps->d2*$tsq - $sat->sgps->d3*$tcube - $sat->sgps->d4*$tfour;
+            $tempe = $tempe + $sat->tle->bstar*$sat->sgps->c5*(sin($xmp) - $sat->sgps->sinmo);
+            $templ = $templ + $sat->sgps->t3cof*$tcube + $tfour*
+                ($sat->sgps->t4cof + $tsince*$sat->sgps->t5cof);
         }; /* End of if (isFlagClear(SIMPLE_FLAG)) */
 
-        $a = $sat->sgps->aodp * pow($tempa, 2);
+        $a = $sat->sgps->aodp*pow($tempa, 2);
         $e = $sat->tle->eo - $tempe;
-        $xl = $xmp + $omega + $xnode + $sat->sgps->xnodp * $templ;
-        $beta = sqrt(1.0 - ($e * $e));
-        $xn = Predict::xke / pow($a, 1.5);
+        $xl = $xmp + $omega + $xnode + $sat->sgps->xnodp*$templ;
+        $beta = sqrt(1.0 - ($e*$e));
+        $xn = Predict::xke/pow($a, 1.5);
 
         /* Long period periodics */
-        $axn = $e * cos($omega);
-        $temp = 1.0 / ($a * $beta * $beta);
-        $xll = $temp * $sat->sgps->xlcof * $axn;
-        $aynl = $temp * $sat->sgps->aycof;
+        $axn = $e*cos($omega);
+        $temp = 1.0/($a*$beta*$beta);
+        $xll = $temp*$sat->sgps->xlcof*$axn;
+        $aynl = $temp*$sat->sgps->aycof;
         $xlt = $xl + $xll;
-        $ayn = $e * sin($omega) + $aynl;
+        $ayn = $e*sin($omega) + $aynl;
 
         /* Solve Kepler's' Equation */
         $capu = Predict_Math::FMod2p($xlt - $xnode);
@@ -226,11 +226,11 @@ 
         do {
             $sinepw = sin($temp2);
             $cosepw = cos($temp2);
-            $temp3 = $axn * $sinepw;
-            $temp4 = $ayn * $cosepw;
-            $temp5 = $axn * $cosepw;
-            $temp6 = $ayn * $sinepw;
-            $epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
+            $temp3 = $axn*$sinepw;
+            $temp4 = $ayn*$cosepw;
+            $temp5 = $axn*$cosepw;
+            $temp6 = $ayn*$sinepw;
+            $epw = ($capu - $temp4 + $temp3 - $temp2)/(1.0 - $temp5 - $temp6) + $temp2;
             if (abs($epw - $temp2) <= Predict::e6a) {
                 break;
             }
@@ -240,33 +240,33 @@ 
         /* Short period preliminary quantities */
         $ecose = $temp5 + $temp6;
         $esine = $temp3 - $temp4;
-        $elsq = $axn * $axn + $ayn * $ayn;
+        $elsq = $axn*$axn + $ayn*$ayn;
         $temp = 1.0 - $elsq;
-        $pl = $a * $temp;
-        $r = $a * (1.0 - $ecose);
-        $temp1 = 1.0 / $r;
-        $rdot = Predict::xke * sqrt($a) * $esine * $temp1;
-        $rfdot = Predict::xke * sqrt($pl) * $temp1;
-        $temp2 = $a * $temp1;
+        $pl = $a*$temp;
+        $r = $a*(1.0 - $ecose);
+        $temp1 = 1.0/$r;
+        $rdot = Predict::xke*sqrt($a)*$esine*$temp1;
+        $rfdot = Predict::xke*sqrt($pl)*$temp1;
+        $temp2 = $a*$temp1;
         $betal = sqrt($temp);
-        $temp3 = 1.0 / (1.0 + $betal);
-        $cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
-        $sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
+        $temp3 = 1.0/(1.0 + $betal);
+        $cosu = $temp2*($cosepw - $axn + $ayn*$esine*$temp3);
+        $sinu = $temp2*($sinepw - $ayn - $axn*$esine*$temp3);
         $u = Predict_Math::AcTan($sinu, $cosu);
-        $sin2u = 2.0 * $sinu * $cosu;
-        $cos2u = 2.0 * $cosu * $cosu - 1.0;
-        $temp = 1.0 / $pl;
-        $temp1 = Predict::ck2 * $temp;
-        $temp2 = $temp1 * $temp;
+        $sin2u = 2.0*$sinu*$cosu;
+        $cos2u = 2.0*$cosu*$cosu - 1.0;
+        $temp = 1.0/$pl;
+        $temp1 = Predict::ck2*$temp;
+        $temp2 = $temp1*$temp;
 
         /* Update for short periodics */
-        $rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
-            0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
-        $uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
-        $xnodek = $xnode + 1.5 * $temp2 * $sat->sgps->cosio * $sin2u;
-        $xinck = $sat->tle->xincl + 1.5 * $temp2 * $sat->sgps->cosio * $sat->sgps->sinio * $cos2u;
-        $rdotk = $rdot - $xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
-        $rfdotk = $rfdot + $xn * $temp1 * ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
+        $rk = $r*(1.0 - 1.5*$temp2*$betal*$sat->sgps->x3thm1) +
+            0.5*$temp1*$sat->sgps->x1mth2*$cos2u;
+        $uk = $u - 0.25*$temp2*$sat->sgps->x7thm1*$sin2u;
+        $xnodek = $xnode + 1.5*$temp2*$sat->sgps->cosio*$sin2u;
+        $xinck = $sat->tle->xincl + 1.5*$temp2*$sat->sgps->cosio*$sat->sgps->sinio*$cos2u;
+        $rdotk = $rdot - $xn*$temp1*$sat->sgps->x1mth2*$sin2u;
+        $rfdotk = $rfdot + $xn*$temp1*($sat->sgps->x1mth2*$cos2u + 1.5*$sat->sgps->x3thm1);
 
 
         /* Orientation vectors */
@@ -276,22 +276,22 @@ 
         $cosik = cos($xinck);
         $sinnok = sin($xnodek);
         $cosnok = cos($xnodek);
-        $xmx = -$sinnok * $cosik;
-        $xmy = $cosnok * $cosik;
-        $ux = $xmx * $sinuk + $cosnok * $cosuk;
-        $uy = $xmy * $sinuk + $sinnok * $cosuk;
-        $uz = $sinik * $sinuk;
-        $vx = $xmx * $cosuk - $cosnok * $sinuk;
-        $vy = $xmy * $cosuk - $sinnok * $sinuk;
-        $vz = $sinik * $cosuk;
+        $xmx = -$sinnok*$cosik;
+        $xmy = $cosnok*$cosik;
+        $ux = $xmx*$sinuk + $cosnok*$cosuk;
+        $uy = $xmy*$sinuk + $sinnok*$cosuk;
+        $uz = $sinik*$sinuk;
+        $vx = $xmx*$cosuk - $cosnok*$sinuk;
+        $vy = $xmy*$cosuk - $sinnok*$sinuk;
+        $vz = $sinik*$cosuk;
 
         /* Position and velocity */
-        $sat->pos->x = $rk * $ux;
-        $sat->pos->y = $rk * $uy;
-        $sat->pos->z = $rk * $uz;
-        $sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
-        $sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
-        $sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
+        $sat->pos->x = $rk*$ux;
+        $sat->pos->y = $rk*$uy;
+        $sat->pos->z = $rk*$uz;
+        $sat->vel->x = $rdotk*$ux + $rfdotk*$vx;
+        $sat->vel->y = $rdotk*$uy + $rfdotk*$vy;
+        $sat->vel->z = $rdotk*$uz + $rfdotk*$vz;
 
         $sat->phase = $xlt - $xnode - $omgadf + Predict::twopi;
         if ($sat->phase < 0) {
@@ -315,106 +315,106 @@ 
     public function SDP4(Predict_Sat $sat, $tsince)
     {
         /* Initialization */
-        if (~$sat->flags & self::SDP4_INITIALIZED_FLAG) {
+        if (~$sat->flags&self::SDP4_INITIALIZED_FLAG) {
 
             $sat->flags |= self::SDP4_INITIALIZED_FLAG;
 
             /* Recover original mean motion (xnodp) and   */
             /* semimajor axis (aodp) from input elements. */
-            $a1 = pow(Predict::xke / $sat->tle->xno, Predict::tothrd);
+            $a1 = pow(Predict::xke/$sat->tle->xno, Predict::tothrd);
             $sat->deep_arg->cosio = cos($sat->tle->xincl);
-            $sat->deep_arg->theta2 = $sat->deep_arg->cosio * $sat->deep_arg->cosio;
-            $sat->sgps->x3thm1 = 3.0 * $sat->deep_arg->theta2 - 1.0;
-            $sat->deep_arg->eosq = $sat->tle->eo * $sat->tle->eo;
+            $sat->deep_arg->theta2 = $sat->deep_arg->cosio*$sat->deep_arg->cosio;
+            $sat->sgps->x3thm1 = 3.0*$sat->deep_arg->theta2 - 1.0;
+            $sat->deep_arg->eosq = $sat->tle->eo*$sat->tle->eo;
             $sat->deep_arg->betao2 = 1.0 - $sat->deep_arg->eosq;
             $sat->deep_arg->betao = sqrt($sat->deep_arg->betao2);
-            $del1 = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
-                ($a1 * $a1 * $sat->deep_arg->betao * $sat->deep_arg->betao2);
-            $ao = $a1 * (1.0 - $del1 * (0.5 * Predict::tothrd + $del1 * (1.0 + 134.0 / 81.0 * $del1)));
-            $delo = 1.5 * Predict::ck2 * $sat->sgps->x3thm1 /
-                ($ao * $ao * $sat->deep_arg->betao * $sat->deep_arg->betao2);
-            $sat->deep_arg->xnodp = $sat->tle->xno / (1.0 + $delo);
-            $sat->deep_arg->aodp = $ao / (1.0 - $delo);
+            $del1 = 1.5*Predict::ck2*$sat->sgps->x3thm1/
+                ($a1*$a1*$sat->deep_arg->betao*$sat->deep_arg->betao2);
+            $ao = $a1*(1.0 - $del1*(0.5*Predict::tothrd + $del1*(1.0 + 134.0/81.0*$del1)));
+            $delo = 1.5*Predict::ck2*$sat->sgps->x3thm1/
+                ($ao*$ao*$sat->deep_arg->betao*$sat->deep_arg->betao2);
+            $sat->deep_arg->xnodp = $sat->tle->xno/(1.0 + $delo);
+            $sat->deep_arg->aodp = $ao/(1.0 - $delo);
 
             /* For perigee below 156 km, the values */
             /* of s and qoms2t are altered.         */
             $s4 = Predict::__s__;
             $qoms24 = Predict::qoms2t;
-            $perige = ($sat->deep_arg->aodp * (1.0 - $sat->tle->eo) - Predict::ae) * Predict::xkmper;
+            $perige = ($sat->deep_arg->aodp*(1.0 - $sat->tle->eo) - Predict::ae)*Predict::xkmper;
             if ($perige < 156.0) {
                 if ($perige <= 98.0) {
                     $s4 = 20.0;
                 } else {
                     $s4 = $perige - 78.0;
                 }
-                $qoms24 = pow((120.0 - $s4) * Predict::ae / Predict::xkmper, 4);
-                $s4 = $s4 / Predict::xkmper + Predict::ae;
+                $qoms24 = pow((120.0 - $s4)*Predict::ae/Predict::xkmper, 4);
+                $s4 = $s4/Predict::xkmper + Predict::ae;
             }
-            $pinvsq = 1.0 / ($sat->deep_arg->aodp * $sat->deep_arg->aodp *
-                    $sat->deep_arg->betao2 * $sat->deep_arg->betao2);
+            $pinvsq = 1.0/($sat->deep_arg->aodp*$sat->deep_arg->aodp*
+                    $sat->deep_arg->betao2*$sat->deep_arg->betao2);
             $sat->deep_arg->sing = sin($sat->tle->omegao);
             $sat->deep_arg->cosg = cos($sat->tle->omegao);
-            $tsi = 1.0 / ($sat->deep_arg->aodp - $s4);
-            $eta = $sat->deep_arg->aodp * $sat->tle->eo * $tsi;
-            $etasq = $eta * $eta;
-            $eeta = $sat->tle->eo * $eta;
+            $tsi = 1.0/($sat->deep_arg->aodp - $s4);
+            $eta = $sat->deep_arg->aodp*$sat->tle->eo*$tsi;
+            $etasq = $eta*$eta;
+            $eeta = $sat->tle->eo*$eta;
             $psisq = abs(1.0 - $etasq);
-            $coef = $qoms24 * pow($tsi, 4);
-            $coef1 = $coef / pow($psisq, 3.5);
-            $c2 = $coef1 * $sat->deep_arg->xnodp * ($sat->deep_arg->aodp *
-                                (1.0 + 1.5 * $etasq + $eeta *
-                                 (4.0 + $etasq)) + 0.75 * Predict::ck2 * $tsi / $psisq *
-                                $sat->sgps->x3thm1 * (8.0 + 3.0 * $etasq *
+            $coef = $qoms24*pow($tsi, 4);
+            $coef1 = $coef/pow($psisq, 3.5);
+            $c2 = $coef1*$sat->deep_arg->xnodp*($sat->deep_arg->aodp*
+                                (1.0 + 1.5*$etasq + $eeta*
+                                 (4.0 + $etasq)) + 0.75*Predict::ck2*$tsi/$psisq*
+                                $sat->sgps->x3thm1*(8.0 + 3.0*$etasq*
                                         (8.0 + $etasq)));
-            $sat->sgps->c1 = $sat->tle->bstar * $c2;
+            $sat->sgps->c1 = $sat->tle->bstar*$c2;
             $sat->deep_arg->sinio = sin($sat->tle->xincl);
-            $a3ovk2 = -Predict::xj3 / Predict::ck2 * pow(Predict::ae, 3);
+            $a3ovk2 = -Predict::xj3/Predict::ck2*pow(Predict::ae, 3);
             $sat->sgps->x1mth2 = 1.0 - $sat->deep_arg->theta2;
-            $sat->sgps->c4 = 2.0 * $sat->deep_arg->xnodp * $coef1 *
-                $sat->deep_arg->aodp * $sat->deep_arg->betao2 *
-                ($eta * (2.0 + 0.5 * $etasq) + $sat->tle->eo *
-                 (0.5 + 2.0 * $etasq) - 2.0 * Predict::ck2 * $tsi /
-                 ($sat->deep_arg->aodp * $psisq) * (-3.0 * $sat->sgps->x3thm1 *
-                                 (1.0 - 2.0 * $eeta + $etasq *
-                                  (1.5 - 0.5 * $eeta)) +
-                                 0.75 * $sat->sgps->x1mth2 *
-                                 (2.0 * $etasq - $eeta * (1.0 + $etasq)) *
-                                 cos(2.0 * $sat->tle->omegao)));
-            $theta4 = $sat->deep_arg->theta2 * $sat->deep_arg->theta2;
-            $temp1 = 3.0 * Predict::ck2 * $pinvsq * $sat->deep_arg->xnodp;
-            $temp2 = $temp1 * Predict::ck2 * $pinvsq;
-            $temp3 = 1.25 * Predict::ck4 * $pinvsq * $pinvsq * $sat->deep_arg->xnodp;
-            $sat->deep_arg->xmdot = $sat->deep_arg->xnodp + 0.5 * $temp1 * $sat->deep_arg->betao *
-                $sat->sgps->x3thm1 + 0.0625 * $temp2 * $sat->deep_arg->betao *
-                (13.0 - 78.0 * $sat->deep_arg->theta2 + 137.0 * $theta4);
-            $x1m5th = 1.0 - 5.0 * $sat->deep_arg->theta2;
-            $sat->deep_arg->omgdot = -0.5 * $temp1 * $x1m5th + 0.0625 * $temp2 *
-                            (7.0 - 114.0 * $sat->deep_arg->theta2 + 395.0 * $theta4) +
-                        $temp3 * (3.0 - 36.0 * $sat->deep_arg->theta2 + 49.0 * $theta4);
-            $xhdot1 = -$temp1 * $sat->deep_arg->cosio;
-            $sat->deep_arg->xnodot = $xhdot1 + (0.5 * $temp2 * (4.0 - 19.0 * $sat->deep_arg->theta2) +
-                             2.0 * $temp3 * (3.0 - 7.0 * $sat->deep_arg->theta2)) *
+            $sat->sgps->c4 = 2.0*$sat->deep_arg->xnodp*$coef1*
+                $sat->deep_arg->aodp*$sat->deep_arg->betao2*
+                ($eta*(2.0 + 0.5*$etasq) + $sat->tle->eo*
+                 (0.5 + 2.0*$etasq) - 2.0*Predict::ck2*$tsi/
+                 ($sat->deep_arg->aodp*$psisq)*(-3.0*$sat->sgps->x3thm1*
+                                 (1.0 - 2.0*$eeta + $etasq*
+                                  (1.5 - 0.5*$eeta)) +
+                                 0.75*$sat->sgps->x1mth2*
+                                 (2.0*$etasq - $eeta*(1.0 + $etasq))*
+                                 cos(2.0*$sat->tle->omegao)));
+            $theta4 = $sat->deep_arg->theta2*$sat->deep_arg->theta2;
+            $temp1 = 3.0*Predict::ck2*$pinvsq*$sat->deep_arg->xnodp;
+            $temp2 = $temp1*Predict::ck2*$pinvsq;
+            $temp3 = 1.25*Predict::ck4*$pinvsq*$pinvsq*$sat->deep_arg->xnodp;
+            $sat->deep_arg->xmdot = $sat->deep_arg->xnodp + 0.5*$temp1*$sat->deep_arg->betao*
+                $sat->sgps->x3thm1 + 0.0625*$temp2*$sat->deep_arg->betao*
+                (13.0 - 78.0*$sat->deep_arg->theta2 + 137.0*$theta4);
+            $x1m5th = 1.0 - 5.0*$sat->deep_arg->theta2;
+            $sat->deep_arg->omgdot = -0.5*$temp1*$x1m5th + 0.0625*$temp2*
+                            (7.0 - 114.0*$sat->deep_arg->theta2 + 395.0*$theta4) +
+                        $temp3*(3.0 - 36.0*$sat->deep_arg->theta2 + 49.0*$theta4);
+            $xhdot1 = -$temp1*$sat->deep_arg->cosio;
+            $sat->deep_arg->xnodot = $xhdot1 + (0.5*$temp2*(4.0 - 19.0*$sat->deep_arg->theta2) +
+                             2.0*$temp3*(3.0 - 7.0*$sat->deep_arg->theta2))*
                 $sat->deep_arg->cosio;
-            $sat->sgps->xnodcf = 3.5 * $sat->deep_arg->betao2 * $xhdot1 * $sat->sgps->c1;
-            $sat->sgps->t2cof = 1.5 * $sat->sgps->c1;
-            $sat->sgps->xlcof = 0.125 * $a3ovk2 * $sat->deep_arg->sinio *
-                (3.0 + 5.0 * $sat->deep_arg->cosio) / (1.0 + $sat->deep_arg->cosio);
-            $sat->sgps->aycof = 0.25 * $a3ovk2 * $sat->deep_arg->sinio;
-            $sat->sgps->x7thm1 = 7.0 * $sat->deep_arg->theta2 - 1.0;
+            $sat->sgps->xnodcf = 3.5*$sat->deep_arg->betao2*$xhdot1*$sat->sgps->c1;
+            $sat->sgps->t2cof = 1.5*$sat->sgps->c1;
+            $sat->sgps->xlcof = 0.125*$a3ovk2*$sat->deep_arg->sinio*
+                (3.0 + 5.0*$sat->deep_arg->cosio)/(1.0 + $sat->deep_arg->cosio);
+            $sat->sgps->aycof = 0.25*$a3ovk2*$sat->deep_arg->sinio;
+            $sat->sgps->x7thm1 = 7.0*$sat->deep_arg->theta2 - 1.0;
 
             /* initialize Deep() */
             $this->Deep(self::dpinit, $sat);
         }; /*End of SDP4() initialization */
 
         /* Update for secular gravity and atmospheric drag */
-        $xmdf = $sat->tle->xmo + $sat->deep_arg->xmdot * $tsince;
-        $sat->deep_arg->omgadf = $sat->tle->omegao + $sat->deep_arg->omgdot * $tsince;
-        $xnoddf = $sat->tle->xnodeo + $sat->deep_arg->xnodot * $tsince;
-        $tsq = $tsince * $tsince;
-        $sat->deep_arg->xnode = $xnoddf + $sat->sgps->xnodcf * $tsq;
-        $tempa = 1.0 - $sat->sgps->c1 * $tsince;
-        $tempe = $sat->tle->bstar * $sat->sgps->c4 * $tsince;
-        $templ = $sat->sgps->t2cof * $tsq;
+        $xmdf = $sat->tle->xmo + $sat->deep_arg->xmdot*$tsince;
+        $sat->deep_arg->omgadf = $sat->tle->omegao + $sat->deep_arg->omgdot*$tsince;
+        $xnoddf = $sat->tle->xnodeo + $sat->deep_arg->xnodot*$tsince;
+        $tsq = $tsince*$tsince;
+        $sat->deep_arg->xnode = $xnoddf + $sat->sgps->xnodcf*$tsq;
+        $tempa = 1.0 - $sat->sgps->c1*$tsince;
+        $tempe = $sat->tle->bstar*$sat->sgps->c4*$tsince;
+        $templ = $sat->sgps->t2cof*$tsq;
         $sat->deep_arg->xn = $sat->deep_arg->xnodp;
 
         /* Update for deep-space secular effects */
@@ -424,9 +424,9 @@ 
         $this->Deep(self::dpsec, $sat);
 
         $xmdf = $sat->deep_arg->xll;
-        $a = pow(Predict::xke / $sat->deep_arg->xn, Predict::tothrd) * $tempa * $tempa;
+        $a = pow(Predict::xke/$sat->deep_arg->xn, Predict::tothrd)*$tempa*$tempa;
         $sat->deep_arg->em = $sat->deep_arg->em - $tempe;
-        $xmam = $xmdf + $sat->deep_arg->xnodp * $templ;
+        $xmam = $xmdf + $sat->deep_arg->xnodp*$templ;
 
         /* Update for deep-space periodic effects */
         $sat->deep_arg->xll = $xmam;
@@ -435,30 +435,30 @@ 
 
         $xmam = $sat->deep_arg->xll;
         $xl = $xmam + $sat->deep_arg->omgadf + $sat->deep_arg->xnode;
-        $beta = sqrt(1.0 - $sat->deep_arg->em * $sat->deep_arg->em);
-        $sat->deep_arg->xn = Predict::xke / pow($a, 1.5);
+        $beta = sqrt(1.0 - $sat->deep_arg->em*$sat->deep_arg->em);
+        $sat->deep_arg->xn = Predict::xke/pow($a, 1.5);
 
         /* Long period periodics */
-        $axn = $sat->deep_arg->em * cos($sat->deep_arg->omgadf);
-        $temp = 1.0 / ($a * $beta * $beta);
-        $xll = $temp * $sat->sgps->xlcof * $axn;
-        $aynl = $temp * $sat->sgps->aycof;
+        $axn = $sat->deep_arg->em*cos($sat->deep_arg->omgadf);
+        $temp = 1.0/($a*$beta*$beta);
+        $xll = $temp*$sat->sgps->xlcof*$axn;
+        $aynl = $temp*$sat->sgps->aycof;
         $xlt = $xl + $xll;
-        $ayn = $sat->deep_arg->em * sin($sat->deep_arg->omgadf) + $aynl;
+        $ayn = $sat->deep_arg->em*sin($sat->deep_arg->omgadf) + $aynl;
 
         /* Solve Kepler's Equation */
-        $capu = Predict_Math::FMod2p ($xlt - $sat->deep_arg->xnode);
+        $capu = Predict_Math::FMod2p($xlt - $sat->deep_arg->xnode);
         $temp2 = $capu;
 
         $i = 0;
         do {
             $sinepw = sin($temp2);
             $cosepw = cos($temp2);
-            $temp3 = $axn * $sinepw;
-            $temp4 = $ayn * $cosepw;
-            $temp5 = $axn * $cosepw;
-            $temp6 = $ayn * $sinepw;
-            $epw = ($capu - $temp4 + $temp3 - $temp2) / (1.0 - $temp5 - $temp6) + $temp2;
+            $temp3 = $axn*$sinepw;
+            $temp4 = $ayn*$cosepw;
+            $temp5 = $axn*$cosepw;
+            $temp6 = $ayn*$sinepw;
+            $epw = ($capu - $temp4 + $temp3 - $temp2)/(1.0 - $temp5 - $temp6) + $temp2;
             if (abs($epw - $temp2) <= Predict::e6a) {
                 break;
             }
@@ -468,35 +468,35 @@ 
         /* Short period preliminary quantities */
         $ecose = $temp5 + $temp6;
         $esine = $temp3 - $temp4;
-        $elsq = $axn * $axn + $ayn * $ayn;
+        $elsq = $axn*$axn + $ayn*$ayn;
         $temp = 1.0 - $elsq;
-        $pl = $a * $temp;
-        $r = $a * (1.0 - $ecose);
-        $temp1 = 1.0 / $r;
-        $rdot = Predict::xke * sqrt($a) * $esine * $temp1;
-        $rfdot = Predict::xke * sqrt($pl) * $temp1;
-        $temp2 = $a * $temp1;
+        $pl = $a*$temp;
+        $r = $a*(1.0 - $ecose);
+        $temp1 = 1.0/$r;
+        $rdot = Predict::xke*sqrt($a)*$esine*$temp1;
+        $rfdot = Predict::xke*sqrt($pl)*$temp1;
+        $temp2 = $a*$temp1;
         $betal = sqrt($temp);
-        $temp3 = 1.0 / (1.0 + $betal);
-        $cosu = $temp2 * ($cosepw - $axn + $ayn * $esine * $temp3);
-        $sinu = $temp2 * ($sinepw - $ayn - $axn * $esine * $temp3);
+        $temp3 = 1.0/(1.0 + $betal);
+        $cosu = $temp2*($cosepw - $axn + $ayn*$esine*$temp3);
+        $sinu = $temp2*($sinepw - $ayn - $axn*$esine*$temp3);
         $u = Predict_Math::AcTan($sinu, $cosu);
-        $sin2u = 2.0 * $sinu * $cosu;
-        $cos2u = 2.0 * $cosu * $cosu - 1.0;
-        $temp = 1.0 / $pl;
-        $temp1 = Predict::ck2 * $temp;
-        $temp2 = $temp1 * $temp;
+        $sin2u = 2.0*$sinu*$cosu;
+        $cos2u = 2.0*$cosu*$cosu - 1.0;
+        $temp = 1.0/$pl;
+        $temp1 = Predict::ck2*$temp;
+        $temp2 = $temp1*$temp;
 
         /* Update for short periodics */
-        $rk = $r * (1.0 - 1.5 * $temp2 * $betal * $sat->sgps->x3thm1) +
-             0.5 * $temp1 * $sat->sgps->x1mth2 * $cos2u;
-        $uk = $u - 0.25 * $temp2 * $sat->sgps->x7thm1 * $sin2u;
-        $xnodek = $sat->deep_arg->xnode + 1.5 * $temp2 * $sat->deep_arg->cosio * $sin2u;
-        $xinck = $sat->deep_arg->xinc + 1.5 * $temp2 *
-             $sat->deep_arg->cosio * $sat->deep_arg->sinio * $cos2u;
-        $rdotk = $rdot - $sat->deep_arg->xn * $temp1 * $sat->sgps->x1mth2 * $sin2u;
-        $rfdotk = $rfdot + $sat->deep_arg->xn * $temp1 *
-             ($sat->sgps->x1mth2 * $cos2u + 1.5 * $sat->sgps->x3thm1);
+        $rk = $r*(1.0 - 1.5*$temp2*$betal*$sat->sgps->x3thm1) +
+             0.5*$temp1*$sat->sgps->x1mth2*$cos2u;
+        $uk = $u - 0.25*$temp2*$sat->sgps->x7thm1*$sin2u;
+        $xnodek = $sat->deep_arg->xnode + 1.5*$temp2*$sat->deep_arg->cosio*$sin2u;
+        $xinck = $sat->deep_arg->xinc + 1.5*$temp2*
+             $sat->deep_arg->cosio*$sat->deep_arg->sinio*$cos2u;
+        $rdotk = $rdot - $sat->deep_arg->xn*$temp1*$sat->sgps->x1mth2*$sin2u;
+        $rfdotk = $rfdot + $sat->deep_arg->xn*$temp1*
+             ($sat->sgps->x1mth2*$cos2u + 1.5*$sat->sgps->x3thm1);
 
         /* Orientation vectors */
         $sinuk = sin($uk);
@@ -505,29 +505,29 @@ 
         $cosik = cos($xinck);
         $sinnok = sin($xnodek);
         $cosnok = cos($xnodek);
-        $xmx = -$sinnok * $cosik;
-        $xmy = $cosnok * $cosik;
-        $ux = $xmx * $sinuk + $cosnok * $cosuk;
-        $uy = $xmy * $sinuk + $sinnok * $cosuk;
-        $uz = $sinik * $sinuk;
-        $vx = $xmx * $cosuk - $cosnok * $sinuk;
-        $vy = $xmy * $cosuk - $sinnok * $sinuk;
-        $vz = $sinik * $cosuk;
+        $xmx = -$sinnok*$cosik;
+        $xmy = $cosnok*$cosik;
+        $ux = $xmx*$sinuk + $cosnok*$cosuk;
+        $uy = $xmy*$sinuk + $sinnok*$cosuk;
+        $uz = $sinik*$sinuk;
+        $vx = $xmx*$cosuk - $cosnok*$sinuk;
+        $vy = $xmy*$cosuk - $sinnok*$sinuk;
+        $vz = $sinik*$cosuk;
 
         /* Position and velocity */
-        $sat->pos->x = $rk * $ux;
-        $sat->pos->y = $rk * $uy;
-        $sat->pos->z = $rk * $uz;
-        $sat->vel->x = $rdotk * $ux + $rfdotk * $vx;
-        $sat->vel->y = $rdotk * $uy + $rfdotk * $vy;
-        $sat->vel->z = $rdotk * $uz + $rfdotk * $vz;
+        $sat->pos->x = $rk*$ux;
+        $sat->pos->y = $rk*$uy;
+        $sat->pos->z = $rk*$uz;
+        $sat->vel->x = $rdotk*$ux + $rfdotk*$vx;
+        $sat->vel->y = $rdotk*$uy + $rfdotk*$vy;
+        $sat->vel->z = $rdotk*$uz + $rfdotk*$vz;
 
         /* Phase in rads */
         $sat->phase = $xlt - $sat->deep_arg->xnode - $sat->deep_arg->omgadf + Predict::twopi;
         if ($sat->phase < 0.0) {
             $sat->phase += Predict::twopi;
         }
-        $sat->phase = Predict_Math::FMod2p ($sat->phase);
+        $sat->phase = Predict_Math::FMod2p($sat->phase);
 
         $sat->tle->omegao1 = $sat->deep_arg->omgadf;
         $sat->tle->xincl1  = $sat->deep_arg->xinc;
@@ -545,7 +545,7 @@ 
             $sat->dps->thgr = Predict_Time::ThetaG($sat->tle->epoch, $sat->deep_arg);
             $eq = $sat->tle->eo;
             $sat->dps->xnq = $sat->deep_arg->xnodp;
-            $aqnv = 1.0 / $sat->deep_arg->aodp;
+            $aqnv = 1.0/$sat->deep_arg->aodp;
             $sat->dps->xqncl = $sat->tle->xincl;
             $xmao = $sat->tle->xmo;
             $xpidot = $sat->deep_arg->omgdot + $sat->deep_arg->xnodot;
@@ -555,26 +555,26 @@ 
             $sat->dps->preep = 0;
 
             /* Initialize lunar solar terms */
-            $day = $sat->deep_arg->ds50 + 18261.5;  /* Days since 1900 Jan 0.5 */
+            $day = $sat->deep_arg->ds50 + 18261.5; /* Days since 1900 Jan 0.5 */
             if ($day != $sat->dps->preep) {
                 $sat->dps->preep = $day;
-                $xnodce = 4.5236020 - 9.2422029E-4 * $day;
+                $xnodce = 4.5236020 - 9.2422029E-4*$day;
                 $stem = sin($xnodce);
                 $ctem = cos($xnodce);
-                $sat->dps->zcosil = 0.91375164 - 0.03568096 * $ctem;
-                $sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil * $sat->dps->zcosil);
-                $sat->dps->zsinhl = 0.089683511 * $stem / $sat->dps->zsinil;
-                $sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl * $sat->dps->zsinhl);
-                $c = 4.7199672 + 0.22997150 * $day;
-                $gam = 5.8351514 + 0.0019443680 * $day;
+                $sat->dps->zcosil = 0.91375164 - 0.03568096*$ctem;
+                $sat->dps->zsinil = sqrt(1.0 - $sat->dps->zcosil*$sat->dps->zcosil);
+                $sat->dps->zsinhl = 0.089683511*$stem/$sat->dps->zsinil;
+                $sat->dps->zcoshl = sqrt(1.0 - $sat->dps->zsinhl*$sat->dps->zsinhl);
+                $c = 4.7199672 + 0.22997150*$day;
+                $gam = 5.8351514 + 0.0019443680*$day;
                 $sat->dps->zmol = Predict_Math::FMod2p($c - $gam);
-                $zx = 0.39785416 * $stem / $sat->dps->zsinil;
-                $zy = $sat->dps->zcoshl * $ctem + 0.91744867 * $sat->dps->zsinhl * $stem;
+                $zx = 0.39785416*$stem/$sat->dps->zsinil;
+                $zy = $sat->dps->zcoshl*$ctem + 0.91744867*$sat->dps->zsinhl*$stem;
                 $zx = Predict_Math::AcTan($zx, $zy);
                 $zx = $gam + $zx - $xnodce;
                 $sat->dps->zcosgl = cos($zx);
                 $sat->dps->zsingl = sin($zx);
-                $sat->dps->zmos = 6.2565837 + 0.017201977 * $day;
+                $sat->dps->zmos = 6.2565837 + 0.017201977*$day;
                 $sat->dps->zmos = Predict_Math::FMod2p($sat->dps->zmos);
             } /* End if(day != preep) */
 
@@ -590,76 +590,76 @@ 
             $zn = Predict::zns;
             $ze = Predict::zes;
             $zmo = $sat->dps->zmos;
-            $xnoi = 1.0 / $sat->dps->xnq;
+            $xnoi = 1.0/$sat->dps->xnq;
 
             /* Loop breaks when Solar terms are done a second */
             /* time, after Lunar terms are initialized        */
-            for(;;) {
+            for (;;) {
                 /* Solar terms done again after Lunar terms are done */
-                $a1 = $zcosg * $zcosh + $zsing * $zcosi * $zsinh;
-                $a3 = -$zsing * $zcosh + $zcosg * $zcosi * $zsinh;
-                $a7 = -$zcosg * $zsinh + $zsing * $zcosi * $zcosh;
-                $a8 = $zsing * $zsini;
-                $a9 = $zsing * $zsinh + $zcosg * $zcosi * $zcosh;
-                $a10 = $zcosg * $zsini;
-                $a2 = $sat->deep_arg->cosio * $a7 + $sat->deep_arg->sinio * $a8;
-                $a4 = $sat->deep_arg->cosio * $a9 + $sat->deep_arg->sinio * $a10;
-                $a5 = -$sat->deep_arg->sinio * $a7 + $sat->deep_arg->cosio * $a8;
-                $a6 = -$sat->deep_arg->sinio * $a9 + $sat->deep_arg->cosio * $a10;
-                $x1 = $a1 * $sat->deep_arg->cosg + $a2 * $sat->deep_arg->sing;
-                $x2 = $a3 * $sat->deep_arg->cosg + $a4 * $sat->deep_arg->sing;
-                $x3 = -$a1 * $sat->deep_arg->sing + $a2 * $sat->deep_arg->cosg;
-                $x4 = -$a3 * $sat->deep_arg->sing + $a4 * $sat->deep_arg->cosg;
-                $x5 = $a5 * $sat->deep_arg->sing;
-                $x6 = $a6 * $sat->deep_arg->sing;
-                $x7 = $a5 * $sat->deep_arg->cosg;
-                $x8 = $a6 * $sat->deep_arg->cosg;
-                $z31 = 12 * $x1 * $x1 - 3 * $x3 * $x3;
-                $z32 = 24 * $x1 * $x2 - 6 * $x3 * $x4;
-                $z33 = 12 * $x2 * $x2 - 3 * $x4 * $x4;
-                $z1 = 3 * ($a1 * $a1 + $a2 * $a2) + $z31 * $sat->deep_arg->eosq;
-                $z2 = 6 * ($a1 * $a3 + $a2 * $a4) + $z32 * $sat->deep_arg->eosq;
-                $z3 = 3 * ($a3 * $a3 + $a4 * $a4) + $z33 * $sat->deep_arg->eosq;
-                $z11 = -6 * $a1 * $a5 + $sat->deep_arg->eosq * (-24 * $x1 * $x7 - 6 * $x3 * $x5);
-                $z12 = -6 * ($a1 * $a6 + $a3 * $a5) + $sat->deep_arg->eosq *
-                    (-24 * ($x2 * $x7 + $x1 * $x8) - 6 * ($x3 * $x6 + $x4 * $x5));
-                $z13 = -6 * $a3 * $a6 + $sat->deep_arg->eosq * (-24 * $x2 * $x8 - 6 * $x4 * $x6);
-                $z21 = 6 * $a2 * $a5 + $sat->deep_arg->eosq * (24 * $x1 * $x5 - 6 * $x3 * $x7);
-                $z22 = 6 * ($a4 * $a5 + $a2 * $a6) + $sat->deep_arg->eosq *
-                    (24 * ($x2 * $x5 + $x1 * $x6) - 6 * ($x4 * $x7 + $x3 * $x8));
-                $z23 = 6 * $a4 * $a6 + $sat->deep_arg->eosq * (24 * $x2 * $x6 - 6 * $x4 * $x8);
-                $z1 = $z1 + $z1 + $sat->deep_arg->betao2 * $z31;
-                $z2 = $z2 + $z2 + $sat->deep_arg->betao2 * $z32;
-                $z3 = $z3 + $z3 + $sat->deep_arg->betao2 * $z33;
-                $s3 = $cc * $xnoi;
-                $s2 = -0.5 * $s3 / $sat->deep_arg->betao;
-                $s4 = $s3 * $sat->deep_arg->betao;
-                $s1 = -15 * $eq * $s4;
-                $s5 = $x1 * $x3 + $x2 * $x4;
-                $s6 = $x2 * $x3 + $x1 * $x4;
-                $s7 = $x2 * $x4 - $x1 * $x3;
-                $se = $s1 * $zn * $s5;
-                $si = $s2 * $zn * ($z11 + $z13);
-                $sl = -$zn * $s3 * ($z1 + $z3 - 14 - 6 * $sat->deep_arg->eosq);
-                $sgh = $s4 * $zn * ($z31 + $z33 - 6);
-                $sh = -$zn * $s2 * ($z21 + $z23);
+                $a1 = $zcosg*$zcosh + $zsing*$zcosi*$zsinh;
+                $a3 = -$zsing*$zcosh + $zcosg*$zcosi*$zsinh;
+                $a7 = -$zcosg*$zsinh + $zsing*$zcosi*$zcosh;
+                $a8 = $zsing*$zsini;
+                $a9 = $zsing*$zsinh + $zcosg*$zcosi*$zcosh;
+                $a10 = $zcosg*$zsini;
+                $a2 = $sat->deep_arg->cosio*$a7 + $sat->deep_arg->sinio*$a8;
+                $a4 = $sat->deep_arg->cosio*$a9 + $sat->deep_arg->sinio*$a10;
+                $a5 = -$sat->deep_arg->sinio*$a7 + $sat->deep_arg->cosio*$a8;
+                $a6 = -$sat->deep_arg->sinio*$a9 + $sat->deep_arg->cosio*$a10;
+                $x1 = $a1*$sat->deep_arg->cosg + $a2*$sat->deep_arg->sing;
+                $x2 = $a3*$sat->deep_arg->cosg + $a4*$sat->deep_arg->sing;
+                $x3 = -$a1*$sat->deep_arg->sing + $a2*$sat->deep_arg->cosg;
+                $x4 = -$a3*$sat->deep_arg->sing + $a4*$sat->deep_arg->cosg;
+                $x5 = $a5*$sat->deep_arg->sing;
+                $x6 = $a6*$sat->deep_arg->sing;
+                $x7 = $a5*$sat->deep_arg->cosg;
+                $x8 = $a6*$sat->deep_arg->cosg;
+                $z31 = 12*$x1*$x1 - 3*$x3*$x3;
+                $z32 = 24*$x1*$x2 - 6*$x3*$x4;
+                $z33 = 12*$x2*$x2 - 3*$x4*$x4;
+                $z1 = 3*($a1*$a1 + $a2*$a2) + $z31*$sat->deep_arg->eosq;
+                $z2 = 6*($a1*$a3 + $a2*$a4) + $z32*$sat->deep_arg->eosq;
+                $z3 = 3*($a3*$a3 + $a4*$a4) + $z33*$sat->deep_arg->eosq;
+                $z11 = -6*$a1*$a5 + $sat->deep_arg->eosq*(-24*$x1*$x7 - 6*$x3*$x5);
+                $z12 = -6*($a1*$a6 + $a3*$a5) + $sat->deep_arg->eosq*
+                    (-24*($x2*$x7 + $x1*$x8) - 6*($x3*$x6 + $x4*$x5));
+                $z13 = -6*$a3*$a6 + $sat->deep_arg->eosq*(-24*$x2*$x8 - 6*$x4*$x6);
+                $z21 = 6*$a2*$a5 + $sat->deep_arg->eosq*(24*$x1*$x5 - 6*$x3*$x7);
+                $z22 = 6*($a4*$a5 + $a2*$a6) + $sat->deep_arg->eosq*
+                    (24*($x2*$x5 + $x1*$x6) - 6*($x4*$x7 + $x3*$x8));
+                $z23 = 6*$a4*$a6 + $sat->deep_arg->eosq*(24*$x2*$x6 - 6*$x4*$x8);
+                $z1 = $z1 + $z1 + $sat->deep_arg->betao2*$z31;
+                $z2 = $z2 + $z2 + $sat->deep_arg->betao2*$z32;
+                $z3 = $z3 + $z3 + $sat->deep_arg->betao2*$z33;
+                $s3 = $cc*$xnoi;
+                $s2 = -0.5*$s3/$sat->deep_arg->betao;
+                $s4 = $s3*$sat->deep_arg->betao;
+                $s1 = -15*$eq*$s4;
+                $s5 = $x1*$x3 + $x2*$x4;
+                $s6 = $x2*$x3 + $x1*$x4;
+                $s7 = $x2*$x4 - $x1*$x3;
+                $se = $s1*$zn*$s5;
+                $si = $s2*$zn*($z11 + $z13);
+                $sl = -$zn*$s3*($z1 + $z3 - 14 - 6*$sat->deep_arg->eosq);
+                $sgh = $s4*$zn*($z31 + $z33 - 6);
+                $sh = -$zn*$s2*($z21 + $z23);
                 if ($sat->dps->xqncl < 5.2359877E-2) {
                     $sh = 0;
                 }
-                $sat->dps->ee2 = 2 * $s1 * $s6;
-                $sat->dps->e3 = 2 * $s1 * $s7;
-                $sat->dps->xi2 = 2 * $s2 * $z12;
-                $sat->dps->xi3 = 2 * $s2 * ($z13 - $z11);
-                $sat->dps->xl2 = -2 * $s3 * $z2;
-                $sat->dps->xl3 = -2 * $s3 * ($z3 - $z1);
-                $sat->dps->xl4 = -2 * $s3 * (-21 - 9 * $sat->deep_arg->eosq) * $ze;
-                $sat->dps->xgh2 = 2 * $s4 * $z32;
-                $sat->dps->xgh3 = 2 * $s4 * ($z33 - $z31);
-                $sat->dps->xgh4 = -18 * $s4 * $ze;
-                $sat->dps->xh2 = -2 * $s2 * $z22;
-                $sat->dps->xh3 = -2 * $s2 * ($z23 - $z21);
-
-                if ($sat->flags & self::LUNAR_TERMS_DONE_FLAG) {
+                $sat->dps->ee2 = 2*$s1*$s6;
+                $sat->dps->e3 = 2*$s1*$s7;
+                $sat->dps->xi2 = 2*$s2*$z12;
+                $sat->dps->xi3 = 2*$s2*($z13 - $z11);
+                $sat->dps->xl2 = -2*$s3*$z2;
+                $sat->dps->xl3 = -2*$s3*($z3 - $z1);
+                $sat->dps->xl4 = -2*$s3*(-21 - 9*$sat->deep_arg->eosq)*$ze;
+                $sat->dps->xgh2 = 2*$s4*$z32;
+                $sat->dps->xgh3 = 2*$s4*($z33 - $z31);
+                $sat->dps->xgh4 = -18*$s4*$ze;
+                $sat->dps->xh2 = -2*$s2*$z22;
+                $sat->dps->xh3 = -2*$s2*($z23 - $z21);
+
+                if ($sat->flags&self::LUNAR_TERMS_DONE_FLAG) {
                     break;
                 }
 
@@ -667,8 +667,8 @@ 
                 $sat->dps->sse = $se;
                 $sat->dps->ssi = $si;
                 $sat->dps->ssl = $sl;
-                $sat->dps->ssh = $sh / $sat->deep_arg->sinio;
-                $sat->dps->ssg = $sgh - $sat->deep_arg->cosio * $sat->dps->ssh;
+                $sat->dps->ssh = $sh/$sat->deep_arg->sinio;
+                $sat->dps->ssg = $sgh - $sat->deep_arg->cosio*$sat->dps->ssh;
                 $sat->dps->se2 = $sat->dps->ee2;
                 $sat->dps->si2 = $sat->dps->xi2;
                 $sat->dps->sl2 = $sat->dps->xl2;
@@ -685,8 +685,8 @@ 
                 $zsing = $sat->dps->zsingl;
                 $zcosi = $sat->dps->zcosil;
                 $zsini = $sat->dps->zsinil;
-                $zcosh = $sat->dps->zcoshl * $cosq + $sat->dps->zsinhl * $sinq;
-                $zsinh = $sinq * $sat->dps->zcoshl - $cosq * $sat->dps->zsinhl;
+                $zcosh = $sat->dps->zcoshl*$cosq + $sat->dps->zsinhl*$sinq;
+                $zsinh = $sinq*$sat->dps->zcoshl - $cosq*$sat->dps->zsinhl;
                 $zn = Predict::znl;
                 $cc = Predict::c1l;
                 $ze = Predict::zel;
@@ -697,113 +697,113 @@ 
             $sat->dps->sse = $sat->dps->sse + $se;
             $sat->dps->ssi = $sat->dps->ssi + $si;
             $sat->dps->ssl = $sat->dps->ssl + $sl;
-            $sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio / $sat->deep_arg->sinio * $sh;
-            $sat->dps->ssh = $sat->dps->ssh + $sh / $sat->deep_arg->sinio;
+            $sat->dps->ssg = $sat->dps->ssg + $sgh - $sat->deep_arg->cosio/$sat->deep_arg->sinio*$sh;
+            $sat->dps->ssh = $sat->dps->ssh + $sh/$sat->deep_arg->sinio;
 
             /* Geopotential resonance initialization for 12 hour orbits */
             $sat->flags &= ~self::RESONANCE_FLAG;
             $sat->flags &= ~self::SYNCHRONOUS_FLAG;
 
             if (!(($sat->dps->xnq < 0.0052359877) && ($sat->dps->xnq > 0.0034906585))) {
-                if( ($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924) ) {
+                if (($sat->dps->xnq < 0.00826) || ($sat->dps->xnq > 0.00924)) {
                     return;
                 }
                 if ($eq < 0.5) {
                     return;
                 }
                 $sat->flags |= self::RESONANCE_FLAG;
-                $eoc = $eq * $sat->deep_arg->eosq;
-                $g201 = -0.306 - ($eq - 0.64) * 0.440;
+                $eoc = $eq*$sat->deep_arg->eosq;
+                $g201 = -0.306 - ($eq - 0.64)*0.440;
                 if ($eq <= 0.65) {
-                    $g211 = 3.616 - 13.247 * $eq + 16.290 * $sat->deep_arg->eosq;
-                    $g310 = -19.302 + 117.390 * $eq - 228.419 *
-                        $sat->deep_arg->eosq + 156.591 * $eoc;
-                    $g322 = -18.9068 + 109.7927 * $eq - 214.6334 *
-                        $sat->deep_arg->eosq + 146.5816 * $eoc;
-                    $g410 = -41.122 + 242.694 * $eq - 471.094 *
-                        $sat->deep_arg->eosq + 313.953 * $eoc;
-                    $g422 = -146.407 + 841.880 * $eq - 1629.014 *
-                        $sat->deep_arg->eosq + 1083.435 * $eoc;
-                    $g520 = -532.114 + 3017.977 * $eq - 5740 *
-                        $sat->deep_arg->eosq + 3708.276 * $eoc;
+                    $g211 = 3.616 - 13.247*$eq + 16.290*$sat->deep_arg->eosq;
+                    $g310 = -19.302 + 117.390*$eq - 228.419*
+                        $sat->deep_arg->eosq + 156.591*$eoc;
+                    $g322 = -18.9068 + 109.7927*$eq - 214.6334*
+                        $sat->deep_arg->eosq + 146.5816*$eoc;
+                    $g410 = -41.122 + 242.694*$eq - 471.094*
+                        $sat->deep_arg->eosq + 313.953*$eoc;
+                    $g422 = -146.407 + 841.880*$eq - 1629.014*
+                        $sat->deep_arg->eosq + 1083.435*$eoc;
+                    $g520 = -532.114 + 3017.977*$eq - 5740*
+                        $sat->deep_arg->eosq + 3708.276*$eoc;
                 } else {
-                    $g211 = -72.099 + 331.819 * $eq - 508.738 *
-                        $sat->deep_arg->eosq + 266.724 * $eoc;
-                    $g310 = -346.844 + 1582.851 * $eq - 2415.925 *
-                        $sat->deep_arg->eosq + 1246.113 * $eoc;
-                    $g322 = -342.585 + 1554.908 * $eq - 2366.899 *
-                        $sat->deep_arg->eosq + 1215.972 * $eoc;
-                    $g410 = -1052.797 + 4758.686 * $eq - 7193.992 *
-                        $sat->deep_arg->eosq + 3651.957 * $eoc;
-                    $g422 = -3581.69 + 16178.11 * $eq - 24462.77 *
-                        $sat->deep_arg->eosq+ 12422.52 * $eoc;
+                    $g211 = -72.099 + 331.819*$eq - 508.738*
+                        $sat->deep_arg->eosq + 266.724*$eoc;
+                    $g310 = -346.844 + 1582.851*$eq - 2415.925*
+                        $sat->deep_arg->eosq + 1246.113*$eoc;
+                    $g322 = -342.585 + 1554.908*$eq - 2366.899*
+                        $sat->deep_arg->eosq + 1215.972*$eoc;
+                    $g410 = -1052.797 + 4758.686*$eq - 7193.992*
+                        $sat->deep_arg->eosq + 3651.957*$eoc;
+                    $g422 = -3581.69 + 16178.11*$eq - 24462.77*
+                        $sat->deep_arg->eosq + 12422.52*$eoc;
                     if ($eq <= 0.715) {
-                        $g520 = 1464.74 - 4664.75 * $eq + 3763.64 * $sat->deep_arg->eosq;
+                        $g520 = 1464.74 - 4664.75*$eq + 3763.64*$sat->deep_arg->eosq;
                     } else {
-                        $g520 = -5149.66 + 29936.92 * $eq - 54087.36 *
-                            $sat->deep_arg->eosq + 31324.56 * $eoc;
+                        $g520 = -5149.66 + 29936.92*$eq - 54087.36*
+                            $sat->deep_arg->eosq + 31324.56*$eoc;
                     }
                 } /* End if (eq <= 0.65) */
 
                 if ($eq < 0.7) {
-                    $g533 = -919.2277 + 4988.61 * $eq - 9064.77 *
-                        $sat->deep_arg->eosq + 5542.21 * $eoc;
-                    $g521 = -822.71072 + 4568.6173 * $eq - 8491.4146 *
-                        $sat->deep_arg->eosq + 5337.524 * $eoc;
-                    $g532 = -853.666 + 4690.25 * $eq - 8624.77 *
-                        $sat->deep_arg->eosq + 5341.4 * $eoc;
+                    $g533 = -919.2277 + 4988.61*$eq - 9064.77*
+                        $sat->deep_arg->eosq + 5542.21*$eoc;
+                    $g521 = -822.71072 + 4568.6173*$eq - 8491.4146*
+                        $sat->deep_arg->eosq + 5337.524*$eoc;
+                    $g532 = -853.666 + 4690.25*$eq - 8624.77*
+                        $sat->deep_arg->eosq + 5341.4*$eoc;
                 }
                 else {
-                    $g533 = -37995.78 + 161616.52 * $eq - 229838.2*
-                        $sat->deep_arg->eosq + 109377.94 * $eoc;
-                    $g521 = -51752.104 + 218913.95 * $eq - 309468.16*
-                        $sat->deep_arg->eosq + 146349.42 * $eoc;
-                    $g532 = -40023.88 + 170470.89 * $eq - 242699.48*
-                        $sat->deep_arg->eosq + 115605.82 * $eoc;
+                    $g533 = -37995.78 + 161616.52*$eq - 229838.2*
+                        $sat->deep_arg->eosq + 109377.94*$eoc;
+                    $g521 = -51752.104 + 218913.95*$eq - 309468.16*
+                        $sat->deep_arg->eosq + 146349.42*$eoc;
+                    $g532 = -40023.88 + 170470.89*$eq - 242699.48*
+                        $sat->deep_arg->eosq + 115605.82*$eoc;
                 } /* End if (eq <= 0.7) */
 
-                $sini2 = $sat->deep_arg->sinio * $sat->deep_arg->sinio;
-                $f220 = 0.75 * (1 + 2 * $sat->deep_arg->cosio + $sat->deep_arg->theta2);
-                $f221 = 1.5 * $sini2;
-                $f321 = 1.875 * $sat->deep_arg->sinio * (1 - 2 *
-                                  $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f322 = -1.875 * $sat->deep_arg->sinio * (1 + 2*
-                                   $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2);
-                $f441 = 35 * $sini2 * $f220;
-                $f442 = 39.3750 * $sini2 * $sini2;
-                $f522 = 9.84375 * $sat->deep_arg->sinio * ($sini2 * (1 - 2 * $sat->deep_arg->cosio - 5 *
-                                       $sat->deep_arg->theta2) + 0.33333333 * (-2 + 4 * $sat->deep_arg->cosio +
-                                                     6 * $sat->deep_arg->theta2));
-                $f523 = $sat->deep_arg->sinio * (4.92187512 * $sini2 * (-2 - 4 *
-                                      $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2) + 6.56250012
-                            * (1 + 2 * $sat->deep_arg->cosio - 3 * $sat->deep_arg->theta2));
-                $f542 = 29.53125 * $sat->deep_arg->sinio * (2 - 8 *
-                                 $sat->deep_arg->cosio + $sat->deep_arg->theta2 *
-                                 (-12 + 8 * $sat->deep_arg->cosio + 10 * $sat->deep_arg->theta2));
-                $f543 = 29.53125 * $sat->deep_arg->sinio * (-2 - 8 * $sat->deep_arg->cosio +
-                                 $sat->deep_arg->theta2 * (12 + 8 * $sat->deep_arg->cosio - 10 *
+                $sini2 = $sat->deep_arg->sinio*$sat->deep_arg->sinio;
+                $f220 = 0.75*(1 + 2*$sat->deep_arg->cosio + $sat->deep_arg->theta2);
+                $f221 = 1.5*$sini2;
+                $f321 = 1.875*$sat->deep_arg->sinio*(1 - 2*
+                                  $sat->deep_arg->cosio - 3*$sat->deep_arg->theta2);
+                $f322 = -1.875*$sat->deep_arg->sinio*(1 + 2*
+                                   $sat->deep_arg->cosio - 3*$sat->deep_arg->theta2);
+                $f441 = 35*$sini2*$f220;
+                $f442 = 39.3750*$sini2*$sini2;
+                $f522 = 9.84375*$sat->deep_arg->sinio*($sini2*(1 - 2*$sat->deep_arg->cosio - 5*
+                                       $sat->deep_arg->theta2) + 0.33333333*(-2 + 4*$sat->deep_arg->cosio +
+                                                     6*$sat->deep_arg->theta2));
+                $f523 = $sat->deep_arg->sinio*(4.92187512*$sini2*(-2 - 4*
+                                      $sat->deep_arg->cosio + 10*$sat->deep_arg->theta2) + 6.56250012
+                            * (1 + 2*$sat->deep_arg->cosio - 3*$sat->deep_arg->theta2));
+                $f542 = 29.53125*$sat->deep_arg->sinio*(2 - 8*
+                                 $sat->deep_arg->cosio + $sat->deep_arg->theta2*
+                                 (-12 + 8*$sat->deep_arg->cosio + 10*$sat->deep_arg->theta2));
+                $f543 = 29.53125*$sat->deep_arg->sinio*(-2 - 8*$sat->deep_arg->cosio +
+                                 $sat->deep_arg->theta2*(12 + 8*$sat->deep_arg->cosio - 10*
                                            $sat->deep_arg->theta2));
-                $xno2 = $sat->dps->xnq * $sat->dps->xnq;
-                $ainv2 = $aqnv * $aqnv;
-                $temp1 = 3 * $xno2 * $ainv2;
-                $temp = $temp1 * Predict::root22;
-                $sat->dps->d2201 = $temp * $f220 * $g201;
-                $sat->dps->d2211 = $temp * $f221 * $g211;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root32;
-                $sat->dps->d3210 = $temp * $f321 * $g310;
-                $sat->dps->d3222 = $temp * $f322 * $g322;
-                $temp1 = $temp1 * $aqnv;
-                $temp = 2 * $temp1 * Predict::root44;
-                $sat->dps->d4410 = $temp * $f441 * $g410;
-                $sat->dps->d4422 = $temp * $f442 * $g422;
-                $temp1 = $temp1 * $aqnv;
-                $temp = $temp1 * Predict::root52;
-                $sat->dps->d5220 = $temp * $f522 * $g520;
-                $sat->dps->d5232 = $temp * $f523 * $g532;
-                $temp = 2 * $temp1 * Predict::root54;
-                $sat->dps->d5421 = $temp * $f542 * $g521;
-                $sat->dps->d5433 = $temp * $f543 * $g533;
+                $xno2 = $sat->dps->xnq*$sat->dps->xnq;
+                $ainv2 = $aqnv*$aqnv;
+                $temp1 = 3*$xno2*$ainv2;
+                $temp = $temp1*Predict::root22;
+                $sat->dps->d2201 = $temp*$f220*$g201;
+                $sat->dps->d2211 = $temp*$f221*$g211;
+                $temp1 = $temp1*$aqnv;
+                $temp = $temp1*Predict::root32;
+                $sat->dps->d3210 = $temp*$f321*$g310;
+                $sat->dps->d3222 = $temp*$f322*$g322;
+                $temp1 = $temp1*$aqnv;
+                $temp = 2*$temp1*Predict::root44;
+                $sat->dps->d4410 = $temp*$f441*$g410;
+                $sat->dps->d4422 = $temp*$f442*$g422;
+                $temp1 = $temp1*$aqnv;
+                $temp = $temp1*Predict::root52;
+                $sat->dps->d5220 = $temp*$f522*$g520;
+                $sat->dps->d5232 = $temp*$f523*$g532;
+                $temp = 2*$temp1*Predict::root54;
+                $sat->dps->d5421 = $temp*$f542*$g521;
+                $sat->dps->d5433 = $temp*$f543*$g533;
                 $sat->dps->xlamo = $xmao + $sat->tle->xnodeo + $sat->tle->xnodeo - $sat->dps->thgr - $sat->dps->thgr;
                 $bfact = $sat->deep_arg->xmdot + $sat->deep_arg->xnodot +
                     $sat->deep_arg->xnodot - Predict::thdt - Predict::thdt;
@@ -812,18 +812,18 @@ 
                 $sat->flags |= self::RESONANCE_FLAG;
                 $sat->flags |= self::SYNCHRONOUS_FLAG;
                 /* Synchronous resonance terms initialization */
-                $g200 = 1 + $sat->deep_arg->eosq * (-2.5 + 0.8125 * $sat->deep_arg->eosq);
-                $g310 = 1 + 2 * $sat->deep_arg->eosq;
-                $g300 = 1 + $sat->deep_arg->eosq * (-6 + 6.60937 * $sat->deep_arg->eosq);
-                $f220 = 0.75 * (1 + $sat->deep_arg->cosio) * (1 + $sat->deep_arg->cosio);
-                $f311 = 0.9375 * $sat->deep_arg->sinio * $sat->deep_arg->sinio *
-                    (1 + 3 * $sat->deep_arg->cosio) - 0.75 * (1 + $sat->deep_arg->cosio);
+                $g200 = 1 + $sat->deep_arg->eosq*(-2.5 + 0.8125*$sat->deep_arg->eosq);
+                $g310 = 1 + 2*$sat->deep_arg->eosq;
+                $g300 = 1 + $sat->deep_arg->eosq*(-6 + 6.60937*$sat->deep_arg->eosq);
+                $f220 = 0.75*(1 + $sat->deep_arg->cosio)*(1 + $sat->deep_arg->cosio);
+                $f311 = 0.9375*$sat->deep_arg->sinio*$sat->deep_arg->sinio*
+                    (1 + 3*$sat->deep_arg->cosio) - 0.75*(1 + $sat->deep_arg->cosio);
                 $f330 = 1 + $sat->deep_arg->cosio;
-                $f330 = 1.875 * $f330 * $f330 * $f330;
-                $sat->dps->del1 = 3 * $sat->dps->xnq * $sat->dps->xnq * $aqnv * $aqnv;
-                $sat->dps->del2 = 2 * $sat->dps->del1 * $f220 * $g200 * Predict::q22;
-                $sat->dps->del3 = 3 * $sat->dps->del1 * $f330 * $g300 * Predict::q33 * $aqnv;
-                $sat->dps->del1 = $sat->dps->del1 * $f311 * $g310 * Predict::q31 * $aqnv;
+                $f330 = 1.875*$f330*$f330*$f330;
+                $sat->dps->del1 = 3*$sat->dps->xnq*$sat->dps->xnq*$aqnv*$aqnv;
+                $sat->dps->del2 = 2*$sat->dps->del1*$f220*$g200*Predict::q22;
+                $sat->dps->del3 = 3*$sat->dps->del1*$f330*$g300*Predict::q33*$aqnv;
+                $sat->dps->del1 = $sat->dps->del1*$f311*$g310*Predict::q31*$aqnv;
                 $sat->dps->fasx2 = 0.13130908;
                 $sat->dps->fasx4 = 2.8843198;
                 $sat->dps->fasx6 = 0.37448087;
@@ -845,24 +845,24 @@ 
             return;
 
         case self::dpsec: /* Entrance for deep space secular effects */
-            $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl * $sat->deep_arg->t;
-            $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg * $sat->deep_arg->t;
-            $sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh * $sat->deep_arg->t;
-            $sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse * $sat->deep_arg->t;
-            $sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi * $sat->deep_arg->t;
+            $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->ssl*$sat->deep_arg->t;
+            $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $sat->dps->ssg*$sat->deep_arg->t;
+            $sat->deep_arg->xnode = $sat->deep_arg->xnode + $sat->dps->ssh*$sat->deep_arg->t;
+            $sat->deep_arg->em = $sat->tle->eo + $sat->dps->sse*$sat->deep_arg->t;
+            $sat->deep_arg->xinc = $sat->tle->xincl + $sat->dps->ssi*$sat->deep_arg->t;
             if ($sat->deep_arg->xinc < 0) {
                 $sat->deep_arg->xinc = -$sat->deep_arg->xinc;
                 $sat->deep_arg->xnode = $sat->deep_arg->xnode + Predict::pi;
                 $sat->deep_arg->omgadf = $sat->deep_arg->omgadf - Predict::pi;
             }
-            if(~$sat->flags & self::RESONANCE_FLAG ) {
+            if (~$sat->flags&self::RESONANCE_FLAG) {
                 return;
             }
 
             do {
-                if ( ($sat->dps->atime == 0) ||
+                if (($sat->dps->atime == 0) ||
                     (($sat->deep_arg->t >= 0) && ($sat->dps->atime < 0)) ||
-                    (($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0)) ) {
+                    (($sat->deep_arg->t < 0) && ($sat->dps->atime >= 0))) {
                     /* Epoch restart */
                     if ($sat->deep_arg->t >= 0) {
                         $delt = $sat->dps->stepp;
@@ -899,59 +899,59 @@ 
                         } else {
                             $delt = $sat->dps->stepp;
                         }
-                        $sat->flags |= (self::DO_LOOP_FLAG | self::EPOCH_RESTART_FLAG);
+                        $sat->flags |= (self::DO_LOOP_FLAG|self::EPOCH_RESTART_FLAG);
                     }
 
                     /* Dot terms calculated */
-                    if ($sat->flags & self::SYNCHRONOUS_FLAG) {
-                        $xndot = $sat->dps->del1 * sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2 * sin(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + $sat->dps->del3 * sin(3 * ($sat->dps->xli - $sat->dps->fasx6));
-                        $xnddt = $sat->dps->del1 * cos($sat->dps->xli - $sat->dps->fasx2) + 2 * $sat->dps->del2 * cos(2 * ($sat->dps->xli - $sat->dps->fasx4))
-                            + 3 * $sat->dps->del3 * cos(3 * ($sat->dps->xli - $sat->dps->fasx6));
+                    if ($sat->flags&self::SYNCHRONOUS_FLAG) {
+                        $xndot = $sat->dps->del1*sin($sat->dps->xli - $sat->dps->fasx2) + $sat->dps->del2*sin(2*($sat->dps->xli - $sat->dps->fasx4))
+                            + $sat->dps->del3*sin(3*($sat->dps->xli - $sat->dps->fasx6));
+                        $xnddt = $sat->dps->del1*cos($sat->dps->xli - $sat->dps->fasx2) + 2*$sat->dps->del2*cos(2*($sat->dps->xli - $sat->dps->fasx4))
+                            + 3*$sat->dps->del3*cos(3*($sat->dps->xli - $sat->dps->fasx6));
                     } else {
-                        $xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot * $sat->dps->atime;
+                        $xomi = $sat->dps->omegaq + $sat->deep_arg->omgdot*$sat->dps->atime;
                         $x2omi = $xomi + $xomi;
                         $x2li = $sat->dps->xli + $sat->dps->xli;
-                        $xndot = $sat->dps->d2201 * sin($x2omi + $sat->dps->xli - Predict::g22)
-                            + $sat->dps->d2211 * sin($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * sin($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * sin(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d4410 * sin($x2omi + $x2li- Predict::g44)
-                            + $sat->dps->d4422 * sin($x2li- Predict::g44)
-                            + $sat->dps->d5220 * sin($xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5232 * sin(-$xomi + $sat->dps->xli- Predict::g52)
-                            + $sat->dps->d5421 * sin($xomi + $x2li - Predict::g54)
-                            + $sat->dps->d5433 * sin(-$xomi + $x2li - Predict::g54);
-                        $xnddt = $sat->dps->d2201 * cos($x2omi + $sat->dps->xli- Predict::g22)
-                            + $sat->dps->d2211 * cos($sat->dps->xli - Predict::g22)
-                            + $sat->dps->d3210 * cos($xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d3222 * cos(-$xomi + $sat->dps->xli - Predict::g32)
-                            + $sat->dps->d5220 * cos($xomi + $sat->dps->xli - Predict::g52)
-                            + $sat->dps->d5232 * cos(-$xomi + $sat->dps->xli - Predict::g52)
-                            + 2 * ($sat->dps->d4410 * cos($x2omi + $x2li - Predict::g44)
-                                + $sat->dps->d4422 * cos($x2li - Predict::g44)
-                                + $sat->dps->d5421 * cos($xomi + $x2li - Predict::g54)
-                                + $sat->dps->d5433 * cos(-$xomi + $x2li - Predict::g54));
+                        $xndot = $sat->dps->d2201*sin($x2omi + $sat->dps->xli - Predict::g22)
+                            + $sat->dps->d2211*sin($sat->dps->xli - Predict::g22)
+                            + $sat->dps->d3210*sin($xomi + $sat->dps->xli - Predict::g32)
+                            + $sat->dps->d3222*sin(-$xomi + $sat->dps->xli - Predict::g32)
+                            + $sat->dps->d4410*sin($x2omi + $x2li - Predict::g44)
+                            + $sat->dps->d4422*sin($x2li - Predict::g44)
+                            + $sat->dps->d5220*sin($xomi + $sat->dps->xli - Predict::g52)
+                            + $sat->dps->d5232*sin(-$xomi + $sat->dps->xli - Predict::g52)
+                            + $sat->dps->d5421*sin($xomi + $x2li - Predict::g54)
+                            + $sat->dps->d5433*sin(-$xomi + $x2li - Predict::g54);
+                        $xnddt = $sat->dps->d2201*cos($x2omi + $sat->dps->xli - Predict::g22)
+                            + $sat->dps->d2211*cos($sat->dps->xli - Predict::g22)
+                            + $sat->dps->d3210*cos($xomi + $sat->dps->xli - Predict::g32)
+                            + $sat->dps->d3222*cos(-$xomi + $sat->dps->xli - Predict::g32)
+                            + $sat->dps->d5220*cos($xomi + $sat->dps->xli - Predict::g52)
+                            + $sat->dps->d5232*cos(-$xomi + $sat->dps->xli - Predict::g52)
+                            + 2*($sat->dps->d4410*cos($x2omi + $x2li - Predict::g44)
+                                + $sat->dps->d4422*cos($x2li - Predict::g44)
+                                + $sat->dps->d5421*cos($xomi + $x2li - Predict::g54)
+                                + $sat->dps->d5433*cos(-$xomi + $x2li - Predict::g54));
                     } /* End of if (isFlagSet(SYNCHRONOUS_FLAG)) */
 
                     $xldot = $sat->dps->xni + $sat->dps->xfact;
-                    $xnddt = $xnddt * $xldot;
+                    $xnddt = $xnddt*$xldot;
 
-                    if ($sat->flags & self::DO_LOOP_FLAG) {
-                        $sat->dps->xli = $sat->dps->xli + $xldot * $delt + $xndot * $sat->dps->step2;
-                        $sat->dps->xni = $sat->dps->xni + $xndot * $delt + $xnddt * $sat->dps->step2;
+                    if ($sat->flags&self::DO_LOOP_FLAG) {
+                        $sat->dps->xli = $sat->dps->xli + $xldot*$delt + $xndot*$sat->dps->step2;
+                        $sat->dps->xni = $sat->dps->xni + $xndot*$delt + $xnddt*$sat->dps->step2;
                         $sat->dps->atime = $sat->dps->atime + $delt;
                     }
-                } while (($sat->flags & self::DO_LOOP_FLAG) &&
-                        (~$sat->flags & self::EPOCH_RESTART_FLAG));
+                } while (($sat->flags&self::DO_LOOP_FLAG) &&
+                        (~$sat->flags&self::EPOCH_RESTART_FLAG));
             }
-            while (($sat->flags & self::DO_LOOP_FLAG) && ($sat->flags & self::EPOCH_RESTART_FLAG));
+            while (($sat->flags&self::DO_LOOP_FLAG) && ($sat->flags&self::EPOCH_RESTART_FLAG));
 
-            $sat->deep_arg->xn = $sat->dps->xni + $xndot * $ft + $xnddt * $ft * $ft * 0.5;
-            $xl = $sat->dps->xli + $xldot * $ft + $xndot * $ft * $ft * 0.5;
-            $temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t * Predict::thdt;
+            $sat->deep_arg->xn = $sat->dps->xni + $xndot*$ft + $xnddt*$ft*$ft*0.5;
+            $xl = $sat->dps->xli + $xldot*$ft + $xndot*$ft*$ft*0.5;
+            $temp = -$sat->deep_arg->xnode + $sat->dps->thgr + $sat->deep_arg->t*Predict::thdt;
 
-            if (~$sat->flags & self::SYNCHRONOUS_FLAG) {
+            if (~$sat->flags&self::SYNCHRONOUS_FLAG) {
                 $sat->deep_arg->xll = $xl + $temp + $temp;
             } else {
                 $sat->deep_arg->xll = $xl - $sat->deep_arg->omgadf + $temp;
@@ -965,26 +965,26 @@ 
             $cosis = cos($sat->deep_arg->xinc);
             if (abs($sat->dps->savtsn - $sat->deep_arg->t) >= 30) {
                 $sat->dps->savtsn = $sat->deep_arg->t;
-                $zm = $sat->dps->zmos + Predict::zns * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zes * sin($zm);
+                $zm = $sat->dps->zmos + Predict::zns*$sat->deep_arg->t;
+                $zf = $zm + 2*Predict::zes*sin($zm);
                 $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $ses = $sat->dps->se2 * $f2 + $sat->dps->se3 * $f3;
-                $sis = $sat->dps->si2 * $f2 + $sat->dps->si3 * $f3;
-                $sls = $sat->dps->sl2 * $f2 + $sat->dps->sl3 * $f3 + $sat->dps->sl4 * $sinzf;
-                $sat->dps->sghs = $sat->dps->sgh2 * $f2 + $sat->dps->sgh3 * $f3 + $sat->dps->sgh4 * $sinzf;
-                $sat->dps->shs = $sat->dps->sh2 * $f2 + $sat->dps->sh3 * $f3;
-                $zm = $sat->dps->zmol + Predict::znl * $sat->deep_arg->t;
-                $zf = $zm + 2 * Predict::zel * sin($zm);
+                $f2 = 0.5*$sinzf*$sinzf - 0.25;
+                $f3 = -0.5*$sinzf*cos($zf);
+                $ses = $sat->dps->se2*$f2 + $sat->dps->se3*$f3;
+                $sis = $sat->dps->si2*$f2 + $sat->dps->si3*$f3;
+                $sls = $sat->dps->sl2*$f2 + $sat->dps->sl3*$f3 + $sat->dps->sl4*$sinzf;
+                $sat->dps->sghs = $sat->dps->sgh2*$f2 + $sat->dps->sgh3*$f3 + $sat->dps->sgh4*$sinzf;
+                $sat->dps->shs = $sat->dps->sh2*$f2 + $sat->dps->sh3*$f3;
+                $zm = $sat->dps->zmol + Predict::znl*$sat->deep_arg->t;
+                $zf = $zm + 2*Predict::zel*sin($zm);
                 $sinzf = sin($zf);
-                $f2 = 0.5 * $sinzf * $sinzf - 0.25;
-                $f3 = -0.5 * $sinzf * cos($zf);
-                $sel = $sat->dps->ee2 * $f2 + $sat->dps->e3 * $f3;
-                $sil = $sat->dps->xi2 * $f2 + $sat->dps->xi3 * $f3;
-                $sll = $sat->dps->xl2 * $f2 + $sat->dps->xl3 * $f3 + $sat->dps->xl4 * $sinzf;
-                $sat->dps->sghl = $sat->dps->xgh2 * $f2 + $sat->dps->xgh3 * $f3 + $sat->dps->xgh4 * $sinzf;
-                $sat->dps->sh1 = $sat->dps->xh2 * $f2 + $sat->dps->xh3 * $f3;
+                $f2 = 0.5*$sinzf*$sinzf - 0.25;
+                $f3 = -0.5*$sinzf*cos($zf);
+                $sel = $sat->dps->ee2*$f2 + $sat->dps->e3*$f3;
+                $sil = $sat->dps->xi2*$f2 + $sat->dps->xi3*$f3;
+                $sll = $sat->dps->xl2*$f2 + $sat->dps->xl3*$f3 + $sat->dps->xl4*$sinzf;
+                $sat->dps->sghl = $sat->dps->xgh2*$f2 + $sat->dps->xgh3*$f3 + $sat->dps->xgh4*$sinzf;
+                $sat->dps->sh1 = $sat->dps->xh2*$f2 + $sat->dps->xh3*$f3;
                 $sat->dps->pe = $ses + $sel;
                 $sat->dps->pinc = $sis + $sil;
                 $sat->dps->pl = $sls + $sll;
@@ -997,8 +997,8 @@ 
 
             if ($sat->dps->xqncl >= 0.2) {
                 /* Apply periodics directly */
-                $ph = $ph / $sat->deep_arg->sinio;
-                $pgh = $pgh - $sat->deep_arg->cosio * $ph;
+                $ph = $ph/$sat->deep_arg->sinio;
+                $pgh = $pgh - $sat->deep_arg->cosio*$ph;
                 $sat->deep_arg->omgadf = $sat->deep_arg->omgadf + $pgh;
                 $sat->deep_arg->xnode = $sat->deep_arg->xnode + $ph;
                 $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
@@ -1006,22 +1006,22 @@ 
                 /* Apply periodics with Lyddane modification */
                 $sinok = sin($sat->deep_arg->xnode);
                 $cosok = cos($sat->deep_arg->xnode);
-                $alfdp = $sinis * $sinok;
-                $betdp = $sinis * $cosok;
-                $dalf = $ph * $cosok + $sat->dps->pinc * $cosis * $sinok;
-                $dbet = -$ph * $sinok + $sat->dps->pinc * $cosis * $cosok;
+                $alfdp = $sinis*$sinok;
+                $betdp = $sinis*$cosok;
+                $dalf = $ph*$cosok + $sat->dps->pinc*$cosis*$sinok;
+                $dbet = -$ph*$sinok + $sat->dps->pinc*$cosis*$cosok;
                 $alfdp = $alfdp + $dalf;
                 $betdp = $betdp + $dbet;
                 $sat->deep_arg->xnode = Predict_Math::FMod2p($sat->deep_arg->xnode);
-                $xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis * $sat->deep_arg->xnode;
-                $dls = $sat->dps->pl + $pgh - $sat->dps->pinc * $sat->deep_arg->xnode * $sinis;
+                $xls = $sat->deep_arg->xll + $sat->deep_arg->omgadf + $cosis*$sat->deep_arg->xnode;
+                $dls = $sat->dps->pl + $pgh - $sat->dps->pinc*$sat->deep_arg->xnode*$sinis;
                 $xls = $xls + $dls;
                 $xnoh = $sat->deep_arg->xnode;
                 $sat->deep_arg->xnode = Predict_Math::AcTan($alfdp, $betdp);
 
                 /* This is a patch to Lyddane modification */
                 /* suggested by Rob Matson. */
-                if(abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
+                if (abs($xnoh - $sat->deep_arg->xnode) > Predict::pi) {
                     if ($sat->deep_arg->xnode < $xnoh) {
                         $sat->deep_arg->xnode += Predict::twopi;
                     } else {
@@ -1030,7 +1030,7 @@ 
                 }
 
                 $sat->deep_arg->xll = $sat->deep_arg->xll + $sat->dps->pl;
-                $sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc) *
+                $sat->deep_arg->omgadf = $xls - $sat->deep_arg->xll - cos($sat->deep_arg->xinc)*
                     $sat->deep_arg->xnode;
             } /* End case dpper: */
             return;

Braces +2 added lines, -4 removed lines

@@ -752,8 +752,7 @@ 
                         $sat->deep_arg->eosq + 5337.524 * $eoc;
                     $g532 = -853.666 + 4690.25 * $eq - 8624.77 *
                         $sat->deep_arg->eosq + 5341.4 * $eoc;
-                }
-                else {
+                } else {
                     $g533 = -37995.78 + 161616.52 * $eq - 229838.2*
                         $sat->deep_arg->eosq + 109377.94 * $eoc;
                     $g521 = -51752.104 + 218913.95 * $eq - 309468.16*
@@ -887,8 +886,7 @@ 
                     if (abs($sat->deep_arg->t - $sat->dps->atime) >= $sat->dps->stepp) {
                         $sat->flags |= self::DO_LOOP_FLAG;
                         $sat->flags &= ~self::EPOCH_RESTART_FLAG;
-                    }
-                    else {
+                    } else {
                         $ft = $sat->deep_arg->t - $sat->dps->atime;
                         $sat->flags &= ~self::DO_LOOP_FLAG;
                     }