From e8ac2d38331872bc812f6ed32cf2fc5735a88bde Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Mon, 26 Feb 2018 15:00:54 +0000
Subject: [PATCH] Bug 18674: Added timezone information to about page

Before patch: No timezone section
After patch: timezone section at bottom of
             Server information tab.

Actual is what is being used. Config overrides environment variables.
So if there is confusion why the environment variables aren't working,
it will be visible why.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 about.pl                                         | 7 +++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/about.pl b/about.pl
index cfc2e32fe4..91292a5a79 100755
--- a/about.pl
+++ b/about.pl
@@ -61,6 +61,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my $time_zone = {
+    actual      => C4::Context->timezone(),
+    config      => C4::Context->config('timezone'),
+    environment => $ENV{TZ},
+};
+$template->param( 'time_zone' => $time_zone );
+
 my $perl_path = $^X;
 if ($^O ne 'VMS') {
     $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 217ac65db3..cf73d11e7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -111,6 +111,10 @@
             [% ELSIF (errZebraConnection) %]
             <tr><th scope="row"><b>Warning</b> </th><td>Error message from Zebra: [% ( errZebraConnection ) %] </td></tr>
             [% END %]
+            <tr><th scope="row">Time zone: </th>
+               <td>Used: [% time_zone.actual %]<br/>
+                   Config: [% time_zone.config %]<br/>
+                   ENV: [% time_zone.environment %]</td></tr>
         </table>
         </div>
         <div id="perl">
-- 
2.39.5