From f409d4266d740d0e54245b58317c0bf1df47d944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Mel=C3=ADk?= <filip@melik.cz>
Date: Thu, 30 Jan 2025 21:09:45 +0100
Subject: [PATCH] Use the value from settings in the UI

---
 application/controllers/Qso.php               | 12 ++++++------
 application/views/interface_assets/header.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index 70e3b2923..d3af14190 100644
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -2,14 +2,14 @@
 
 class QSO extends CI_Controller {
 
-	const LAST_QSOS_COUNT = 5; // max number of most recent qsos to be displayed on a qso page
-
 	function __construct()
 	{
 		parent::__construct();
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
-		$this->session->set_userdata('last_qsos_count', self::LAST_QSOS_COUNT);
+        
+        $last_qso_count = empty($this->session->userdata('qso_page_last_qso_count')) ? QSO_PAGE_DEFAULT_QSOS_COUNT : $this->session->userdata('qso_page_last_qso_count');
+		$this->session->set_userdata('qso_page_last_qso_count', $last_qso_count);
 	}
 
 	public function index() {
@@ -37,7 +37,7 @@ class QSO extends CI_Controller {
 		$data['stations'] = $this->stations->all_of_user();
 		$data['radios'] = $this->cat->radios(true);
 		$data['radio_last_updated'] = $this->cat->last_updated()->row();
-		$data['query'] = $this->logbook_model->last_custom($this->session->userdata('last_qsos_count'));
+		$data['query'] = $this->logbook_model->last_custom($this->session->userdata('qso_page_last_qso_count'));
 		$data['dxcc'] = $this->logbook_model->fetchDxcc();
 		$data['iota'] = $this->logbook_model->fetchIota();
 		$data['modes'] = $this->modes->active();
@@ -87,7 +87,7 @@ class QSO extends CI_Controller {
 			$data['user_dok_to_qso_tab'] = 0;
 		}
 
-		$data['qso_count'] = $this->session->userdata('last_qsos_count');
+		$data['qso_count'] = $this->session->userdata('qso_page_last_qso_count');
 
 		$this->load->library('form_validation');
 
@@ -606,7 +606,7 @@ class QSO extends CI_Controller {
       $this->load->model('logbook_model');
       session_write_close();
 
-      $data['query'] = $this->logbook_model->last_custom($this->session->userdata('last_qsos_count'));
+      $data['query'] = $this->logbook_model->last_custom($this->session->userdata('qso_page_last_qso_count'));
 
       // Load view
       $this->load->view('qso/components/previous_contacts', $data);
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index de57033d2..7841ff6bd 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -63,7 +63,7 @@
                 	$profile_info = $this->stations->profile($actstation)->row();
                 	echo "var activeStationTXPower = '".xss_clean($profile_info->station_power ?? 0)."';\n";
                 	echo "var activeStationOP = '".xss_clean($this->session->userdata('operator_callsign'))."';\n";
-                	echo "var last_qsos_count = ".$this->session->userdata('last_qsos_count')."\n";
+                	echo "var last_qsos_count = ".$this->session->userdata('qso_page_last_qso_count')."\n";
 		}
                 ?>
 	</script>