From c7093543192b679431dff735cdd8fe6e4cb65fec Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 4 Oct 2021 17:33:31 +0000
Subject: [PATCH] Bug 28982: (follow-up) Ensure that date format is correctly
 checked

This patch modifies the global calendar include so that it doesn't use
the potentially-undefined template variable "dateformat."

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/calendar.inc             | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index ca7bb3bc45..6464b8a0f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -6,8 +6,25 @@
 <script>
     var debug    = "[% debug | html %]";
     var dateformat_pref = "[% Koha.Preference('dateformat ') | html %]";
-    var dateformat_string = [% IF ( dateformat == "us" ) %]"mm/dd/yy"[% ELSIF ( dateformat == "metric" ) %]"dd/mm/yy"[% ELSIF ( dateformat == "dmydot" ) %]"dd.mm.yy"[% ELSE %]"yy-mm-dd"[% END %];
-    var flatpickr_dateformat_string = [% IF ( dateformat == "us" ) %]"m/d/Y"[% ELSIF ( dateformat == "metric" ) %]"d/m/Y"[% ELSIF ( dateformat == "dmydot" ) %]"d.m.Y"[% ELSE %]"Y-m-d"[% END %];
+    var dateformat_string = "";
+    var flatpickr_dateformat_string = "";
+    switch ( dateformat_pref ){
+        case "us":
+            dateformat_string = "mm/dd/yy";
+            flatpickr_dateformat_string = "m/d/Y";
+            break;
+        case "metric":
+            dateformat_string = "dd/mm/yy";
+            flatpickr_dateformat_string = "d/m/Y";
+            break;
+        case "dmydot":
+            dateformat_string = "dd.mm.yy";
+            flatpickr_dateformat_string = "d.m.Y";
+            break;
+        default:
+            dateformat_string = "yy-mm-dd";
+            flatpickr_dateformat_string = "Y-m-d";
+    }
     var sentmsg = 0;
     var bidi = [% IF(bidi) %] true[% ELSE %] false[% END %];
     var calendarFirstDayOfWeek = '[% Koha.Preference('CalendarFirstDayOfWeek') | html %]';
-- 
2.39.5