From 38b618c4a50e5bb3de0cf1cd74a9d1267336521a Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 11 Jun 2024 16:13:36 +0100
Subject: [PATCH] Bug 36207: (RM follow-up) CSRF correction

I think there was a rebase issue here where we split the form into two
forms instead of one.  This patch returns us to one form with two
different submit options (one for selected tags and one per tag) that
both trigger the confirmation modal before submitting to the controller.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0ac23a624735c222bf9358d37961e6c49c21c579)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
index b103319c6e..86ffb37dec 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
@@ -127,7 +127,9 @@
                         [% END # /add_op %]
 
                         [% IF ( MY_TAGS ) %]
-                            <form method="post" action="opac-tags.pl">
+                            <form id="deletetags" name="deletetags" method="post" action="opac-tags.pl">
+                                [% INCLUDE 'csrf-token.inc' %]
+                                <input type="hidden" name="op" value="cud-del" />
                                 <table id="mytagst" class="table table-bordered table-striped">
                                     <caption>Your tags</caption>
                                     <thead>
@@ -183,10 +185,6 @@
                                 </table>
                                 <input type="submit" value="Remove selected tags" class="btn btn-danger remove">
                             </form>
-                            <form id="deletetags" name="deletetags" method="post" action="/cgi-bin/koha/opac-tags.pl">
-                                [% INCLUDE 'csrf-token.inc' %]
-                                <input type="hidden" name="op" value="cud-del" />
-                            </form>
                         [% END # /MY_TAGS %]
                     </div> <!-- / .usertags -->
                 </div> <!-- / .span10/12 -->
-- 
2.39.5