From db239bf0a32d7178b15809550aa4755959958291 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 30 Jul 2025 21:24:34 +0000
Subject: [PATCH] Fix QSO form to use user's preferred date format instead of
 hardcoded d-m-Y

Co-authored-by: magicbug <84308+magicbug@users.noreply.github.com>
---
 application/controllers/Qso.php |  7 +++++++
 application/views/qso/index.php | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index a78840bc..d92f2b51 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -40,6 +40,13 @@ class QSO extends CI_Controller {
 		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
 		$data['user_default_band'] = $this->session->userdata('user_default_band');
 		$data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true);
+		
+		// Set user's preferred date format
+		if($this->session->userdata('user_date_format')) {
+			$data['user_date_format'] = $this->session->userdata('user_date_format');
+		} else {
+			$data['user_date_format'] = $this->config->item('qso_date_format');
+		}
 
 		$this->load->library('form_validation');
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 5993a1a3..e7ad97f5 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -69,8 +69,8 @@
                       <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) {
                                                                                                                                     echo $this->session->userdata('start_date');
                                                                                                                                   } else {
-                                                                                                                                    echo date('d-m-Y');
-                                                                                                                                  } ?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
+                                                                                                                                    echo date($user_date_format);
+                                                                                                                                  } ?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required>
                     </div>
 
                     <div class="mb-3 col-md-3">
@@ -102,7 +102,7 @@
                     <?php if ($_GET['manual'] == 0) { ?>
                       <input class="input_start_time" type="hidden" id="start_time" name="start_time" value="<?php echo date('H:i:s'); ?>" />
                       <input class="input_end_time" type="hidden" id="end_time" name="end_time" value="<?php echo date('H:i:s'); ?>" />
-                      <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
+                      <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date($user_date_format); ?>" />
                     <?php } ?>
                   </div>
 
@@ -113,8 +113,8 @@
                       <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) {
                                                                                                                                     echo $this->session->userdata('start_date');
                                                                                                                                   } else {
-                                                                                                                                    echo date('d-m-Y');
-                                                                                                                                  } ?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
+                                                                                                                                    echo date($user_date_format);
+                                                                                                                                  } ?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> required>
                     </div>
 
                     <div class="mb-3 col-md-6">
@@ -131,7 +131,7 @@
 
                     <?php if ($_GET['manual'] == 0) { ?>
                       <input class="input_start_time" type="hidden" id="start_time" name="start_time" value="<?php echo date('H:i:s'); ?>" />
-                      <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
+                      <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date($user_date_format); ?>" />
                     <?php } ?>
                   </div>
                 <?php } ?>