From 9bba53ad4f9082bc46aa19b36da1197cb29da740 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 8 Apr 2021 14:09:06 +0000
Subject: [PATCH] Bug 28086: OpacMaintenance page should use ReplytoDefault if
 set

This patch changes the OPAC maintenance template so that it checks for a
value in the ReplyToDefault system preference when displaying the
"please contact the site administrator" email link.

Also changed: If neither ReplytoDefault nor KohaAdminEmailAddress is
defined, it won't show the link at all.

To test, apply the patch and set the OpacMaintenance preference to
"Show."

 - In the OPAC you should see the "System Maintenance" page.
 - Test this page with various settings:
   - ReplytoDefault and KohaAdminEmailAddress both populated.
   - Only ReplytoDefault
   - Only KohaAdminEmailAddress
   - Neither.

 Confirm that the correct email address is used in each case.
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
index 3c67f0447f..665d32087d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
@@ -40,13 +40,14 @@
                         [% Koha.Preference( 'OpacMaintenanceNotice' ) | $raw %]
                     [% ELSE %]
                         <h1>System Maintenance</h1>
-                          <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon!
-                          [% IF ( Koha.Preference( 'ReplytoDefault' ) ) %]
-                                If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'ReplytoDefault' ) | $raw %]">site administrator</a>
-                          [% ELSE %]
-                          [% END %]
-
-                          </p>
+                            <p>
+                                The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon!
+                                [% IF ( Koha.Preference( 'ReplytoDefault' ) ) %]
+                                    If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'ReplytoDefault' ) | $raw %]">site administrator</a>
+                                [% ELSIF ( Koha.Preference( 'KohaAdminEmailAddress' ) ) %]
+                                    If you have any questions, please contact the <a href="mailto:[% Koha.Preference( 'KohaAdminEmailAddress' ) | $raw %]">site administrator</a>
+                                [% END %]
+                            </p>
                     [% END %]
                 </div>
             </div>
-- 
2.11.0