From 4878755933b02bd94f4e8bdfbbb555b429f9e3ac Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 7 Feb 2026 04:29:26 +0000 Subject: [PATCH] Remove leftovers from refactor --- application/controllers/Logbookadvanced.php | 4 ++-- application/models/Logbookadvanced_model.php | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index affa2131e..5c0e926be 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -512,7 +512,7 @@ class Logbookadvanced extends CI_Controller { $data['mycallsign'] = $qso['station_callsign']; $data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON'])); $data['satname'] = $qso['COL_SAT_NAME']; - $data['orbit'] = $qso['sat_orbit'] ?? $qso['orbit'] ?? null; + $data['orbit'] = $qso['orbit'] ?? null; $data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false; $data['dxccFlag'] = $this->dxccflag->get($qso['COL_DXCC']); $data['id'] = $qso['COL_PRIMARY_KEY']; @@ -545,7 +545,7 @@ class Logbookadvanced extends CI_Controller { $data['mycallsign'] = $qso['station_callsign']; $data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON'])); $data['satname'] = $qso['COL_SAT_NAME']; - $data['orbit'] = $qso['sat_orbit'] ?? $qso['orbit'] ?? null; + $data['orbit'] = $qso['orbit'] ?? null; $data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false; $data['dxccFlag'] = $this->dxccflag->get($qso['COL_DXCC']); $data['id'] = $qso['COL_PRIMARY_KEY']; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 77e3e44be..41b187ff0 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -667,11 +667,9 @@ class Logbookadvanced_model extends CI_Model { foreach ($results as &$row) { $row->sat_name = $row->COL_SAT_NAME ?? null; $row->sat_displayname = null; - $row->sat_orbit = null; $row->orbit = null; if (!empty($row->COL_SAT_NAME) && isset($satellites[$row->COL_SAT_NAME])) { $row->sat_displayname = $satellites[$row->COL_SAT_NAME]['displayname']; - $row->sat_orbit = $satellites[$row->COL_SAT_NAME]['orbit']; $row->orbit = $satellites[$row->COL_SAT_NAME]['orbit']; } }