From 7ceedebd7f8655feee23c4920fc65b0fa6242e70 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Mon, 18 Nov 2024 16:21:40 +0000
Subject: [PATCH] Logic at override (ADIF-Upload / mark as uld) was wrong for
 LoTW and Clublog

---
 application/models/Logbook_model.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 1f90a89a9..587716582 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -4103,10 +4103,10 @@ class Logbook_model extends CI_Model {
 			}
 
 			// Validate Clublog-Fields
-			if (isset($record['clublog_qso_upload_status'])) {
-				$input_clublog_qsl_sent = mb_strimwidth($record['clublog_qso_upload_status'], 0, 1);
-			} else if ($markClublog != NULL) {
+			if ($markClublog != NULL) {
 				$input_clublog_qsl_sent = "Y";
+			} elseif (isset($record['clublog_qso_upload_status'])) {
+				$input_clublog_qsl_sent = mb_strimwidth($record['clublog_qso_upload_status'], 0, 1);
 			} else {
 				$input_clublog_qsl_sent = NULL;
 			}
@@ -4142,10 +4142,10 @@ class Logbook_model extends CI_Model {
 				$input_lotw_qslrdate = NULL;
 			}
 
-			if (isset($record['lotw_qsl_sent'])) {
-				$input_lotw_qsl_sent = mb_strimwidth($record['lotw_qsl_sent'], 0, 1);
-			} else if ($markLotw != NULL) {
+			if ($markLotw != NULL) {
 				$input_lotw_qsl_sent = "Y";
+			} elseif (isset($record['lotw_qsl_sent'])) {
+				$input_lotw_qsl_sent = mb_strimwidth($record['lotw_qsl_sent'], 0, 1);
 			} else {
 				$input_lotw_qsl_sent = NULL;
 			}