From 116348b2d81ffcda1667bb9963602b2560bf3bc4 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Fri, 30 Aug 2024 00:35:02 +0200
Subject: [PATCH] Remove double date format function

---
 application/controllers/Distancerecords.php   | 23 ++++++++++++++++++-
 application/views/distancerecords/index.php   |  7 ------
 application/views/interface_assets/footer.php | 23 +------------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/application/controllers/Distancerecords.php b/application/controllers/Distancerecords.php
index 1891a2cb6..1a84b60fa 100644
--- a/application/controllers/Distancerecords.php
+++ b/application/controllers/Distancerecords.php
@@ -16,13 +16,34 @@ class Distancerecords extends CI_Controller {
 
         $this->load->model('distancerecords_model');
 
+        if($this->session->userdata('user_date_format')) {
+            $custom_date_format = $this->session->userdata('user_date_format');
+        } else {
+            $custom_date_format = $this->config->item('qso_date_format');
+        }
+
+        switch ($custom_date_format) {
+            case 'd/m/y': $usethisformat = 'D/MM/YY';break;
+            case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
+            case 'm/d/y': $usethisformat = 'MM/D/YY';break;
+            case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
+            case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
+            case 'y/m/d': $usethisformat = 'YY/MM/D';break;
+            case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
+            case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
+            case 'M d, y': $usethisformat = 'MMM D, YY';break;
+        }
+
         // Render Page
+        $data['custom_date_format'] = $custom_date_format;
         $data['page_title'] = __("Distance Records");
         $data['distances'] = $this->distancerecords_model->get_records();
 
+        $footerData['usethisformat'] = $usethisformat;
+
         $this->load->view('interface_assets/header', $data);
         $this->load->view('distancerecords/index');
-        $this->load->view('interface_assets/footer');
+        $this->load->view('interface_assets/footer', $footerData);
     }
 
 }
diff --git a/application/views/distancerecords/index.php b/application/views/distancerecords/index.php
index 124252c5e..cc17c8930 100644
--- a/application/views/distancerecords/index.php
+++ b/application/views/distancerecords/index.php
@@ -4,13 +4,6 @@
 	<p><?php echo __("This page lists distance records per satellite based on gridsquares."); ?>
 	<?php
 		if ($distances) {
-			if($this->session->userdata('user_date_format')) {
-				// If Logged in and session exists
-				$custom_date_format = $this->session->userdata('user_date_format');
-			} else {
-				// Get Default date format from /config/wavelog.php
-				$custom_date_format = $this->config->item('qso_date_format');
-			}
 	?>
 
 	<table style="width: 100%" id="distrectable" class="distrectable table table-sm table-striped table-hover">
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index d51133b55..d967908c4 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2582,28 +2582,7 @@ function viewEqsl(picture, callsign) {
 	</script>
 <?php } ?>
 
-<?php if ($this->uri->segment(1) == "distancerecords") {
-	// Get Date format
-	if($this->session->userdata('user_date_format')) {
-		// If Logged in and session exists
-		$custom_date_format = $this->session->userdata('user_date_format');
-	} else {
-		// Get Default date format from /config/wavelog.php
-		$custom_date_format = $this->config->item('qso_date_format');
-	}
-
-    switch ($custom_date_format) {
-        case 'd/m/y': $usethisformat = 'D/MM/YY';break;
-        case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
-        case 'm/d/y': $usethisformat = 'MM/D/YY';break;
-        case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
-        case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
-        case 'y/m/d': $usethisformat = 'YY/MM/D';break;
-        case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
-        case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
-        case 'M d, y': $usethisformat = 'MMM D, YY';break;
-    } ?>
-
+<?php if ($this->uri->segment(1) == "distancerecords") { ?>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
         <script>