From 12e4841b47c40d94a2329471980dd996fa564386 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 3 Jun 2024 16:04:38 +0200 Subject: [PATCH] removed loading of frequency library (is part of autoload) --- application/controllers/Cfdexport.php | 1 - application/controllers/Qso.php | 1 - application/models/Logbook_model.php | 1 - application/models/Logbookadvanced_model.php | 1 - application/views/dashboard/index.php | 1 - application/views/qso/components/previous_contacts.php | 1 - application/views/view_log/partial/log_ajax.php | 2 -- application/views/visitor/index.php | 1 - 8 files changed, 9 deletions(-) diff --git a/application/controllers/Cfdexport.php b/application/controllers/Cfdexport.php index 7290cf214..8f9164a51 100644 --- a/application/controllers/Cfdexport.php +++ b/application/controllers/Cfdexport.php @@ -34,7 +34,6 @@ class Cfdexport extends CI_Controller { $fromdate = xss_clean($this->input->post('from')); $todate = xss_clean($this->input->post('to')); - $this->load->library('frequency'); // Get QSOs with Valid QRAs $qsos = $this->logbook_model->cfd_get_all_qsos($fromdate, $todate); $output=strtoupper($this->session->userdata('user_callsign'))."\n"; diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index dfcf07454..cc8d10f42 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -432,7 +432,6 @@ class QSO extends CI_Controller { function band_to_freq($band, $mode) { if ($band != null and $band != 'null') { - $this->load->library('frequency'); echo $this->frequency->convert_band($band, $mode); } diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 744243de1..4d5fe2891 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3440,7 +3440,6 @@ function lotw_last_qsl_date($user_id) { return($returner); } - $this->load->library('frequency'); $my_error = ""; // Join date+time diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index f27ee4077..98c4e1344 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -541,7 +541,6 @@ class Logbookadvanced_model extends CI_Model { ", " . $this->config->item('table_name').".COL_FREQ_RX = ?" . " WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?"; - $this->load->library('frequency'); $frequencyBand = $this->frequency->defaultFrequencies[$value]['CW']; $frequencyBandRx = $bandrx == '' ? null : $this->frequency->defaultFrequencies[$bandrx]['CW']; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 597172167..192a25730 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -36,7 +36,6 @@ function echo_table_col($row, $name) { case 'Distance': echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo strtolower($row->COL_BAND); } echo ''; break; case 'Frequency': - $ci->load->library('frequency'); echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break; case 'State': echo '' . ($row->COL_STATE) . ''; break; case 'Operator': echo '' . ($row->COL_OPERATOR) . ''; break; diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php index 283818269..fb4a69249 100644 --- a/application/views/qso/components/previous_contacts.php +++ b/application/views/qso/components/previous_contacts.php @@ -67,7 +67,6 @@ function echo_table_col($row, $name) { case 'Distance': echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo strtolower($row->COL_BAND); } echo ''; break; case 'Frequency': - $ci->load->library('frequency'); echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break; case 'State': echo '' . ($row->COL_STATE) . ''; break; case 'Operator': echo '' . ($row->COL_OPERATOR) . ''; break; diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index f7bab19f0..774ed0219 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -36,10 +36,8 @@ function echo_table_col($row, $name) { echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ''; break; case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; break; case 'Band': - $ci->load->library('frequency'); echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.$row->COL_SAT_NAME.''; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break; case 'Frequency': - $ci->load->library('frequency'); echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; case 'State': echo '' . ($row->COL_STATE ?? '') . ''; break; case 'Operator':echo '' . ($row->COL_OPERATOR ?? '') . ''; break; diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index 827f4cb85..68aa9d8b2 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -105,7 +105,6 @@ function echo_table_col($row, $name) echo ''; break; case 'Frequency': - $CI->load->library('frequency'); echo ''; if ($row->COL_FREQ != null) { echo $CI->frequency->hz_to_mhz($row->COL_FREQ);