Attachment 152627 Details for Bug 22990 – Bug 22990: Fix for shelves table

[patch] Bug 22990: Fix for shelves table

Bug-22990-Fix-for-shelves-table.patch (text/plain), 6.93 KB, created by Marcel de Rooy on 2023-06-23 09:33:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2023-06-23 09:33:50 UTC

Size: 6.93 KB

patch

obsolete

>From 88c3b45c20ff8e83be9e4c370988d19389af3e14 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 16 Sep 2021 15:13:23 +0100
>Subject: [PATCH] Bug 22990: Fix for shelves table
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../prog/en/modules/virtualshelves/shelves.tt             | 4 ++++
> .../en/modules/virtualshelves/tables/shelves_results.tt   | 2 ++
> virtualshelves/shelves.pl                                 | 8 +++++++-
> 3 files changed, 13 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index a28727f18d..9882e5cecf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -204,6 +204,7 @@
>                 <h1>Transfer ownership of public list [% shelf.shelfname | html %]</h1>
> 
>                 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="transferform" method="post">
>+                    [% INCLUDE 'csrf-token.inc' %]
>                     <fieldset>
>                         <input type="hidden" name="op" value="transfer" />
>                         <input type="hidden" name="public" value="1" />
>@@ -238,6 +239,7 @@
>                     [% IF ( contents.count ) %]<p>This list contains [% contents.count | html %] titles</p>[% END %]
>                     <div class="pages">[% pagination_bar | $raw %]</div>
>                     <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
>+                        [% INCLUDE 'csrf-token.inc' %]
>                         <input type="hidden" name="op" value="remove_biblios" />
>                         <input type="hidden" name="referer" value="view" />
>                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
>@@ -389,6 +391,7 @@
>             [% IF op == 'add_form' OR op == 'edit_form' %]
> 
>                 <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">
>+                    [% INCLUDE 'csrf-token.inc' %]
>                     <fieldset class="rows">
>                         [% IF op == 'add_form' %]
>                             <legend><h1>Create a new list</h1></legend>
>@@ -546,6 +549,7 @@
>     <div class="modal" id="addToList" tabindex="-1" role="dialog" aria-labelledby="addToListLabel">
>         <div class="modal-dialog" role="document">
>             <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post">
>+                [% INCLUDE 'csrf-token.inc' %]
>                 <div class="modal-content">
>                     <div class="modal-header">
>                         <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>index 26675409ce..0b7152072b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt
>@@ -39,6 +39,7 @@
>     [%~ public      = public | html ~%]
>     [%~ IF can_manage_shelf ~%]
>         [%~ action_block =                '<form action="shelves.pl" method="get">' ~%]
>+        [%~ action_block = action_block _ '[% INCLUDE 'csrf-token.inc' %]' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
>@@ -48,6 +49,7 @@
>     [%~ END ~%]
>     [%~ IF can_delete_shelf ~%]
>         [%~ action_block = action_block _ ' <form action="shelves.pl" method="post">' ~%]
>+        [%~ action_block = action_block _ '[% INCLUDE 'csrf-token.inc' %]' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="shelves" value="1" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="op" value="delete" />' ~%]
>         [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
>diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl
>index a7c5fcf7f0..33564f8333 100755
>--- a/virtualshelves/shelves.pl
>+++ b/virtualshelves/shelves.pl
>@@ -29,7 +29,7 @@ use C4::Koha qw(
>     GetNormalizedUPC
> );
> use C4::Members;
>-use C4::Output qw( pagination_bar output_html_with_http_headers );
>+use C4::Output qw( pagination_bar output_html_with_http_headers output_and_exit_if_error );
> use C4::XSLT qw( XSLTParse4Display );
> 
> use Koha::Biblios;
>@@ -64,6 +64,7 @@ if ( $op eq 'add_form' ) {
>     # Only pass default
>     $shelf = { allow_change_from_owner => 1 };
> } elsif ( $op eq 'edit_form' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     $shelfnumber = $query->param('shelfnumber');
>     $shelf       = Koha::Virtualshelves->find($shelfnumber);
> 
>@@ -79,6 +80,7 @@ if ( $op eq 'add_form' ) {
>         push @messages, { type => 'alert', code => 'does_not_exist' };
>     }
> } elsif ( $op eq 'add' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     my $allow_changes_from = $query->param('allow_changes_from');
>     eval {
>         $shelf = Koha::Virtualshelf->new(
>@@ -105,6 +107,7 @@ if ( $op eq 'add_form' ) {
>         $op = 'view';
>     }
> } elsif ( $op eq 'edit' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     $shelfnumber = $query->param('shelfnumber');
>     $shelf       = Koha::Virtualshelves->find($shelfnumber);
> 
>@@ -136,6 +139,7 @@ if ( $op eq 'add_form' ) {
>         push @messages, { type => 'alert', code => 'does_not_exist' };
>     }
> } elsif ( $op eq 'delete' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     $shelfnumber = $query->param('shelfnumber');
>     $shelf       = Koha::Virtualshelves->find($shelfnumber);
>     if ($shelf) {
>@@ -154,6 +158,7 @@ if ( $op eq 'add_form' ) {
>     }
>     $op = 'list';
> } elsif ( $op eq 'add_biblio' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     $shelfnumber = $query->param('shelfnumber');
>     $shelf = Koha::Virtualshelves->find($shelfnumber);
>     if ($shelf) {
>@@ -210,6 +215,7 @@ if ( $op eq 'add_form' ) {
>     }
>     $op = $referer;
> } elsif ( $op eq 'remove_biblios' ) {
>+    output_and_exit_if_error($query, $cookie, $template, { check => 'csrf_token' });
>     $shelfnumber = $query->param('shelfnumber');
>     $shelf = Koha::Virtualshelves->find($shelfnumber);
>     my @biblionumbers = $query->multi_param('biblionumber');
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 22990: 90102 | 90192 | 90194 | 90202 | 90204 | 90209 | 90238 | 90239 | 90240 | 95381 | 95382 | 95383 | 95384 | 95385 | 95391 | 95392 | 95393 | 95394 | 95395 | 95396 | 97814 | 122010 | 122011 | 122012 | 122013 | 122014 | 122015 | 122016 | 122023 | 122024 | 122025 | 122026 | 122027 | 122028 | 122029 | 122030 | 122031 | 122046 | 124924 | 124925 | 124926 | 124927 | 124928 | 124929 | 124930 | 124931 | 124932 | 124933 | 124934 | 126091 | 126092 | 126093 | 126094 | 126095 | 126096 | 126097 | 126098 | 126099 | 126100 | 126101 | 133238 | 133239 | 133240 | 133241 | 133242 | 133243 | 133244 | 133245 | 133246 | 133247 | 133248 | 133254 | 133255 | 133256 | 133257 | 133258 | 133422 | 133423 | 133424 | 133425 | 133426 | 133427 | 134848 | 134849 | 134850 | 134851 | 134852 | 134853 | 134854 | 141294 | 141295 | 141296 | 144315 | 144316 | 144317 | 144318 | 144319 | 144320 | 144321 | 144322 | 152626 | 152627 | 152628 | 153394 | 153751 | 153753 | 154044