From 487d52d1055bbb3af47ee5b9360c73d1011b1957 Mon Sep 17 00:00:00 2001 From: Szymon Porwolik Date: Wed, 24 Sep 2025 10:24:57 +0200 Subject: [PATCH] User solar danel widget at the user dashboard shall be now be hidden by default. --- application/controllers/Dashboard.php | 6 +++--- application/models/User_model.php | 6 +++--- application/views/user/edit.php | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index a64e7ebc2..8042a0950 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -82,9 +82,9 @@ class Dashboard extends CI_Controller { // Check user preferrence to show Solar Data on Dashboard // Default to not show if (($this->session->userdata('user_dashboard_solar') ?? '') != '') { - $data['dashboard_solar'] = $this->session->userdata('user_dashboard_solar') ?? 'Y'; + $data['dashboard_solar'] = $this->session->userdata('user_dashboard_solar') ?? 'N'; } else { - $data['dashboard_solar'] = 'N'; + $data['dashboard_solar'] = 'N'; // Default to not show } $data['user_map_custom'] = $this->optionslib->get_map_custom(); @@ -189,7 +189,7 @@ class Dashboard extends CI_Controller { // Check user preferrence to show Solar Data on Dashboard and load data if yes // Default to not show - if($data['dashboard_solar'] == 'true') { + if($data['dashboard_solar'] == 'Y') { $this->load->model('Hamqsl_model'); // Load HAMQSL model if (!$this->Hamqsl_model->set_solardata()) { diff --git a/application/models/User_model.php b/application/models/User_model.php index 99ea168e2..f65e6753e 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -386,12 +386,12 @@ class User_Model extends CI_Model { $this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'qso_tab','last_qso_count','count','".$qso_page_last_qso_count."');"); $this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'dashboard','show_map','boolean','".xss_clean($fields['user_dashboard_map'] ?? 'Y')."');"); $this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'dashboard','show_dashboard_banner','boolean','".xss_clean($fields['user_dashboard_banner'] ?? 'Y')."');"); - $this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'dashboard','show_dashboard_solar','boolean','".xss_clean($fields['user_dashboard_solar'] ?? 'Y')."');"); + $this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'dashboard','show_dashboard_solar','boolean','".xss_clean($fields['user_dashboard_solar'] ?? 'N')."');"); $this->session->set_userdata('dashboard_last_qso_count', $dashboard_last_qso_count); $this->session->set_userdata('qso_page_last_qso_count', $qso_page_last_qso_count); $this->session->set_userdata('user_dashboard_map',xss_clean($fields['user_dashboard_map'] ?? 'Y')); $this->session->set_userdata('user_dashboard_banner',xss_clean($fields['user_dashboard_banner'] ?? 'Y')); - $this->session->set_userdata('user_dashboard_solar',xss_clean($fields['user_dashboard_solar'] ?? 'Y')); + $this->session->set_userdata('user_dashboard_solar',xss_clean($fields['user_dashboard_solar'] ?? 'N')); // Check to see if the user is allowed to change user levels if($this->session->userdata('user_type') == 99) { @@ -550,7 +550,7 @@ class User_Model extends CI_Model { 'user_measurement_base' => $u->row()->user_measurement_base, 'user_dashboard_map' => ((($this->session->userdata('user_dashboard_map') ?? 'Y') == 'Y') ? $this->user_options_model->get_options('dashboard', array('option_name' => 'show_map', 'option_key' => 'boolean'))->row()->option_value ?? 'Y' : $this->session->userdata('user_dashboard_map')), 'user_dashboard_banner' => ((($this->session->userdata('user_dashboard_banner') ?? 'Y') == 'Y') ? $this->user_options_model->get_options('dashboard', array('option_name' => 'show_dashboard_banner', 'option_key' => 'boolean'))->row()->option_value ?? 'Y' : $this->session->userdata('user_dashboard_banner')), - 'user_dashboard_solar' => ((($this->session->userdata('user_dashboard_solar') ?? 'Y') == 'Y') ? $this->user_options_model->get_options('dashboard', array('option_name' => 'show_dashboard_solar', 'option_key' => 'boolean'))->row()->option_value ?? 'Y' : $this->session->userdata('user_dashboard_solar')), + 'user_dashboard_solar' => ((($this->session->userdata('user_dashboard_solar') ?? 'N') == 'Y') ? $this->user_options_model->get_options('dashboard', array('option_name' => 'show_dashboard_solar', 'option_key' => 'boolean'))->row()->option_value ?? 'N' : $this->session->userdata('user_dashboard_solar')), 'user_date_format' => $u->row()->user_date_format, 'user_stylesheet' => $u->row()->user_stylesheet, 'user_qth_lookup' => isset($u->row()->user_qth_lookup) ? $u->row()->user_qth_lookup : 0, diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 60b7439d4..a87097645 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -639,10 +639,10 @@
- +