From 149e3e169cbabe45719132a129301fb0584e6fc7 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2022 12:49:07 +0200 Subject: [PATCH 1/3] Remove CAT timeout from hard coded config file --- application/config/cloudlog.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/application/config/cloudlog.php b/application/config/cloudlog.php index 1070e5b5..df5fa98b 100644 --- a/application/config/cloudlog.php +++ b/application/config/cloudlog.php @@ -47,19 +47,6 @@ $config['measurement_base'] = 'M'; */ $config['map_gridsquares'] = FALSE; -/* -|-------------------------------------------------------------------------- -| CAT Timeout Warning Inverval -|-------------------------------------------------------------------------- -| -| The external CAT applications can obviously stop working for various reasons -| this interval is used for displaying a warning on the QSO Panel -| -| Default is: 1800 seconds (30 minutes) -| -*/ -$config['cat_timeout_interval'] = 1800; - /* |-------------------------------------------------------------------------- | Public Search From 3fc003d6a8b115b5900554e0c9746321f54ccee0 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 29 Jun 2022 13:08:08 +0200 Subject: [PATCH 2/3] Keep autoload value to 'yes' for radio timeout --- application/controllers/Options.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 57155690..109e8e8e 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -137,7 +137,7 @@ class Options extends CI_Controller { else { // Update theme choice within the options system - $radioTimeout_update = $this->optionslib->update('cat_timeout_interval', $this->input->post('radioTimeout')); + $radioTimeout_update = $this->optionslib->update('cat_timeout_interval', $this->input->post('radioTimeout'), 'yes'); // If theme update is complete set a flashsession with a success note if($radioTimeout_update == TRUE) { From 570ac1e505a3455343bbae13c0021a7facd797f7 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 30 Jun 2022 21:32:09 +0200 Subject: [PATCH 3/3] Use optionslib to read config value --- application/views/interface_assets/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 55117252..0c7a30f3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1126,7 +1126,7 @@ $(document).on('keypress',function(e) { $("#selectPropagation").val(data.prop_mode); // Display CAT Timeout warnng based on the figure given in the config file - var minutes = Math.floor(config->item('cat_timeout_interval'); ?> / 60); + var minutes = Math.floor(optionslib->get_option('cat_timeout_interval'); ?> / 60); if(data.updated_minutes_ago > minutes) { if($('.radio_timeout_error').length == 0) {