From 2979c1e7b9aa73c72adf4a9d9c91a7bc9ab5343f Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 18 Jul 2025 20:27:18 +0200 Subject: [PATCH] Fix the widget. Slug needs to be mandatory --- application/controllers/Oqrs.php | 4 ++++ application/controllers/Widgets.php | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index 79c8c2f4c..1309bbf5f 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -104,11 +104,15 @@ class Oqrs extends CI_Controller { $slug = $this->input->post('slug', TRUE); $userid = $this->publicsearch->get_userid_for_slug($slug); + $data['disable_oqrs'] = $this->config->item('disable_oqrs'); + $data['oqrs_enabled'] = $this->oqrs_model->oqrs_enabled($slug); + $data['public_search_enabled'] = $this->publicsearch->public_search_enabled($slug); $data['groupedSearchShowStationName'] = $this->user_options_model->get_options('oqrs',array('option_name'=>'oqrs_grouped_search_show_station_name','option_key'=>'boolean'), $userid)->row()->option_value; $data['result'] = $this->oqrs_model->getQueryDataGrouped($this->input->post('callsign', TRUE), $userid); $data['callsign'] = $this->input->post('callsign', TRUE); $data['userid'] = $this->input->post('userid', TRUE); + $data['slug'] = $this->input->post('slug', TRUE); if($this->input->post('widget') != 'true') { $this->load->view('oqrs/request_grouped', $data); diff --git a/application/controllers/Widgets.php b/application/controllers/Widgets.php index 999029246..a97a91ee0 100644 --- a/application/controllers/Widgets.php +++ b/application/controllers/Widgets.php @@ -79,9 +79,9 @@ class Widgets extends CI_Controller { } } - public function oqrs($user_callsign = 'CALL MISSING') { + public function oqrs($slug) { $this->load->model('oqrs_model'); - $data['slug'] = $this->input->get('slug', TRUE); + $data['slug'] = $this->security->xss_clean($slug); $this->load->model('publicsearch'); $data['userid'] = $this->publicsearch->get_userid_for_slug($data['slug']); $stations = $this->oqrs_model->get_oqrs_stations($data['userid']); @@ -109,7 +109,7 @@ class Widgets extends CI_Controller { $data['theme'] = $this->config->item('option_theme'); } - $data['user_callsign'] = strtoupper($this->security->xss_clean($user_callsign)); + $data['user_callsign'] = strtoupper($this->security->xss_clean($slug)); $this->load->view('widgets/oqrs', $data); }