From 8183bdc332b94228c7acc849695c8e45ac253d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Mel=C3=ADk?= Date: Sun, 2 Mar 2025 20:41:20 +0100 Subject: [PATCH] CR: use existing function --- application/controllers/Widgets.php | 3 ++- application/models/Logbooks_model.php | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/application/controllers/Widgets.php b/application/controllers/Widgets.php index 650d4715a..a1ad27a27 100644 --- a/application/controllers/Widgets.php +++ b/application/controllers/Widgets.php @@ -51,6 +51,7 @@ class Widgets extends CI_Controller { $this->load->model('logbook_model'); $this->load->model('logbooks_model'); + $this->load->model('stationsetup_model'); if($this->logbooks_model->public_slug_exists($logbook_slug)) { $logbook_id = $this->logbooks_model->public_slug_exists_logbook_id($logbook_slug); @@ -68,7 +69,7 @@ class Widgets extends CI_Controller { } // Get widget settings - $user_id = $this->logbooks_model->user_id_from_logbook_slug($logbook_slug); + $user_id = $this->stationsetup_model->public_slug_exists_userid($logbook_slug); $widget_options = $this->get_qso_widget_options($user_id); $data['show_time'] = $widget_options->display_qso_time; diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php index 2b594314a..df69861ec 100644 --- a/application/models/Logbooks_model.php +++ b/application/models/Logbooks_model.php @@ -188,19 +188,6 @@ class Logbooks_model extends CI_Model { } } - function user_id_from_logbook_slug($slug) { - $this->db->where('public_slug', $this->security->xss_clean($slug)); - $query = $this->db->get('station_logbooks'); - - if ($query->num_rows() > 0){ - foreach ($query->result() as $row) { - return $row->user_id; - } - } else { - return null; - } - } - function is_public_slug_available($slug) { // Clean public_slug $clean_slug = $this->security->xss_clean($slug);