From 2e4fa2d677873778d53b92422642b62e9034cd77 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Fri, 10 Apr 2020 19:36:41 -0300
Subject: [PATCH] Bug 25109: Add entry in about.pl about the configuration
 lockdir entry

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 about.pl                                         | 6 ++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/about.pl b/about.pl
index f0ae48de97..85e55cb0c0 100755
--- a/about.pl
+++ b/about.pl
@@ -209,6 +209,12 @@ if ( ! defined C4::Context->config('log4perl_conf') ) {
     }
 }
 
+if ( ! defined C4::Context->config('lockdir') ) {
+    push @xml_config_warnings, {
+        error => 'lockdir_entry_missing'
+    }
+}
+
 if ( ! defined C4::Context->config('upload_path') ) {
     if ( Koha::Config::SysPrefs->find('OPACBaseURL')->value ) {
         # OPACBaseURL seems to be set
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index ef60aed2b7..341a618232 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -359,6 +359,13 @@
                         add it, pointing to the log4perl.conf file for your Koha instance.
                     </td>
                 </tr>
+                [% ELSIF config_entry.error == 'lockdir_entry_missing' %]
+                <tr>
+                    <th scope="row"><b>Warning</b></th>
+                    <td>You are missing the &lt;lockdir&gt; entry in your koha-conf.xml file. Please
+                        add it, pointing to your Koha instance's lock dir.
+                    </td>
+                </tr>
                 [% ELSIF config_entry.error == 'uploadpath_entry_missing' %]
                 <tr>
                     <th scope="row"><b>Warning</b></th>
-- 
2.39.5