Ysurac / FlightAirMap

ident-statistics-registration.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['ident'])) {
-        header('Location: '.$globalURL.'/ident');
-        die();
+		header('Location: '.$globalURL.'/ident');
+		die();
 }
 $Spotter = new Spotter();
 $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);

Spacing +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
+$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by Registration of %s"),$spotter_array[0]['ident']);
+	$title = sprintf(_("Most Common Aircraft by Registration of %s"), $spotter_array[0]['ident']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
@@ -24,7 +24,7 @@ 
 	include('ident-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by Registration of flights using the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by Registration of flights using the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByIdent($ident);
 	
@@ -42,7 +42,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

newest.php

Braces +1 added lines, -1 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 
 if (isset($_POST['category']))
 {
-	$category = filter_input(INPUT_POST,'category',FILTER_SANITIZE_STRING);
+	$category = filter_input(INPUT_POST, 'category', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/newest/'.$category);
 }
 
@@ -14,18 +14,18 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
   $limit_start = 0;
   $limit_end = 25;
   $absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
 }
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -36,7 +36,7 @@ 
 {
 	$category = "aircraft";
 } else {
-	$category = filter_input(INPUT_GET,'category',FILTER_SANITIZE_STRING);
+	$category = filter_input(INPUT_GET, 'category', FILTER_SANITIZE_STRING);
 }
 
 $page_url = $globalURL.'/newest/'.$category;

country-sub-menu.php

Spacing +6 added lines, -6 removed lines

@@ -3,9 +3,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/country/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/country/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-aircraft" || strtolower($current_page) == "country-statistics-registration" || strtolower($current_page) == "country-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-aircraft" || strtolower($current_page) == "country-statistics-registration" || strtolower($current_page) == "country-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -15,7 +15,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-airline" || strtolower($current_page) == "country-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-airline" || strtolower($current_page) == "country-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -24,7 +24,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-departure-airport" || strtolower($current_page) == "country-statistics-departure-airport-country" || strtolower($current_page) == "country-statistics-arrival-airport" || strtolower($current_page) == "country-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-departure-airport" || strtolower($current_page) == "country-statistics-departure-airport-country" || strtolower($current_page) == "country-statistics-arrival-airport" || strtolower($current_page) == "country-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -34,7 +34,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/country/statistics/arrival-airport-country/<?php print $country; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/country/statistics/route/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/country/statistics/time/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/country/statistics/route/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/country/statistics/time/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

registration-statistics-arrival-airport.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else {
+	$spotter_array=array();
+}
 
 if (!empty($spotter_array))
 {

Spacing +7 added lines, -7 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort=filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"), $registration);
 
 	require_once('header.php');
 		print '<div class="info column">';
@@ -25,7 +25,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByRegistration($registration);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -34,7 +34,7 @@ 
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_name'].' ('.$airport_item['airport_arrival_icao'].')",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 	}
@@ -88,7 +88,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

registration-statistics-arrival-airport-country.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else {
+	$spotter_array=array();
+}
 
 if (!empty($spotter_array))
 {

Spacing +7 added lines, -7 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"), $registration);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$registration.' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -24,7 +24,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByRegistration($registration);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -32,7 +32,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -79,7 +79,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

polar-geojson.php

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 		$first = '';
 		foreach($data as $value => $key) {
 			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
-			if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			if ($first == '') {
+				$first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			}
 			$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
 		}
 		$output .= $first;

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 header('Content-Type: text/javascript');
 
 
-$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($polar)) {
-	foreach($polar as $eachpolar) {
+	foreach ($polar as $eachpolar) {
 		$data = json_decode($eachpolar['source_data']);
 		$name = $eachpolar['source_name'];
 		$coord = $Location->getLocationInfobySourceName($name);
@@ -33,15 +33,15 @@ 
 			$initial_longitude = $globalCenterLongitude;
 		}
 		$first = '';
-		foreach($data as $value => $key) {
-			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
-			if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+		foreach ($data as $value => $key) {
+			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude, $initial_longitude, $value*22.5, $key);
+			if ($first == '') $first = '['.round($final_coord['longitude'], 5).','.round($final_coord['latitude'], 5).']';
 			$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
 		}
 		$output .= $first;
 		$output .= ']]}},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 print $output;

archive-geojson.php

Spacing +26 added lines, -26 removed lines

@@ -23,13 +23,13 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',', $_COOKIE['Airlines']);
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',', $_COOKIE['Sources']);
 if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
@@ -37,12 +37,12 @@ 
 }
 
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	$spotter_array = $SpotterArchive->getLastArchiveSpotterDataByIdent($ident);
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
 	$allhistory = true;
@@ -50,20 +50,20 @@ 
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 }
 
 if (!empty($spotter_array)) {
-	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 //var_dump($spotter_array);
 $j = 0;
@@ -78,7 +78,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				date_default_timezone_set('UTC');
@@ -161,7 +161,7 @@ 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -228,15 +228,15 @@ 
 						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
+						else $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -258,7 +258,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						$spotter_history_array = $SpotterArchive->getCoordArchiveSpotterDataById($spotter_item['flightaware_id']);
 						//$spotter_history_array = array();
@@ -270,7 +270,7 @@ 
 					$output_time .= (strtotime($spotter_history['date'])*1000).',';
 				}
 				if (isset($output_time)) {
-				    $output_time  = substr($output_time, 0, -1);
+				    $output_time = substr($output_time, 0, -1);
 				    $output .= '"time": ['.$output_time.'],';
 				}
 
@@ -285,7 +285,7 @@ 
 						$output .= '"coordinates": [';
 						
 				if (isset($output_history)) {
-				    $output_history  = substr($output_history, 0, -1);
+				    $output_history = substr($output_history, 0, -1);
 				    $output .= $output_history;
 				}
 				
@@ -297,7 +297,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$flightcnt.'"';
 		} else {

Braces +120 added lines, -46 removed lines

@@ -16,21 +16,40 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
+	$filter['airlines'] = explode(',',$_COOKIE['Airlines']);
+}
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
+	$filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+}
+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
+	$filter['airlinestype'] = $_COOKIE['airlinestype'];
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -60,8 +79,12 @@ 
 
 if (!empty($spotter_array)) {
 	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -70,8 +93,11 @@ 
 
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -140,11 +166,16 @@ 
 						//$output .= '"fc": "'.$flightcnt.'",';
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -152,13 +183,21 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -171,19 +210,29 @@ 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-								if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-								else $spotter_item['aircraft_shadow'] = '';
+								if (count($aircraft_info) > 0) {
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+								} else {
+									$spotter_item['aircraft_shadow'] = '';
+								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -191,8 +240,11 @@ 
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -204,8 +256,11 @@ 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -223,18 +278,29 @@ 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+						} else {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						}
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -242,8 +308,11 @@ 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -277,8 +346,11 @@ 
 
 
 							// FIXME : type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 						$output .= '"type": "MultiPoint",';
@@ -298,7 +370,9 @@ 
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$flightcnt.'"';
 		} else {
 			$output .= '"features": ';

Indentation +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
 				}
 
 				//waypoint plotting
-                /*
+				/*
 				$output .= '{';
 					$output .= '"type": "Feature",';
 						$output .= '"properties": {';
@@ -269,8 +269,8 @@ 
 					$output_time .= (strtotime($spotter_history['date'])*1000).',';
 				}
 				if (isset($output_time)) {
-				    $output_time  = substr($output_time, 0, -1);
-				    $output .= '"time": ['.$output_time.'],';
+					$output_time  = substr($output_time, 0, -1);
+					$output .= '"time": ['.$output_time.'],';
 				}
 
 
@@ -284,8 +284,8 @@ 
 						$output .= '"coordinates": [';
 						
 				if (isset($output_history)) {
-				    $output_history  = substr($output_history, 0, -1);
-				    $output .= $output_history;
+					$output_history  = substr($output_history, 0, -1);
+					$output .= $output_history;
 				}
 				
 						$output .= ']';

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;
     }
 }