From dfd72b292939d41319c20768d124fb27ca86a672 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 11 Apr 2024 10:28:07 +0200
Subject: [PATCH] Bug 30897: Add option to disable automated restart

This patch adds the ability to disable the automated plack restart we
introduce with this patchset via configuration.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 Koha/Plugins.pm                               | 22 +++++++++----------
 debian/templates/koha-conf-site.xml.in        |  1 +
 etc/koha-conf.xml                             |  1 +
 .../prog/en/modules/plugins/plugins-upload.tt |  5 +++++
 plugins/plugins-upload.pl                     |  2 ++
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm
index 0ffee023f8..88c51a5e6f 100644
--- a/Koha/Plugins.pm
+++ b/Koha/Plugins.pm
@@ -364,19 +364,19 @@ sub RemovePlugins {
 sub _restart_after_change {
     my ( $class, $params ) = @_;
 
-    if ( C4::Context->psgi_env ) {
-        my $parent_pid = getpid();
-        my $ppid       = getppid();    # Get the parent process ID
-
-        # If the current process is not Plack parent, find the parent process recursively
-        while ( $parent_pid != $ppid ) {
-            $parent_pid = $ppid;
-            $ppid       = getppid();
-        }
+    return unless ( C4::Context->config('plugins_restart') && C4::Context->psgi_env );
+
+    my $parent_pid = getpid();
+    my $ppid       = getppid();    # Get the parent process ID
 
-        # Send SIGUSR1 signal to Plack parent process for graceful restart
-        kill 'HUP', $parent_pid;
+    # If the current process is not Plack parent, find the parent process recursively
+    while ( $parent_pid != $ppid ) {
+        $parent_pid = $ppid;
+        $ppid       = getppid();
     }
+
+    # Send SIGUSR1 signal to Plack parent process for graceful restart
+    kill 'HUP', $parent_pid;
 }
 
 1;
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index c35b6d8432..b4e3c71ba2 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -409,6 +409,7 @@ __END_SRU_PUBLICSERVER__
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugins_restricted>1</plugins_restricted>
+ <plugins_restart>0</plugins_restart>
  <plugin_repos>
     <!--
     <repo>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index f7cdd2f8d0..bcdd959c12 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -228,6 +228,7 @@
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugins_restricted>1</plugins_restricted>
+ <plugins_restart>0</plugins_restart>
  <plugin_repos>
     <repo>
         <name>ByWater Solutions</name>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index 5866f75ded..2bd34b45f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -44,6 +44,11 @@
                     [% END %]
                 </div>
                 [% END %]
+                [% IF ( !plugins_restart ) %]
+                <div class="dialog alert">
+                    <strong>Your system is not configured to automatically refresh on plugin upload, you may need to ask your administrator to complete the plugin installation.</strong>
+                </div>
+                [% END %]
                 <form method="post" action="/cgi-bin/koha/plugins/plugins-upload.pl" enctype="multipart/form-data">
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="brief">
diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
index f17a70422e..b158f51662 100755
--- a/plugins/plugins-upload.pl
+++ b/plugins/plugins-upload.pl
@@ -33,6 +33,7 @@ use Koha::Plugins;
 
 my $plugins_enabled    = C4::Context->config("enable_plugins");
 my $plugins_restricted = C4::Context->config("plugins_restricted");
+my $plugins_restart    = C4::Context->config("plugins_restart");
 
 my $input = CGI->new;
 my $uploadlocation = $input->param('uploadlocation');
@@ -47,6 +48,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         flagsrequired => { plugins => 'manage' },
     }
 );
+$template->param( plugins_restart => $plugins_restart );
 
 # Early exist if uploads are not enabled direct upload attempted when uploads are restricted
 if (!$plugins_enabled) {
-- 
2.20.1