From 08626fe094fe1601ea93b590c76e28022277bf53 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Tue, 11 Nov 2025 15:43:24 +0100
Subject: [PATCH 1/3] use global options for dxwaterfall

---
 application/controllers/Qso.php | 6 ++++++
 application/views/qso/index.php | 2 ++
 assets/js/dxwaterfall.js        | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index ec28da550..9d7175256 100644
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -92,8 +92,14 @@ class QSO extends CI_Controller {
 		$qkey_opt=$this->user_options_model->get_options('dxwaterfall',array('option_name'=>'enable','option_key'=>'boolean'))->result();
 		if (count($qkey_opt)>0) {
 			$data['user_dxwaterfall_enable'] = $qkey_opt[0]->option_value;
+			$data['dxcluster_default_decont'] = $this->optionslib->get_option('dxcluster_decont') ?? 'EU';
+			$data['dxcluster_default_maxage'] = $this->optionslib->get_option('dxcluster_maxage') ?? 60;
 		} else {
 			$data['user_dxwaterfall_enable'] = 0;
+			
+			// default but not used, prevent unset variable, without the need of a db call
+			$data['dxcluster_default_decont'] = 'EU';
+			$data['dxcluster_default_maxage'] = 60;
 		}
 
 		$data['qso_count'] = $this->session->userdata('qso_page_last_qso_count');
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 8adb0e38c..84aa31c44 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -37,6 +37,8 @@ switch ($date_format) {
   var lang_invalid_ant_el = "<?= __("Invalid value for antenna elevation:"); ?>";
   var latlng=[<?php echo $lat.','.$lng;?>];
   var user_date_format = "<?php echo $date_format; ?>"; // Pass the user's date format to JavaScript
+  var dxcluster_default_decont = "<?php echo $dxcluster_default_decont; ?>"; // used in dxwaterfall.js
+  var dxcluster_default_maxage = "<?php echo $dxcluster_default_maxage; ?>"; // used in dxwaterfall.js
 </script>
 
 <!--- DX Waterfall --->
diff --git a/assets/js/dxwaterfall.js b/assets/js/dxwaterfall.js
index 5694606db..58cf6c1f2 100644
--- a/assets/js/dxwaterfall.js
+++ b/assets/js/dxwaterfall.js
@@ -1267,8 +1267,8 @@ var dxWaterfall = {
     spotInfoDiv: null,
     spotTooltipDiv: null,
     lastSpotInfoKey: null,
-    currentContinent: 'NA',
-    currentMaxAge: 60,
+    currentContinent: dxcluster_default_decont,
+    currentMaxAge: dxcluster_default_maxage,
 
     // ========================================
     // SPOT NAVIGATION STATE

From 37f6e37fd7d778938efad8fc1089a5032b981902 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Tue, 11 Nov 2025 16:57:04 +0100
Subject: [PATCH 2/3] use existing js var definition

---
 application/views/components/dxwaterfall.php | 4 ++--
 application/views/qso/index.php              | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/views/components/dxwaterfall.php b/application/views/components/dxwaterfall.php
index 6d31e75ba..7ee349960 100644
--- a/application/views/components/dxwaterfall.php
+++ b/application/views/components/dxwaterfall.php
@@ -56,8 +56,8 @@
 		var lang_dxwaterfall_spotted_by = "<?= __("by:"); ?>";
 
 		// DX Waterfall Configuration from User Options
-		let dxwaterfall_decont = '<?php echo $this->optionslib->get_option('dxcluster_decont'); ?>';
-		let dxwaterfall_maxage = '<?php echo $this->optionslib->get_option('dxcluster_maxage'); ?>';
+		let dxcluster_default_decont = "<?php echo $dxcluster_default_decont; ?>";
+		let dxcluster_default_maxage = "<?php echo $dxcluster_default_maxage; ?>";
 
 		// Helper function to safely check if optional field exists
 		window.DX_WATERFALL_HAS_FIELD = function(fieldName) {
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 84aa31c44..8adb0e38c 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -37,8 +37,6 @@ switch ($date_format) {
   var lang_invalid_ant_el = "<?= __("Invalid value for antenna elevation:"); ?>";
   var latlng=[<?php echo $lat.','.$lng;?>];
   var user_date_format = "<?php echo $date_format; ?>"; // Pass the user's date format to JavaScript
-  var dxcluster_default_decont = "<?php echo $dxcluster_default_decont; ?>"; // used in dxwaterfall.js
-  var dxcluster_default_maxage = "<?php echo $dxcluster_default_maxage; ?>"; // used in dxwaterfall.js
 </script>
 
 <!--- DX Waterfall --->

From 06969dfe6107fde18e3c3c157ce0ea4c9d372b08 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Tue, 11 Nov 2025 16:59:09 +0100
Subject: [PATCH 3/3] also for dxcluster max spotage

---
 assets/js/dxwaterfall.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/dxwaterfall.js b/assets/js/dxwaterfall.js
index 58cf6c1f2..07f84e916 100644
--- a/assets/js/dxwaterfall.js
+++ b/assets/js/dxwaterfall.js
@@ -3297,9 +3297,9 @@ var dxWaterfall = {
         var age = 60; // minutes
         var de = this.currentContinent; // Use current continent (may have been cycled)
 
-        // Check if dxwaterfall_maxage is defined
-        if (typeof dxwaterfall_maxage !== "undefined" && dxwaterfall_maxage != null) {
-            age = dxwaterfall_maxage;
+        // Check if dxcluster_default_maxage is defined
+        if (typeof dxcluster_default_maxage !== "undefined" && dxcluster_default_maxage != null) {
+            age = dxcluster_default_maxage;
         }
 
         // Store current settings