From 69cdbe6a4f14f7c26de216af32056bb0f215e4dc Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Fri, 7 Mar 2025 06:36:56 +0000
Subject: [PATCH] When updating DXCC out of LoTW-cfm update country as well

---
 application/controllers/Lotw.php     | 8 +++++++-
 application/models/Logbook_model.php | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 19bb31586..302278e56 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -592,7 +592,13 @@ class Lotw extends CI_Controller {
 					$dxcc = "";
 				}
 
-				$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $record['station_callsign'],$qso_id4lotw, $station_ids, $dxcc, $ant_path);
+				if (isset($record['country'])) {
+					$country = $record['country'];
+				} else {
+					$country = "";
+				}
+
+				$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $record['station_callsign'],$qso_id4lotw, $station_ids, $dxcc, $country, $ant_path);
 
 				$table .= "<tr>";
 				$table .= "<td>".$record['station_callsign']."</td>";
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 306fd0750..d2c3049f2 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -3727,7 +3727,7 @@ class Logbook_model extends CI_Model {
 		}
 	}
 
-	function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $station_callsign, $qsoid, $station_ids, $dxcc = null, $ant_path = null) {
+	function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $station_callsign, $qsoid, $station_ids, $country = null, $dxcc = null, $ant_path = null) {
 
 		$data = array(
 			'COL_LOTW_QSLRDATE' => $qsl_date,
@@ -3753,6 +3753,10 @@ class Logbook_model extends CI_Model {
 			$data['COL_DXCC'] = $dxcc;
 		}
 
+		if (($country ?? '') != '') {
+			$data['COL_COUNTRY'] = $country;
+		}
+
 		if ($ituz != "") {
 			$data['COL_ITUZ'] = $ituz;
 		}