diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index 8a73292cb..339642e73 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -528,9 +528,8 @@ class Awards extends CI_Controller {
'assets/js/sections/cqmap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/cqmap.js"))
];
- $CI =& get_instance();
- $CI->load->model('logbooks_model');
- $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+ $this->load->model('logbooks_model');
+ $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('cq');
$this->load->model('modes');
@@ -1320,9 +1319,8 @@ class Awards extends CI_Controller {
This displays the CQ Zone map and requires the $band_type and $mode_type
*/
public function cq_map() {
- $CI =& get_instance();
- $CI->load->model('logbooks_model');
- $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+ $this->load->model('logbooks_model');
+ $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->load->model('cq');
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index a984ddcb0..ef9c98046 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -1316,12 +1316,11 @@ class Logbook extends CI_Controller {
function part_table_col($row, $name) {
$ret='';
- $ci =& get_instance();
switch($name) {
case 'Mode': $ret.= '
'; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ' | '; break;
case 'RSTS': $ret.= '' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '';} if ($row->COL_STX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} $ret.= ' | '; break;
case 'RSTR': $ret.= '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '';} if ($row->COL_SRX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} $ret.= ' | '; break;
- case 'Country': $ret.= '' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . ' | '; break;
+ case 'Country': $ret.= '' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' '.$this->lang->line('gen_hamradio_deleted_dxcc').'' . ' | '; break;
case 'IOTA': $ret.= '' . ($row->COL_IOTA) . ' | '; break;
case 'SOTA': $ret.= '' . ($row->COL_SOTA_REF) . ' | '; break;
case 'WWFF': $ret.= '' . ($row->COL_WWFF_REF) . ' | '; break;
@@ -1329,7 +1328,7 @@ class Logbook extends CI_Controller {
case 'Grid': $ret.= '' . $this->part_QrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE) . ' | '; break;
case 'Distance': $ret.= '' . (($row->COL_DISTANCE ?? '' != '') ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { $ret.= strtolower($row->COL_BAND); } $ret.= ''; break;
- case 'Frequency': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { $ret.= $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= ''; break;
+ case 'Frequency': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { $ret.= $this->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= ''; break;
case 'State': $ret.= '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': $ret.= '' . ($row->COL_OPERATOR) . ' | '; break;
}
diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php
index d1539cd03..e8b22bec6 100644
--- a/application/controllers/Oqrs.php
+++ b/application/controllers/Oqrs.php
@@ -92,9 +92,8 @@ class Oqrs extends CI_Controller {
public function requests() {
$data['page_title'] = "OQRS Requests";
- $CI =& get_instance();
- $CI->load->model('logbooks_model');
- $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+ $this->load->model('logbooks_model');
+ $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
if ($logbooks_locations_array) {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
diff --git a/application/controllers/Sattimers.php b/application/controllers/Sattimers.php
index 7de010f91..32142560d 100644
--- a/application/controllers/Sattimers.php
+++ b/application/controllers/Sattimers.php
@@ -43,11 +43,10 @@ class Sattimers extends CI_Controller {
$data['page_title'] = "Satellite Timers";
- $CI =& get_instance();
- if($CI->session->userdata('user_date_format')) {
- $data['custom_date_format'] = $CI->session->userdata('user_date_format');
+ if($this->session->userdata('user_date_format')) {
+ $data['custom_date_format'] = $this->session->userdata('user_date_format');
} else {
- $data['custom_date_format'] = $CI->config->item('qso_date_format');
+ $data['custom_date_format'] = $this->config->item('qso_date_format');
}
switch ($data['custom_date_format']) {