X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-modrequest-suspend.pl;h=8058394b9aea12fde4d7f32303f950bfbe893efa;hb=8da05cb2a8793b5866c50f796569ce3336807256;hp=ec152659dd08e88c6c2b9d9ff20af91936f9537a;hpb=367c4fb8815bfe4a01869a25bcd8222989c15dcd;p=koha.git

diff --git a/opac/opac-modrequest-suspend.pl b/opac/opac-modrequest-suspend.pl
index ec152659dd..8058394b9a 100755
--- a/opac/opac-modrequest-suspend.pl
+++ b/opac/opac-modrequest-suspend.pl
@@ -2,45 +2,50 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Reserves;
 use C4::Auth;
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-account.tmpl",
+        template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
 );
 
 my $suspend       = $query->param('suspend');
 my $suspend_until = $query->param('suspend_until') || undef;
+my $reserve_id    = $query->param('reserve_id');
 
-SuspendAll(
-    borrowernumber => $borrowernumber,
-    suspend        => $suspend,
-    suspend_until  => $suspend_until,
-);
+if ($reserve_id) {
+    ToggleSuspend( $reserve_id, $suspend_until ) if CanReserveBeCanceledFromOpac($reserve_id, $borrowernumber);
+}
+else {
+    SuspendAll(
+        borrowernumber => $borrowernumber,
+        suspend        => $suspend,
+        suspend_until  => $suspend_until,
+    );
+}
 
 print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");