Remove leftovers from refactor

This commit is contained in:
int2001
2026-02-07 04:29:26 +00:00
parent c0596051df
commit 4878755933
2 changed files with 2 additions and 4 deletions

View File

@@ -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'];

View File

@@ -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'];
}
}