From ff4b63d5c5d03249b7abcebf50d77174f78d40e2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 27 Feb 2024 15:34:40 +0100
Subject: [PATCH] Bug 34478: Add cud to updatestructure

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 C4/Auth.pm                                       |  2 +-
 installer/install.pl                             |  2 +-
 .../prog/en/modules/installer/step3.tt           | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 9c541d8af8..2f90868b9e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -776,7 +776,7 @@ sub _version_check {
         my $warning = "Database update needed, redirecting to %s. Database is $version and Koha is $kohaversion";
         if ( $type ne 'opac' ) {
             warn sprintf( $warning, 'Installer' );
-            print $query->redirect("/cgi-bin/koha/installer/install.pl?step=1&op=updatestructure");
+            print $query->redirect("/cgi-bin/koha/installer/install.pl");
         } else {
             warn sprintf( "OPAC: " . $warning, 'maintenance' );
             print $query->redirect("/cgi-bin/koha/maintenance.pl");
diff --git a/installer/install.pl b/installer/install.pl
index 3c2ee27b2a..d50f15aec6 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -372,7 +372,7 @@ elsif ( $step && $step == 3 ) {
             "error" => $error,
         );
     }
-    elsif ( $op eq 'updatestructure' ) {
+    elsif ( $op eq 'cud-updatestructure' ) {
         #
         # Not 1st install, the only sub-step : update database
         #
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index 917490a685..8a3e5b4b83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -326,7 +326,12 @@
                     [% IF ( upgrading ) %]
                         <h1>Web installer &rsaquo; Update database</h1>
                         <p>We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]</p>
-                        <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
+                        <form action="/cgi-bin/koha/installer/install.pl" method="post">
+                            [% INCLUDE 'csrf-token.inc' %]
+                            <input type="hidden" name="step" value="3" />
+                            <input type="hidden" name="op" value="cud-updatestructure" />
+                            <p><input value="Update your database" class="btn btn-primary" type="submit" /></p>
+                        </form>
                     [% ELSE %]
                         <h1>Web installer &rsaquo; Install basic configuration settings</h1>
 
@@ -453,7 +458,14 @@
                         <p>Everything went okay. Update done.</p>
                         <p><a href="install.pl?step=3&amp;op=finished" class="btn btn-primary">Continue to log in to Koha</a></p>
                     [% ELSE %]
-                        <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Try again</a></p>
+                        <p>
+                            <form action="/cgi-bin/koha/installer/install.pl" method="post">
+                                [% INCLUDE 'csrf-token.inc' %]
+                                <input type="hidden" name="step" value="3" />
+                                <input type="hidden" name="op" value="cud-updatestructure" />
+                                <p><input value="Try again" class="btn btn-primary" type="submit" /></p>
+                            </form>
+                        </p>
                     [% END %]
                [% END # / IF updatestructure %]
             </div> <!-- / #installer-step3 -->
-- 
2.39.5