Ysurac / FlightAirMap

live-czml.php

Spacing +82 added lines, -82 removed lines

@@ -66,11 +66,11 @@ 
     $s3 = sin($bank/2);
     $c1c2 = $c1*$c2;
     $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+    $w = $c1c2*$c3 - $s1s2*$s3;
+    $x = $c1c2*$s3 + $s1s2*$c3;
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
@@ -92,22 +92,22 @@ 
 $allhistory = false;
 $filter['source'] = array();
 $limit = 0;
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') $filter['race'] = filter_var($_COOKIE['filter_race'],FILTER_SANITIZE_NUMBER_INT);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') $filter['race'] = filter_var($_COOKIE['filter_race'], FILTER_SANITIZE_NUMBER_INT);
 if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') $filter['blocked'] = true;
 
 if (isset($_COOKIE['map_3d_limit'])) {
-	$limit = filter_var($_COOKIE['map_3d_limit'],FILTER_SANITIZE_NUMBER_INT);
+	$limit = filter_var($_COOKIE['map_3d_limit'], FILTER_SANITIZE_NUMBER_INT);
 }
 
 /*
@@ -156,17 +156,17 @@ 
 	$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);
+	$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);
 	if ($tracker) {
-		$spotter_array = $TrackerArchive->getMinLiveTrackerDataPlayback($begindate,$enddate,$filter);
+		$spotter_array = $TrackerArchive->getMinLiveTrackerDataPlayback($begindate, $enddate, $filter);
 	} elseif ($marine) {
-		$spotter_array = $MarineArchive->getMinLiveMarineDataPlayback($begindate,$enddate,$filter);
+		$spotter_array = $MarineArchive->getMinLiveMarineDataPlayback($begindate, $enddate, $filter);
 	} else {
-		$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+		$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 	}
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
 	$from_archive = true;
@@ -183,36 +183,36 @@ 
 	}
 	$enddate = $_COOKIE['archive_end'];
 	$enddateinitial = $_COOKIE['archive_end'];
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
 	//echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
 	if ($tracker) {
-		$spotter_array = $TrackerArchive->getMinLiveTrackerData($begindate,$enddate,$filter);
+		$spotter_array = $TrackerArchive->getMinLiveTrackerData($begindate, $enddate, $filter);
 	} elseif ($marine) {
-		$spotter_array = $MarineArchive->getMinLiveMarineData($begindate,$enddate,$filter);
+		$spotter_array = $MarineArchive->getMinLiveMarineData($begindate, $enddate, $filter);
 	} else {
-		$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+		$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 	}
 } elseif ($tracker) {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
 	$previous_filter = $filter;
 	if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrackTracker']) && $_COOKIE['MapTrackTracker'] != '')) {
-		$filter = array_merge($filter,array('id' => $_COOKIE['MapTrackTracker']));
-		$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,false);
+		$filter = array_merge($filter, array('id' => $_COOKIE['MapTrackTracker']));
+		$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, false);
 	/*
 	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && !empty($coord)) {
 		$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true,$_COOKIE['MapTrack']);
 	*/
 	} elseif (!isset($_COOKIE['singlemodel']) || $_COOKIE['singlemodel'] == 'false') {
-		$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,false);
+		$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, false);
 	} else {
 		$spotter_array = array();
 	}
@@ -221,8 +221,8 @@ 
 	$coord = array();
 	//if (isset($_GET['coord']) && $_GET['coord'] != '') {
 	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrackMarine']) && $_COOKIE['MapTrackMarine'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
@@ -231,11 +231,11 @@ 
 	if (((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) && (isset($_COOKIE['MapTrackMarine']) && $_COOKIE['MapTrackMarine'] != '')) {
 		//$filter = array_merge($filter,array('id' => $_COOKIE['MapTrackMarine']));
 		//$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,false);
-		$spotter_array = $MarineLive->getMinLastLiveMarineDataByID($_COOKIE['MapTrackMarine'],$filter,false);
+		$spotter_array = $MarineLive->getMinLastLiveMarineDataByID($_COOKIE['MapTrackMarine'], $filter, false);
 	} elseif (isset($_COOKIE['MapTrackMarine']) && $_COOKIE['MapTrackMarine'] != '' && !empty($coord)) {
-		$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,false,$_COOKIE['MapTrack']);
+		$spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, false, $_COOKIE['MapTrack']);
 	} elseif (!isset($_COOKIE['singlemodel']) || $_COOKIE['singlemodel'] == 'false') {
-		$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,false);
+		$spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, false);
 	} else {
 		$spotter_array = array();
 	}
@@ -243,8 +243,8 @@ 
 } else {
 	$coord = array();
 	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
@@ -252,14 +252,14 @@ 
 	$previous_filter = $filter;
 	if (((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) {
 		//$filter = array_merge($filter,array('id' => $_COOKIE['MapTrack']));
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterDataByID($_COOKIE['MapTrack'],$filter,$limit);
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterDataByID($_COOKIE['MapTrack'], $filter, $limit);
 		//$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,false);
 	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '') {
 		//$spotter_array = $SpotterLive->getMinLastLiveSpotterDataByID($_COOKIE['MapTrack'],$filter,false);
 		//if (empty($spotter_array)) $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,false,$_COOKIE['MapTrack']);
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,$limit,$_COOKIE['MapTrack']);
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, $limit, $_COOKIE['MapTrack']);
 	} elseif (!isset($_COOKIE['singlemodel']) || $_COOKIE['singlemodel'] == 'false') {
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,$limit);
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, $limit);
 	} else {
 		$spotter_array = array();
 	}
@@ -269,19 +269,19 @@ 
 if (!empty($spotter_array) && isset($coord)) {
 	if ($tracker) {
 		if (isset($_GET['archive'])) {
-			$flightcnt = $TrackerArchive->getLiveTrackerCount($begindate,$enddate,$filter);
+			$flightcnt = $TrackerArchive->getLiveTrackerCount($begindate, $enddate, $filter);
 		} else {
 			$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
 		}
 	} elseif ($marine) {
 		if (isset($_GET['archive'])) {
-			$flightcnt = $MarineArchive->getLiveMarineCount($begindate,$enddate,$filter);
+			$flightcnt = $MarineArchive->getLiveMarineCount($begindate, $enddate, $filter);
 		} else {
 			$flightcnt = $MarineLive->getLiveMarineCount($filter);
 		}
 	} else {
 		if (isset($_GET['archive'])) {
-			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 		} else {
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 		}
@@ -289,17 +289,17 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 $minitime = time();
 $minitracktime_begin = time();
 $minitracktime = $minitracktime_begin;
 $maxitime = 0;
-$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT);
+$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT);
 $modelsdb = array();
 if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb[$model] = $row[1];
 			}
@@ -309,9 +309,9 @@ 
 }
 $modelsdb2 = array();
 if (file_exists(dirname(__FILE__).'/models/gltf2/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$glb = $row[1];
 				if (isset($row[2])) {
@@ -357,7 +357,7 @@ 
 if (!empty($spotter_array) && is_array($spotter_array))
 {
 	$nblatlong = 0;
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		//if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
@@ -411,17 +411,17 @@ 
 			}
 			if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
-			if (isset($spotter_item['ident'])) $output.= '"ident": '.json_encode($spotter_item['ident']).',';
+			if (isset($spotter_item['ident'])) $output .= '"ident": '.json_encode($spotter_item['ident']).',';
 			if ($tracker) {
 				if (isset($spotter_item['type'])) $output .= '"tracker_type": '.json_encode($spotter_item['type']).',';
-				$output.= '"type": "tracker"';
+				$output .= '"type": "tracker"';
 			} elseif ($marine) {
 				if (isset($spotter_item['type'])) $output .= '"marine_type": '.json_encode($spotter_item['type']).',';
 				if (isset($spotter_item['captain_name'])) $output .= '"captain": '.json_encode($spotter_item['captain_name']).',';
 				if (isset($spotter_item['race_id'])) $output .= '"raceid": '.$spotter_item['race_id'].',';
 				if (isset($spotter_item['race_name'])) $output .= '"race": '.json_encode($spotter_item['race_name']).',';
 				if (isset($spotter_item['race_rank'])) $output .= '"rank": "'.$spotter_item['race_rank'].'",';
-				$output.= '"type": "marine"';
+				$output .= '"type": "marine"';
 			} else {
 				if ($one3dmodel === false && isset($globalMap3DLiveries) && $globalMap3DLiveries) {
 					$aircraft_icao = $spotter_item['aircraft_icao'];
@@ -435,14 +435,14 @@ 
 						if (isset($airline_icao)) {
 							$imagefile = $aircraft_icao.'-'.$airline_icao.'.png';
 							if (file_exists(dirname(__FILE__).'/models/gltf2/liveries/'.$imagefile)) {
-								$output.= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
+								$output .= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
 							}
 						}
 					}
 					//if ($ident != '') $output.= '"ident": "'.$ident.'",';
 				}
-				$output.= '"gltf2": %gltf2%,';
-				$output.= '"type": "flight"';
+				$output .= '"gltf2": %gltf2%,';
+				$output .= '"type": "flight"';
 			}
 			$output .= '},';
 
@@ -817,8 +817,8 @@ 
 					$output .= '},';
 				}
 			}
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
-			else $output = str_replace('%onground%','false',$output);
+			if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output);
+			else $output = str_replace('%onground%', 'false', $output);
 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
 			//$output .= '"heightReference": "'.$heightrelative.'",';
@@ -834,7 +834,7 @@ 
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
 			if (isset($_COOKIE['MapTrack']) && $id == $_COOKIE['MapTrack'] && $minitracktime > strtotime($spotter_item['date'])) $minitracktime = strtotime($spotter_item['date']);
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'];
 			$prevlong = $spotter_item['longitude'];
@@ -862,8 +862,8 @@ 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
-			$nblatlong = $nblatlong+1;
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$nblatlong = $nblatlong + 1;
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
@@ -904,26 +904,26 @@ 
 $output .= ']';
 if (isset($globalArchive) && $globalArchive === TRUE) {
 	if (isset($begindateinitial)) {
-		$output = str_replace('%minitime%',date("c",$begindateinitial),$output);
-	} elseif ((time()-$globalLiveInterval) > $minitime) {
-		if (time()-$globalLiveInterval > $maxitime) {
-			$output = str_replace('%minitime%',date("c",$maxitime),$output);
+		$output = str_replace('%minitime%', date("c", $begindateinitial), $output);
+	} elseif ((time() - $globalLiveInterval) > $minitime) {
+		if (time() - $globalLiveInterval > $maxitime) {
+			$output = str_replace('%minitime%', date("c", $maxitime), $output);
 		} else {
-			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
+			$output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
 		}
 	}
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
+	else $output = str_replace('%minitime%', date("c", $minitime), $output);
 } elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && $minitracktime != $minitracktime_begin) {
-	$output = str_replace('%minitime%',date("c",$minitracktime),$output);
+	$output = str_replace('%minitime%', date("c", $minitracktime), $output);
 } else {
-	$output = str_replace('%minitime%',date("c",$minitime),$output);
+	$output = str_replace('%minitime%', date("c", $minitime), $output);
 }
 if (isset($enddateinitial)) {
-	$output = str_replace('%maxitime%',date("c",$enddateinitial),$output);
+	$output = str_replace('%maxitime%', date("c", $enddateinitial), $output);
 } else {
-	$output = str_replace('%maxitime%',date("c",$maxitime),$output);
+	$output = str_replace('%maxitime%', date("c", $maxitime), $output);
 }
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
-else $output = str_replace('%gltf2%','false',$output);
+if ($gltf2) $output = str_replace('%gltf2%', 'true', $output);
+else $output = str_replace('%gltf2%', 'false', $output);
 print $output;
 ?>

aircraft-detailed.php

Spacing +11 added lines, -11 removed lines

@@ -5,16 +5,16 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 
-if (!isset($_GET['aircraft_type'])){
+if (!isset($_GET['aircraft_type'])) {
 	header('Location: '.$globalURL.'/aircraft');
 } else {
 	//calculuation for the pagination
-	if(!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
+	if (!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
 	{
 		$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];
@@ -28,19 +28,19 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+	$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/aircraft/'.$aircraft_type;
 	
-	$sort = htmlspecialchars(filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING));
-	$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,$limit_start.",".$absolute_difference, $sort);
+	$sort = htmlspecialchars(filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING));
+	$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, $limit_start.",".$absolute_difference, $sort);
 	
 	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 	if (!empty($spotter_array) || !empty($aircraft_info))
 	{
 		if (!empty($aircraft_info)) {
-			$title = sprintf(_("Detailed View for %s (%s)"),$aircraft_info[0]['type'],$aircraft_info[0]['icao']);
+			$title = sprintf(_("Detailed View for %s (%s)"), $aircraft_info[0]['type'], $aircraft_info[0]['icao']);
 		} else {
-			$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+			$title = sprintf(_("Detailed View for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 		}
 		require_once('header.php');
 	    
@@ -51,9 +51,9 @@ 
 		$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-		foreach($aircraft_types as $aircrafttype)
+		foreach ($aircraft_types as $aircrafttype)
 		{
-			if($aircraft_type == $aircrafttype['aircraft_icao'])
+			if ($aircraft_type == $aircrafttype['aircraft_icao'])
 			{
 				print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_manufacturer'].' '.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 			} else {
@@ -90,7 +90,7 @@ 
 		if (!empty($spotter_array)) {
 			include('aircraft-sub-menu.php');
 			print '<div class="table column">';
-			print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 			include('table-output.php');
 			print '<div class="pagination">';
 			if ($limit_previous_1 >= 0)

airport-detailed.php

Spacing +16 added lines, -16 removed lines

@@ -5,17 +5,17 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.METAR.php');
 
-if (!isset($_GET['airport'])){
+if (!isset($_GET['airport'])) {
 	header('Location: '.$globalURL.'/airport');
 } else {
 	$Spotter = new Spotter();
 	//calculation 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];
@@ -28,18 +28,18 @@ 
 	$limit_next = $limit_end + $absolute_difference;
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
-	$airport_icao = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+	$airport_icao = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 	$airport = $airport_icao;
 	$page_url = $globalURL.'/airport/'.$airport_icao;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	$airport_array = $Spotter->getAllAirportInfo($airport_icao);
 	if (!empty($airport_array))
 	{
 		if ($sort != '') {
-			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, $sort);
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, '');
+			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, '');
 		}
 		
 		if (isset($globalMETAR) && $globalMETAR) {
@@ -50,7 +50,7 @@ 
             		//print_r($metar_parse);
 		}
 		
-		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+		$title = sprintf(_("Detailed View for %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 		require_once('header.php');
 		
@@ -62,9 +62,9 @@ 
 		$airport_names = $Stats->getAllAirportNames();
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 		ksort($airport_names);
-		foreach($airport_names as $airport_name)
+		foreach ($airport_names as $airport_name)
 		{
-			if($airport_icao == $airport_name['airport_icao'])
+			if ($airport_icao == $airport_name['airport_icao'])
 			{
 				print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 			} else {
@@ -114,15 +114,15 @@ 
 				$date_data = '';
 				$departure_data = '';
 				$arrival_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$date_data .= '"'.$data['date'].'",';
 					$departure_data .= $data['departure'].',';
 					$arrival_data .= $data['arrival'].',';
 				}
-				$date_data = "['x',".substr($date_data,0,-1)."]";
-				$departure_data = "['departure',".substr($departure_data,0,-1)."]";
-				$arrival_data = "['arrival',".substr($arrival_data,0,-1)."]";
+				$date_data = "['x',".substr($date_data, 0, -1)."]";
+				$departure_data = "['departure',".substr($departure_data, 0, -1)."]";
+				$arrival_data = "['arrival',".substr($arrival_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -179,7 +179,7 @@ 
 					print _("Dew point:").' '.$metar_parse['dew'].' °C'." - ";
 				}
 				if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
-					$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
+					$humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1);
 					print _("Humidity:").' '.$humidity.'%'." - ";
 				}
 				if (isset($metar_parse['QNH'])) {
@@ -196,7 +196,7 @@ 
 			print '<div class="table column">';
 			if ($airport_array[0]['iata'] != "NA")
 			{
-				print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+				print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 			}
 			include('table-output.php');  
 			print '<div class="pagination">';

require/libs/Predict/Predict/SGPSDP.php

Spacing +499 added lines, -499 removed lines

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

require/libs/Predict/Predict/Sat.php

Spacing +54 added lines, -54 removed lines

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

require/libs/Predict/Predict.php

Spacing +92 added lines, -92 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,13 +504,13 @@ 
         $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);
@@ -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));
     }
 }

require/libs/SimplePie.compiled.php

Spacing +238 added lines, -238 removed lines

@@ -69,12 +69,12 @@ 
  * SimplePie Useragent
  * @see SimplePie::set_useragent()
  */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
 
 /**
  * SimplePie Linkback
  */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 
 /**
  * No Autodiscovery
@@ -785,7 +785,7 @@ 
 		{
 			$this->feed_url = $file->url;
 			$this->permanent_url = $this->feed_url;
-			$this->file =& $file;
+			$this->file = & $file;
 			return true;
 		}
 		return false;
@@ -873,7 +873,7 @@ 
 	 */
 	public function force_cache_fallback($enable = false)
 	{
-		$this->force_cache_fallback= (bool) $enable;
+		$this->force_cache_fallback = (bool) $enable;
 	}
 
 	/**
@@ -1258,7 +1258,7 @@ 
 	{
 		if ($page !== false)
 		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
 		}
 		else
 		{
@@ -1389,7 +1389,7 @@ 
 		}
 		
 		// Empty response check
-		if(empty($this->raw_data)){
+		if (empty($this->raw_data)) {
 			$this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
 			$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 			return false;
@@ -1455,7 +1455,7 @@ 
 				if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url))
 				{
 					$this->data = $parser->get_data();
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					if (!($this->get_type()&~SIMPLEPIE_TYPE_NONE))
 					{
 						$this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
@@ -1500,7 +1500,7 @@ 
 				if (!class_exists('\UConverter')) {
 					$missingExtensions[] = 'intl (PHP 5.5+)';
 				}
-				$this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
+				$this->error .= ' Try installing/enabling the '.implode(' or ', $missingExtensions).' extension.';
 			}
 		}
 
@@ -1591,7 +1591,7 @@ 
 						else
 						{
 							$this->check_modified = false;
-							if($this->force_cache_fallback)
+							if ($this->force_cache_fallback)
 							{
 								$cache->touch();
 								return true;
@@ -1620,7 +1620,7 @@ 
 		{
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
-				$file =& $this->file;
+				$file = & $this->file;
 			}
 			else
 			{
@@ -1786,7 +1786,7 @@ 
 			$header = "Content-type: $mime;";
 			if ($this->get_encoding())
 			{
-				$header .= ' charset=' . $this->get_encoding();
+				$header .= ' charset='.$this->get_encoding();
 			}
 			else
 			{
@@ -1978,28 +1978,28 @@ 
 	public function get_feed_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_10)
+		if ($type&SIMPLEPIE_TYPE_ATOM_10)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_ATOM_03)
+		if ($type&SIMPLEPIE_TYPE_ATOM_03)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
+		if ($type&SIMPLEPIE_TYPE_RSS_RDF)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
 			{
@@ -2026,14 +2026,14 @@ 
 	public function get_channel_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
+		if ($type&SIMPLEPIE_TYPE_ATOM_ALL)
 		{
 			if ($return = $this->get_feed_tags($namespace, $tag))
 			{
 				return $return;
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
 			{
@@ -2043,7 +2043,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
 			{
@@ -2053,7 +2053,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
 			{
@@ -2083,7 +2083,7 @@ 
 	public function get_image_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
 		{
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
 			{
@@ -2093,7 +2093,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
 		{
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
 			{
@@ -2103,7 +2103,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
 			{
@@ -2130,7 +2130,7 @@ 
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if (!($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -2578,19 +2578,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -2938,7 +2938,7 @@ 
 		{
 			return round($return[0]['data']);
 		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		elseif ($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
 		}
@@ -2964,7 +2964,7 @@ 
 		{
 			return round($return[0]['data']);
 		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		elseif ($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
 		}
@@ -3144,7 +3144,7 @@ 
 
 		if (($url = $this->get_link()) !== null)
 		{
-			return 'https://www.google.com/s2/favicons?domain=' . urlencode($url);
+			return 'https://www.google.com/s2/favicons?domain='.urlencode($url);
 		}
 
 		return false;
@@ -3606,19 +3606,19 @@ 
 
 			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 			{
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
 			}
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 			{
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
 			}
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 			{
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
 			}
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
 			{
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
 			}
 			else
 			{
@@ -3838,7 +3838,7 @@ 
 		);
 		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
 
-		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+		$this->name = $this->options['extras']['prefix'].md5("$name:$type");
 
 		$this->cache = new Memcache();
 		$this->cache->addServer($this->options['host'], (int) $this->options['port']);
@@ -3972,10 +3972,10 @@ 
         );
         $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
 
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+        $this->name = $this->options['extras']['prefix'].md5("$name:$type");
 
         $this->cache = new Memcached();
-        $this->cache->addServer($this->options['host'], (int)$this->options['port']);
+        $this->cache->addServer($this->options['host'], (int) $this->options['port']);
     }
 
     /**
@@ -4009,7 +4009,7 @@ 
      * @return int Timestamp
      */
     public function mtime() {
-        $data = $this->cache->get($this->name . '_mtime');
+        $data = $this->cache->get($this->name.'_mtime');
         return (int) $data;
     }
 
@@ -4037,8 +4037,8 @@ 
     private function setData($data) {
 
         if ($data !== false) {
-            $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
-            return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
+            $this->cache->set($this->name.'_mtime', time(), (int) $this->options['extras']['timeout']);
+            return $this->cache->set($this->name, $data, (int) $this->options['extras']['timeout']);
         }
 
         return false;
@@ -4116,7 +4116,7 @@ 
 			return;
 		}
 
-		$this->id = $name . $type;
+		$this->id = $name.$type;
 
 		if (!$query = $this->mysql->query('SHOW TABLES'))
 		{
@@ -4130,23 +4130,23 @@ 
 			$db[] = $row;
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+		if (!in_array($this->options['extras']['prefix'].'cache_data', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
 			if ($query === false)
 			{
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", E_USER_WARNING);
+				trigger_error("Can't create ".$this->options['extras']['prefix']."cache_data table, check permissions", E_USER_WARNING);
 				$this->mysql = null;
 				return;
 			}
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+		if (!in_array($this->options['extras']['prefix'].'items', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
 			if ($query === false)
 			{
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", E_USER_WARNING);
+				trigger_error("Can't create ".$this->options['extras']['prefix']."items table, check permissions", E_USER_WARNING);
 				$this->mysql = null;
 				return;
 			}
@@ -4166,9 +4166,9 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
-			'`' . $this->options['extras']['prefix'] . 'items` i ' .
-			'WHERE cd.id = i.feed_id ' .
+		$query = $this->mysql->prepare('DELETE i, cd FROM `'.$this->options['extras']['prefix'].'cache_data` cd, '.
+			'`'.$this->options['extras']['prefix'].'items` i '.
+			'WHERE cd.id = i.feed_id '.
 			'AND cd.mtime < (unix_timestamp() - :purge_time)');
 		$query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
 
@@ -4183,7 +4183,7 @@ 
 
 			$prepared = self::prepare_simplepie_object_for_cache($data);
 
-			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
@@ -4192,13 +4192,13 @@ 
 					$items = count($prepared[1]);
 					if ($items)
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 						$query->bindValue(':items', $items);
 					}
 					else
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 					}
 
@@ -4212,7 +4212,7 @@ 
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
 					$query->bindValue(':feed', $this->id);
 					$query->bindValue(':count', count($prepared[1]));
 					$query->bindValue(':data', $prepared[0]);
@@ -4231,7 +4231,7 @@ 
 						$database_ids[] = $this->mysql->quote($id);
 					}
 
-					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+					$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
 					$query->bindValue(':feed', $this->id);
 
 					if ($query->execute())
@@ -4251,7 +4251,7 @@ 
 								$date = time();
 							}
 
-							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+							$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
 							$query->bindValue(':feed', $this->id);
 							$query->bindValue(':id', $new_id);
 							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
@@ -4272,13 +4272,13 @@ 
 		}
 		else
 		{
-			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
 				if ($query->rowCount() > 0)
 				{
-					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+					$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
 					$query->bindValue(':feed', $this->id);
@@ -4289,7 +4289,7 @@ 
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
 					$query->bindValue(':id', $this->id);
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
@@ -4315,7 +4315,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($row = $query->fetch()))
 		{
@@ -4334,19 +4334,19 @@ 
 			{
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
 				}
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
 				}
 				else
 				{
@@ -4355,10 +4355,10 @@ 
 
 				if ($feed !== null)
 				{
-					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+					$sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
 					if ($items > 0)
 					{
-						$sql .= ' LIMIT ' . $items;
+						$sql .= ' LIMIT '.$items;
 					}
 
 					$query = $this->mysql->prepare($sql);
@@ -4393,7 +4393,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($time = $query->fetchColumn()))
 		{
@@ -4417,7 +4417,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+		$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
 		$query->bindValue(':time', time());
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && $query->rowCount() > 0)
@@ -4442,9 +4442,9 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
-		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+		$query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
 		$query2->bindValue(':id', $this->id);
 		if ($query->execute() && $query2->execute())
 		{
@@ -4516,13 +4516,13 @@ 
         if (!is_null($options) && is_array($options)) {
             $this->options = $options;
         } else {
-            $this->options = array (
+            $this->options = array(
                 'prefix' => 'rss:simple_primary:',
                 'expire' => 0,
             );
         }
 
-        $this->name = $this->options['prefix'] . $name;
+        $this->name = $this->options['prefix'].$name;
     }
 
     /**
@@ -6841,7 +6841,7 @@ 
 	 * @param array|string $options See first paramter to {@see embed}
 	 * @return string HTML string to output
 	 */
-	public function native_embed($options='')
+	public function native_embed($options = '')
 	{
 		return $this->embed($options, true);
 	}
@@ -6915,7 +6915,7 @@ 
 		else
 		{
 			$options = explode(',', $options);
-			foreach($options as $option)
+			foreach ($options as $option)
 			{
 				$opt = explode(':', $option, 2);
 				if (isset($opt[0], $opt[1]))
@@ -7050,11 +7050,11 @@ 
 		{
 			if ($native)
 			{
-				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+				$embed .= "<embed src=\"".$this->get_link()."\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
 			}
 		}
 
@@ -7065,11 +7065,11 @@ 
 			$height += 20;
 			if ($native)
 			{
-				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
 		}
 
@@ -7082,16 +7082,16 @@ 
 			{
 				if ($placeholder !== '')
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"".$this->get_link()."\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 				else
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"".$this->get_link()."\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
 			}
 		}
 
@@ -7101,16 +7101,16 @@ 
 			$height += 45;
 			if ($native)
 			{
-				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"".$this->get_link()."\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>';
 
 		return $embed;
 	}
@@ -7130,7 +7130,7 @@ 
 	{
 		// Mime-types by handler.
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
 		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
 		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
 		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
@@ -7359,7 +7359,7 @@ 
 			}
 			if (!$force_fsockopen && function_exists('curl_exec'))
 			{
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_CURL;
 				$fp = curl_init();
 				$headers2 = array();
 				foreach ($headers as $key => $value)
@@ -7396,7 +7396,7 @@ 
 				}
 				if (curl_errno($fp))
 				{
-					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
 					$this->success = false;
 				}
 				else
@@ -7427,7 +7427,7 @@ 
 			}
 			else
 			{
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
 				$socket_host = $url_parts['host'];
 				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
@@ -7442,7 +7442,7 @@ 
 				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
 				if (!$fp)
 				{
-					$this->error = 'fsockopen error: ' . $errstr;
+					$this->error = 'fsockopen error: '.$errstr;
 					$this->success = false;
 				}
 				else
@@ -7473,7 +7473,7 @@ 
 
 					if (isset($url_parts['user']) && isset($url_parts['pass']))
 					{
-						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+						$out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
 					}
 					foreach ($headers as $key => $value)
 					{
@@ -7564,7 +7564,7 @@ 
 		}
 		else
 		{
-			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
+			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL|SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
 			if (empty($url) || !($this->body = trim(file_get_contents($url))))
 			{
 				$this->error = 'file_get_contents could not read the file';
@@ -7789,7 +7789,7 @@ 
 			// We should only use the last Content-Type header. c.f. issue #1
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
 			{
-				$this->headers[$this->name] .= ', ' . $this->value;
+				$this->headers[$this->name] .= ', '.$this->value;
 			}
 			else
 			{
@@ -7999,7 +7999,7 @@ 
 
 		while (true)
 		{
-			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+			$is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
 			if (!$is_chunked)
 			{
 				// Looks like it's not chunked after all
@@ -8154,9 +8154,9 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), $value);
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -8167,7 +8167,7 @@ 
 			|| $name === 'ifragment'
 		)
 		{
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -8197,7 +8197,7 @@ 
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
 		{
 			$name = $prop;
 			$return = $this->$prop;
@@ -8210,7 +8210,7 @@ 
 		}
 		else
 		{
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -8232,7 +8232,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		if (method_exists($this, 'get_'.$name) || isset($this->$name))
 		{
 			return true;
 		}
@@ -8249,9 +8249,9 @@ 
 	 */
 	public function __unset($name)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), '');
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -8327,11 +8327,11 @@ 
 							}
 							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
-								$target->ipath = '/' . $relative->ipath;
+								$target->ipath = '/'.$relative->ipath;
 							}
 							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
-								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 							}
 							else
 							{
@@ -8467,7 +8467,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -8506,23 +8506,23 @@ 
 
 			// No one byte sequences are valid due to the while.
 			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0)
+			if (($value&0xE0) === 0xC0)
 			{
-				$character = ($value & 0x1F) << 6;
+				$character = ($value&0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0)
+			elseif (($value&0xF0) === 0xE0)
 			{
-				$character = ($value & 0x0F) << 12;
+				$character = ($value&0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0)
+			elseif (($value&0xF8) === 0xF0)
 			{
-				$character = ($value & 0x07) << 18;
+				$character = ($value&0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
@@ -8543,9 +8543,9 @@ 
 						$value = ord($string[$position]);
 
 						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80)
+						if (($value&0xC0) === 0x80)
 						{
-							$character |= ($value & 0x3F) << (--$remaining * 6);
+							$character |= ($value&0x3F) << (--$remaining*6);
 						}
 						// If it is invalid, count the sequence as invalid and reprocess the current byte:
 						else
@@ -8573,7 +8573,7 @@ 
 				|| $length > 3 && $character <= 0xFFFF
 				// Outside of range of ucschar codepoints
 				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
+				|| ($character&0xFFFE) === 0xFFFE
 				|| $character >= 0xFDD0 && $character <= 0xFDEF
 				|| (
 					// Everything else not in ucschar
@@ -8648,23 +8648,23 @@ 
 					$length = 1;
 				}
 				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0)
+				elseif (($value&0xE0) === 0xC0)
 				{
-					$character = ($value & 0x1F) << 6;
+					$character = ($value&0x1F) << 6;
 					$length = 2;
 					$remaining = 1;
 				}
 				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0)
+				elseif (($value&0xF0) === 0xE0)
 				{
-					$character = ($value & 0x0F) << 12;
+					$character = ($value&0x0F) << 12;
 					$length = 3;
 					$remaining = 2;
 				}
 				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0)
+				elseif (($value&0xF8) === 0xF0)
 				{
-					$character = ($value & 0x07) << 18;
+					$character = ($value&0x07) << 18;
 					$length = 4;
 					$remaining = 3;
 				}
@@ -8679,10 +8679,10 @@ 
 			else
 			{
 				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80)
+				if (($value&0xC0) === 0x80)
 				{
 					$remaining--;
-					$character |= ($value & 0x3F) << ($remaining * 6);
+					$character |= ($value&0x3F) << ($remaining*6);
 				}
 				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
 				else
@@ -8708,7 +8708,7 @@ 
 					|| $character < 0x2D
 					|| $character > 0xEFFFD
 					// Noncharacters
-					|| ($character & 0xFFFE) === 0xFFFE
+					|| ($character&0xFFFE) === 0xFFFE
 					|| $character >= 0xFDD0 && $character <= 0xFDEF
 					// Everything else not in iunreserved (this is all BMP)
 					|| $character === 0x2F
@@ -8721,7 +8721,7 @@ 
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else
@@ -8740,7 +8740,7 @@ 
 		{
 			for ($j = $start; $j < $len; $j++)
 			{
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -8999,7 +8999,7 @@ 
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
-				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+				$this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else
 			{
@@ -9095,7 +9095,7 @@ 
 			$removed = $this->remove_dot_segments($valid);
 
 			$cache[$ipath] = array($valid, $removed);
-			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
 		}
 
 		$this->scheme_normalization();
@@ -9182,11 +9182,11 @@ 
 		$iri = '';
 		if ($this->scheme !== null)
 		{
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null)
 		{
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		if ($this->ipath !== '')
 		{
@@ -9198,11 +9198,11 @@ 
 		}
 		if ($this->iquery !== null)
 		{
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null)
 		{
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -9230,7 +9230,7 @@ 
 			$iauthority = '';
 			if ($this->iuserinfo !== null)
 			{
-				$iauthority .= $this->iuserinfo . '@';
+				$iauthority .= $this->iuserinfo.'@';
 			}
 			if ($this->ihost !== null)
 			{
@@ -9238,7 +9238,7 @@ 
 			}
 			if ($this->port !== null)
 			{
-				$iauthority .= ':' . $this->port;
+				$iauthority .= ':'.$this->port;
 			}
 			return $iauthority;
 		}
@@ -10273,19 +10273,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -10626,12 +10626,12 @@ 
 					if (sizeof($temp) > 0)
 					{
 						$minutes = (int) array_pop($temp);
-						$seconds += $minutes * 60;
+						$seconds += $minutes*60;
 					}
 					if (sizeof($temp) > 0)
 					{
 						$hours = (int) array_pop($temp);
-						$seconds += $hours * 3600;
+						$seconds += $hours*3600;
 					}
 					unset($temp);
 					$duration_parent = $seconds;
@@ -10986,7 +10986,7 @@ 
 			// If we have media:group tags, loop through them.
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
 			{
-				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
 				{
 					// If we have media:content tags, loop through them.
 					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
@@ -12293,34 +12293,34 @@ 
 			}
 		}
 
-		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
+		if ($type&~SIMPLEPIE_LOCATOR_NONE)
 		{
 			$this->get_base();
 		}
 
-		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
+		if ($type&SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
 		{
 			return $working[0];
 		}
 
-		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
+		if ($type&(SIMPLEPIE_LOCATOR_LOCAL_EXTENSION|SIMPLEPIE_LOCATOR_LOCAL_BODY|SIMPLEPIE_LOCATOR_REMOTE_EXTENSION|SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
 		{
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
 			{
 				return $working[0];
 			}
@@ -12625,22 +12625,22 @@ 
 	{
 		$time = '';
 
-		$hours = floor($seconds / 3600);
-		$remainder = $seconds % 3600;
+		$hours = floor($seconds/3600);
+		$remainder = $seconds%3600;
 		if ($hours > 0)
 		{
 			$time .= $hours.':';
 		}
 
-		$minutes = floor($remainder / 60);
-		$seconds = $remainder % 60;
+		$minutes = floor($remainder/60);
+		$seconds = $remainder%60;
 		if ($minutes < 10 && $hours > 0)
 		{
-			$minutes = '0' . $minutes;
+			$minutes = '0'.$minutes;
 		}
 		if ($seconds < 10)
 		{
-			$seconds = '0' . $seconds;
+			$seconds = '0'.$seconds;
 		}
 
 		$time .= $minutes.':';
@@ -12671,7 +12671,7 @@ 
 	{
 		$return = array();
 		$name = preg_quote($realname, '/');
-		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
 		{
 			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
 			{
@@ -12688,7 +12688,7 @@ 
 					$return[$i]['content'] = $matches[$i][4][0];
 				}
 				$return[$i]['attribs'] = array();
-				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' '.$matches[$i][2][0].' ', $attribs, PREG_SET_ORDER))
 				{
 					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
 					{
@@ -12710,7 +12710,7 @@ 
 		foreach ($element['attribs'] as $key => $value)
 		{
 			$key = strtolower($key);
-			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
+			$full .= " $key=\"".htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8').'"';
 		}
 		if ($element['self_closing'])
 		{
@@ -12725,7 +12725,7 @@ 
 
 	public static function error($message, $level, $file, $line)
 	{
-		if ((ini_get('error_reporting') & $level) > 0)
+		if ((ini_get('error_reporting')&$level) > 0)
 		{
 			switch ($level)
 			{
@@ -14343,7 +14343,7 @@ 
 				$data = '';
 			}
 		}
-		return $output . $data;
+		return $output.$data;
 	}
 
 	public static function parse_date($dt)
@@ -14453,23 +14453,23 @@ 
 			{
 				case 'text':
 				case 'text/plain':
-					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+					return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
 
 				case 'html':
 				case 'text/html':
-					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
+					return SIMPLEPIE_CONSTRUCT_HTML|$mode;
 
 				case 'xhtml':
 				case 'application/xhtml+xml':
-					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
+					return SIMPLEPIE_CONSTRUCT_XHTML|$mode;
 
 				default:
-					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
+					return SIMPLEPIE_CONSTRUCT_NONE|$mode;
 			}
 		}
 		else
 		{
-			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+			return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
 		}
 	}
 
@@ -14570,15 +14570,15 @@ 
 		}
 		else if ($codepoint <= 0x7ff)
 		{
-			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xc0|($codepoint >> 6)).chr(0x80|($codepoint&0x3f));
 		}
 		else if ($codepoint <= 0xffff)
 		{
-			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xe0|($codepoint >> 12)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
 		}
 		else if ($codepoint <= 0x10ffff)
 		{
-			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xf0|($codepoint >> 18)).chr(0x80|(($codepoint >> 12)&0x3f)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
 		}
 		else
 		{
@@ -14734,7 +14734,7 @@ 
 		}
 		header('Content-type: text/javascript; charset: UTF-8');
 		header('Cache-Control: must-revalidate');
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days
 		?>
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
 	if (placeholder != '') {
@@ -14768,14 +14768,14 @@ 
 	public static function get_build()
 	{
 		$root = dirname(dirname(__FILE__));
-		if (file_exists($root . '/.git/index'))
+		if (file_exists($root.'/.git/index'))
 		{
-			return filemtime($root . '/.git/index');
+			return filemtime($root.'/.git/index');
 		}
-		elseif (file_exists($root . '/SimplePie'))
+		elseif (file_exists($root.'/SimplePie'))
 		{
 			$time = 0;
-			foreach (glob($root . '/SimplePie/*.php') as $file)
+			foreach (glob($root.'/SimplePie/*.php') as $file)
 			{
 				if (($mtime = filemtime($file)) > $time)
 				{
@@ -14784,9 +14784,9 @@ 
 			}
 			return $time;
 		}
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		elseif (file_exists(dirname(__FILE__).'/Core.php'))
 		{
-			return filemtime(dirname(__FILE__) . '/Core.php');
+			return filemtime(dirname(__FILE__).'/Core.php');
 		}
 		else
 		{
@@ -14799,11 +14799,11 @@ 
 	 */
 	public static function debug(&$sp)
 	{
-		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
-		$info .= 'PHP ' . PHP_VERSION . "\n";
+		$info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n";
+		$info .= 'PHP '.PHP_VERSION."\n";
 		if ($sp->error() !== null)
 		{
-			$info .= 'Error occurred: ' . $sp->error() . "\n";
+			$info .= 'Error occurred: '.$sp->error()."\n";
 		}
 		else
 		{
@@ -14819,20 +14819,20 @@ 
 				switch ($ext)
 				{
 					case 'pcre':
-						$info .= '      Version ' . PCRE_VERSION . "\n";
+						$info .= '      Version '.PCRE_VERSION."\n";
 						break;
 					case 'curl':
 						$version = curl_version();
-						$info .= '      Version ' . $version['version'] . "\n";
+						$info .= '      Version '.$version['version']."\n";
 						break;
 					case 'mbstring':
-						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+						$info .= '      Overloading: '.mb_get_info('func_overload')."\n";
 						break;
 					case 'iconv':
-						$info .= '      Version ' . ICONV_VERSION . "\n";
+						$info .= '      Version '.ICONV_VERSION."\n";
 						break;
 					case 'xml':
-						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+						$info .= '      Version '.LIBXML_DOTTED_VERSION."\n";
 						break;
 				}
 			}
@@ -14930,7 +14930,7 @@ 
 			// xxx::xxx
 			else
 			{
-				$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+				$fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
 				$ip = str_replace('::', $fill, $ip);
 			}
 		}
@@ -15581,8 +15581,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+		$this->day_pcre = '('.implode(array_keys($this->day), '|').')';
+		$this->month_pcre = '('.implode(array_keys($this->month), '|').')';
 
 		static $cache;
 		if (!isset($cache[get_class($this)]))
@@ -15684,7 +15684,7 @@ 
 			$month = $day = $hour = $minute = $second = '([0-9]{2})';
 			$decimal = '([0-9]*)';
 			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+			$pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -15717,8 +15717,8 @@ 
 			// Numeric timezone
 			if (isset($match[9]) && $match[9] !== '')
 			{
-				$timezone = $match[10] * 3600;
-				$timezone += $match[11] * 60;
+				$timezone = $match[10]*3600;
+				$timezone += $match[11]*60;
 				if ($match[9] === '-')
 				{
 					$timezone = 0 - $timezone;
@@ -15730,7 +15730,7 @@ 
 			}
 
 			// Convert the number of seconds to an integer, taking decimals into account
-			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7])));
+			$second = round((int) $match[6] + (int) $match[7]/pow(10, strlen($match[7])));
 
 			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
 		}
@@ -15813,8 +15813,8 @@ 
 		if (!$pcre)
 		{
 			$wsp = '[\x09\x20]';
-			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-			$optional_fws = $fws . '?';
+			$fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
+			$optional_fws = $fws.'?';
 			$day_name = $this->day_pcre;
 			$month = $this->month_pcre;
 			$day = '([0-9]{1,2})';
@@ -15822,8 +15822,8 @@ 
 			$year = '([0-9]{2,4})';
 			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
 			$character_zone = '([A-Z]{1,5})';
-			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+			$zone = '(?:'.$num_zone.'|'.$character_zone.')';
+			$pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
 		}
 		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
 		{
@@ -15848,8 +15848,8 @@ 
 			// Numeric timezone
 			if ($match[8] !== '')
 			{
-				$timezone = $match[9] * 3600;
-				$timezone += $match[10] * 60;
+				$timezone = $match[9]*3600;
+				$timezone += $match[10]*60;
 				if ($match[8] === '-')
 				{
 					$timezone = 0 - $timezone;
@@ -15911,7 +15911,7 @@ 
 			$day = '([0-9]{1,2})';
 			$year = $hour = $minute = $second = '([0-9]{2})';
 			$zone = '([A-Z]{1,5})';
-			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+			$pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -15977,7 +15977,7 @@ 
 			$hour = $sec = $min = '([0-9]{2})';
 			$year = '([0-9]{4})';
 			$terminator = '\x0A?\x00?';
-			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+			$pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -16113,7 +16113,7 @@ 
 			if ($declaration->parse())
 			{
 				$data = substr($data, $pos + 2);
-				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
+				$data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'."\n".$this->declare_html_entities().$data;
 			}
 			else
 			{
@@ -16169,7 +16169,7 @@ 
 					case constant('XMLReader::END_ELEMENT'):
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -16181,7 +16181,7 @@ 
 						$empty = $xml->isEmptyElement;
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -16192,7 +16192,7 @@ 
 						{
 							if ($xml->namespaceURI !== '')
 							{
-								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+								$attrName = $xml->namespaceURI.$this->separator.$xml->localName;
 							}
 							else
 							{
@@ -16298,12 +16298,12 @@ 
 			$this->current_xhtml_construct++;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
 			{
-				$this->data['data'] .= '<' . end($this->element);
+				$this->data['data'] .= '<'.end($this->element);
 				if (isset($attribs['']))
 				{
 					foreach ($attribs[''] as $name => $value)
 					{
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+						$this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
 					}
 				}
 				$this->data['data'] .= '>';
@@ -16311,8 +16311,8 @@ 
 		}
 		else
 		{
-			$this->datas[] =& $this->data;
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->datas[] = & $this->data;
+			$this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
 			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
 			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
 			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -16344,12 +16344,12 @@ 
 			$this->current_xhtml_construct--;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
 			{
-				$this->data['data'] .= '</' . end($this->element) . '>';
+				$this->data['data'] .= '</'.end($this->element).'>';
 			}
 		}
 		if ($this->current_xhtml_construct === -1)
 		{
-			$this->data =& $this->datas[count($this->datas) - 1];
+			$this->data = & $this->datas[count($this->datas) - 1];
 			array_pop($this->datas);
 		}
 
@@ -16384,7 +16384,7 @@ 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
 				{
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
@@ -17227,11 +17227,11 @@ 
 	public function sanitize($data, $type, $base = '')
 	{
 		$data = trim($data);
-		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
+		if ($data !== '' || $type&SIMPLEPIE_CONSTRUCT_IRI)
 		{
-			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
+			if ($type&SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
-				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
 				}
@@ -17241,12 +17241,12 @@ 
 				}
 			}
 
-			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
+			if ($type&SIMPLEPIE_CONSTRUCT_BASE64)
 			{
 				$data = base64_decode($data);
 			}
 
-			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
+			if ($type&(SIMPLEPIE_CONSTRUCT_HTML|SIMPLEPIE_CONSTRUCT_XHTML))
 			{
 
 				if (!class_exists('DOMDocument'))
@@ -17322,7 +17322,7 @@ 
 
 							if ($cache->load())
 							{
-								$img->setAttribute('src', $this->image_handler . $image_url);
+								$img->setAttribute('src', $this->image_handler.$image_url);
 							}
 							else
 							{
@@ -17333,7 +17333,7 @@ 
 								{
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
 									{
-										$img->setAttribute('src', $this->image_handler . $image_url);
+										$img->setAttribute('src', $this->image_handler.$image_url);
 									}
 									else
 									{
@@ -17359,16 +17359,16 @@ 
 
 				if ($this->remove_div)
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
 					$data = preg_replace('/<\/div>$/', '', $data);
 				}
 				else
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
 				}
 			}
 
-			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
+			if ($type&SIMPLEPIE_CONSTRUCT_IRI)
 			{
 				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
 				if ($absolute !== false)
@@ -17377,7 +17377,7 @@ 
 				}
 			}
 
-			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
+			if ($type&(SIMPLEPIE_CONSTRUCT_TEXT|SIMPLEPIE_CONSTRUCT_IRI))
 			{
 				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
 			}
@@ -17394,11 +17394,11 @@ 
 	{
 		$ret = '';
 		$html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
-		if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
+		if ($type&~SIMPLEPIE_CONSTRUCT_XHTML)
 		{
 			// Atom XHTML constructs are wrapped with a div by default
 			// Note: No protection if $html contains a stray </div>!
-			$html = '<div>' . $html . '</div>';
+			$html = '<div>'.$html.'</div>';
 			$ret .= '<!DOCTYPE html>';
 			$content_type = 'text/html';
 		}
@@ -17409,8 +17409,8 @@ 
 		}
 
 		$ret .= '<html><head>';
-		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-		$ret .= '</head><body>' . $html . '</body></html>';
+		$ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
+		$ret .= '</head><body>'.$html.'</body></html>';
 		return $ret;
 	}
 
@@ -17468,7 +17468,7 @@ 
 
 	protected function strip_tag($tag, $document, $xpath, $type)
 	{
-		$elements = $xpath->query('body//' . $tag);
+		$elements = $xpath->query('body//'.$tag);
 		if ($this->encode_instead_of_strip)
 		{
 			foreach ($elements as $element)
@@ -17478,7 +17478,7 @@ 
 				// For elements which aren't script or style, include the tag itself
 				if (!in_array($tag, array('script', 'style')))
 				{
-					$text = '<' . $tag;
+					$text = '<'.$tag;
 					if ($element->hasAttributes())
 					{
 						$attrs = array();
@@ -17487,21 +17487,21 @@ 
 							$value = $attr->value;
 
 							// In XHTML, empty values should never exist, so we repeat the value
-							if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
+							if (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_XHTML))
 							{
 								$value = $name;
 							}
 							// For HTML, empty is fine
-							elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
+							elseif (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_HTML))
 							{
 								$attrs[] = $name;
 								continue;
 							}
 
 							// Standard attribute text
-							$attrs[] = $name . '="' . $attr->value . '"';
+							$attrs[] = $name.'="'.$attr->value.'"';
 						}
-						$text .= ' ' . implode(' ', $attrs);
+						$text .= ' '.implode(' ', $attrs);
 					}
 					$text .= '>';
 					$fragment->appendChild(new DOMText($text));
@@ -17516,7 +17516,7 @@ 
 
 				if (!in_array($tag, array('script', 'style')))
 				{
-					$fragment->appendChild(new DOMText('</' . $tag . '>'));
+					$fragment->appendChild(new DOMText('</'.$tag.'>'));
 				}
 
 				$element->parentNode->replaceChild($fragment, $element);
@@ -17552,7 +17552,7 @@ 
 
 	protected function strip_attr($attrib, $xpath)
 	{
-		$elements = $xpath->query('//*[@' . $attrib . ']');
+		$elements = $xpath->query('//*[@'.$attrib.']');
 
 		foreach ($elements as $element)
 		{
@@ -17959,19 +17959,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -18734,7 +18734,7 @@ 
 					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
 
 					// Check the CRC matches
-					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
+					if ((crc32(substr($this->compressed_data, 0, $this->position))&0xFFFF) === $crc)
 					{
 						$this->position += 2;
 					}
@@ -18770,7 +18770,7 @@ 
 			// Check ISIZE of data
 			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
 			$this->position += 4;
-			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
+			if (sprintf('%u', strlen($this->data)&0xFFFFFFFF) !== sprintf('%u', $isize))
 			{
 				return false;
 			}

owner-statistics-time.php

Spacing +16 added lines, -16 removed lines

@@ -9,22 +9,22 @@ 
 }
 $Spotter = new Spotter();
 $SpotterArchive = new SpotterArchive();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
 $archive = false;
-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
 	$archive = true;
-	$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+	$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 }
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day of %s"),$spotter_array[0]['aircraft_owner']);
+	$title = sprintf(_("Most Common Time of Day of %s"), $spotter_array[0]['aircraft_owner']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
@@ -35,12 +35,12 @@ 
 	include('owner-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day of flights owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
 
 	if ($archive === false) {
-		$hour_array = $Spotter->countAllHoursByOwner($owner,$filter);
+		$hour_array = $Spotter->countAllHoursByOwner($owner, $filter);
 	} else {
-		$hour_array = $SpotterArchive->countAllHoursByOwner($owner,$filter);
+		$hour_array = $SpotterArchive->countAllHoursByOwner($owner, $filter);
 	}
 	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -49,9 +49,9 @@ 
 	$hour_data = '';
 	$hour_cnt = '';
 	$last = 0;
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
-		while($last != $hour_item['hour_name']) {
+		while ($last != $hour_item['hour_name']) {
 			$hour_data .= '"'.$last.':00",';
 			$hour_cnt .= '0,';
 			$last++;
@@ -61,7 +61,7 @@ 
 		$hour_cnt .= $hour_item['hour_count'].',';
 	}
 	$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-	$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+	$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 	print 'c3.generate({
 	    bindto: "#chartHour",
 	    data: {
@@ -86,7 +86,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($hour_array as $hour_item)
+		foreach ($hour_array as $hour_item)
 		{
 			print '<tr>';
 			print '<td>'.$hour_item['hour_name'].':00</td>';

owner-statistics-registration.php

Spacing +13 added lines, -13 removed lines

@@ -9,21 +9,21 @@ 
 }
 $Spotter = new Spotter();
 $SpotterArchive = new SpotterArchive();
-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
 $archive = false;
-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-	$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+	$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 }
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by Registration of %s"),$spotter_array[0]['aircraft_owner']);
+	$title = sprintf(_("Most Common Aircraft by Registration of %s"), $spotter_array[0]['aircraft_owner']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
@@ -34,11 +34,11 @@ 
 	include('owner-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 owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by Registration of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
 	if ($archive === false) {
-		$aircraft_array = $Spotter->countAllAircraftRegistrationByOwner($owner,$filter);
+		$aircraft_array = $Spotter->countAllAircraftRegistrationByOwner($owner, $filter);
 	} else {
-		$aircraft_array = $SpotterArchive->countAllAircraftRegistrationByOwner($owner,$filter);
+		$aircraft_array = $SpotterArchive->countAllAircraftRegistrationByOwner($owner, $filter);
 	}
 	
 	if (!empty($aircraft_array))
@@ -55,7 +55,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>';