diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index acfb06e64..48c42f83d 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -261,11 +261,10 @@ class Satellite extends CI_Controller {
$date = $this->security->xss_clean($this->input->post('date'));
$mintime = $this->security->xss_clean($this->input->post('mintime'));
$minelevation = $this->security->xss_clean($this->input->post('minelevation'));
- $timezone = $this->security->xss_clean($this->input->post('timezone'));
if (($this->security->xss_clean($this->input->post('sat')) ?? '') != '') { // specific SAT
- $data = $this->calcPass($tles[0], $yourgrid, $altitude, $date, $mintime, $minelevation, $timezone);
+ $data = $this->calcPass($tles[0], $yourgrid, $altitude, $date, $mintime, $minelevation);
} else { // All SATs
- $data = $this->calcPasses($tles, $yourgrid, $altitude, $date, $mintime,$minelevation, $timezone);
+ $data = $this->calcPasses($tles, $yourgrid, $altitude, $date, $mintime,$minelevation);
}
$this->load->view('satellite/passtable', $data);
}
@@ -280,7 +279,7 @@ class Satellite extends CI_Controller {
try {
$tle = $this->get_tle_for_predict();
- $this->calcSkedPass($tle);
+ $this->calcSkedPass($tle[0]);
}
catch (Exception $e) {
header("Content-type: application/json");
@@ -305,7 +304,7 @@ class Satellite extends CI_Controller {
return $tles;
}
- function calcPasses($sat_tles, $yourgrid, $altitude, $date, $mintime, $minelevation, $timezone) {
+ function calcPasses($sat_tles, $yourgrid, $altitude, $date, $mintime, $minelevation, $timezone = 'UTC') {
if(!$this->user_model->authorize(3)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
require_once "./src/predict/Predict.php";
@@ -385,7 +384,7 @@ class Satellite extends CI_Controller {
}
-function calcPass($sat_tle, $yourgrid, $altitude, $date, $mintime, $minelevation, $timezone) {
+function calcPass($sat_tle, $yourgrid, $altitude, $date, $mintime, $minelevation, $timezone = 'UTC') {
if(!$this->user_model->authorize(3)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
require_once "./src/predict/Predict.php";
@@ -462,15 +461,15 @@ function calcPass($sat_tle, $yourgrid, $altitude, $date, $mintime, $minelevation
$yourgrid = $this->security->xss_clean($this->input->post('yourgrid'));
$altitude = $this->security->xss_clean($this->input->post('altitude'));
$date = $this->security->xss_clean($this->input->post('date'));
+ $mintime = $this->security->xss_clean($this->input->post('mintime'));
$minelevation = $this->security->xss_clean($this->input->post('minelevation'));
- $timezone = $this->security->xss_clean($this->input->post('timezone'));
- $homePass = $this->calcPass($tle, $yourgrid, $altitude, $date, $minelevation, $timezone);
+ $homePass = $this->calcPass($tle, $yourgrid, $altitude, $date, $mintime, $minelevation);
$skedgrid = $this->security->xss_clean($this->input->post('skedgrid'));
$minskedelevation = $this->security->xss_clean($this->input->post('minskedelevation'));
- $skedPass = $this->calcPass($tle, $skedgrid, 0, $date, $minskedelevation, $timezone);
+ $skedPass = $this->calcPass($tle, $skedgrid, 0, $date, $mintime, $minskedelevation);
// Get Date format
if ($this->session->userdata('user_date_format')) {
@@ -484,7 +483,6 @@ function calcPass($sat_tle, $yourgrid, $altitude, $date, $mintime, $minelevation
$data['format'] = $custom_date_format . ' H:i:s';
$data['overlaps'] = $this->findOverlaps($homePass, $skedPass);
- $data['zone'] = $timezone;
$data['yourgrid'] = $yourgrid;
$data['skedgrid'] = $skedgrid;
$data['date'] = $date;
diff --git a/application/views/satellite/pass.php b/application/views/satellite/pass.php
index cfed58a17..d851c24d8 100644
--- a/application/views/satellite/pass.php
+++ b/application/views/satellite/pass.php
@@ -35,443 +35,6 @@
-
-
-
-
diff --git a/application/views/satellite/skedtable.php b/application/views/satellite/skedtable.php
index d8bee7453..37a80e9bf 100644
--- a/application/views/satellite/skedtable.php
+++ b/application/views/satellite/skedtable.php
@@ -19,13 +19,13 @@ if (!empty($overlaps)) {
echo '
';
echo '| ' . strtoupper($yourgrid) . ' | ';
echo '' . $overlap['grid1']->satname . ' | ';
- echo '' . Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone, $format) . ' | ';
- echo '' . returntimediff(Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone, $format), Predict_Time::daynum2readable($overlap['grid1']->visible_los, $zone, $format), $format) . ' | ';
+ echo '' . Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone ?? 'UTC', $format) . ' | ';
+ echo '' . returntimediff(Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone ?? 'UTC', $format), Predict_Time::daynum2readable($overlap['grid1']->visible_los, $zone ?? 'UTC', $format), $format) . ' | ';
$aos_az = round($overlap['grid1']->visible_aos_az);
echo '' . $aos_az . ' ° (' . azDegreesToDirection($overlap['grid1']->visible_aos_az) . ') | ';
$max_el = round($overlap['grid1']->max_el);
echo '' . $max_el . ' ° | ';
- echo '' . Predict_Time::daynum2readable($overlap['grid1']->visible_los, $zone, $format) . ' | ';
+ echo '' . Predict_Time::daynum2readable($overlap['grid1']->visible_los, $zone ?? 'UTC', $format) . ' | ';
$los_az = round($overlap['grid1']->visible_los_az);
echo '' . $los_az . ' ° (' . azDegreesToDirection($overlap['grid1']->visible_los_az) . ') | ';
echo '
';
@@ -33,13 +33,13 @@ if (!empty($overlaps)) {
echo '';
echo '| ' . strtoupper($skedgrid) . ' | ';
echo '' . $overlap['grid2']->satname . ' | ';
- echo '' . Predict_Time::daynum2readable($overlap['grid2']->visible_aos, $zone, $format) . ' | ';
- echo '' . returntimediff(Predict_Time::daynum2readable($overlap['grid2']->visible_aos, $zone, $format), Predict_Time::daynum2readable($overlap['grid2']->visible_los, $zone, $format), $format) . ' | ';
+ echo '' . Predict_Time::daynum2readable($overlap['grid2']->visible_aos, $zone ?? 'UTC', $format) . ' | ';
+ echo '' . returntimediff(Predict_Time::daynum2readable($overlap['grid2']->visible_aos, $zone ?? 'UTC', $format), Predict_Time::daynum2readable($overlap['grid2']->visible_los, $zone ?? 'UTC', $format), $format) . ' | ';
$aos_az = round($overlap['grid2']->visible_aos_az);
echo '' . $aos_az . ' ° (' . azDegreesToDirection($overlap['grid2']->visible_aos_az) . ') | ';
$max_el = round($overlap['grid2']->max_el);
echo '' . $max_el . ' ° | ';
- echo '' . Predict_Time::daynum2readable($overlap['grid2']->visible_los, $zone, $format) . ' | ';
+ echo '' . Predict_Time::daynum2readable($overlap['grid2']->visible_los, $zone ?? 'UTC', $format) . ' | ';
$los_az = round($overlap['grid2']->visible_los_az);
echo '' . $los_az . ' ° (' . azDegreesToDirection($overlap['grid2']->visible_los_az) . ') | ';
echo '
';
@@ -64,7 +64,7 @@ if (!empty($overlaps)) {
foreach ($overlaps as $overlap) {
$satellite = $overlap['grid1']->satname;
- $skedDate = Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone, $format);
+ $skedDate = Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone ?? 'UTC', $format);
$skedAOS = $overlap['grid1']->visible_aos < $overlap['grid2']->visible_aos ? $overlap['grid2']->visible_aos : $overlap['grid1']->visible_aos;
$skedLOS = $overlap['grid1']->visible_los < $overlap['grid2']->visible_los ? $overlap['grid1']->visible_los : $overlap['grid2']->visible_los;
@@ -73,9 +73,9 @@ if (!empty($overlaps)) {
echo '';
echo "| ". $satellite . " | ";
echo "" . date($custom_date_format, $timestamp) . " | ";
- echo "" . Predict_Time::daynum2readable($skedAOS, $zone, $format) . " | ";
- echo "" . Predict_Time::daynum2readable($skedLOS, $zone, $format) . " | ";
- echo "" . returntimediff(Predict_Time::daynum2readable($skedAOS, $zone, $format), Predict_Time::daynum2readable($skedLOS, $zone, $format), $format) . " | ";
+ echo "" . Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format) . " | ";
+ echo "" . Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format) . " | ";
+ echo "" . returntimediff(Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format), Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format), $format) . " | ";
echo "";
}
} else {