X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reserve%2Fmodrequest.pl;h=eecd86b2f6b182cd3c408e508c51fcca755e7b80;hb=b8384c95eef0b67cf1666a05c8d98ce777d51372;hp=54d15b0d070e4a816b688ea09c8458441c1997c5;hpb=fc1342f73df868410e0ab670981f25ba2e1acd74;p=koha_gimpoz

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 54d15b0d07..eecd86b2f6 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -18,46 +18,69 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
+use warnings;
 use CGI;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
+use C4::Auth;
 
-my $input = new CGI;
-#print $input->header;
+my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {   
+        template_name   => "about.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
 
-my @rank=$input->param('rank-request');
-my @biblionumber=$input->param('biblionumber');
-my @borrower=$input->param('borrowernumber');
-my @branch=$input->param('pickup');
-my @itemnumber=$input->param('itemnumber');
+my @rank=$query->param('rank-request');
+my @biblionumber=$query->param('biblionumber');
+my @borrower=$query->param('borrowernumber');
+my @branch=$query->param('pickup');
+my @itemnumber=$query->param('itemnumber');
+my $multi_hold = $query->param('multi_hold');
+my $biblionumbers = $query->param('biblionumbers');
 my $count=@rank;
 
-my $CancelBiblioNumber=$input->param('CancelBiblioNumber');
-my $CancelBorrowerNumber=$input->param('CancelBorrowerNumber');
-my $CancelItemnumber=$input->param('CancelItemnumber');
+my $CancelBiblioNumber=$query->param('CancelBiblioNumber');
+my $CancelBorrowerNumber=$query->param('CancelBorrowerNumber');
+my $CancelItemnumber=$query->param('CancelItemnumber');
 
 # 2 possibilitys : cancel an item reservation, or modify or cancel the queded list
 
-# 1) cancel an item reservation by fonction GlobalCancel (in reserves2.pm)
+# 1) cancel an item reservation by fonction ModReserveCancelAll (in reserves.pm)
 if ($CancelBorrowerNumber) {
-	GlobalCancel($CancelItemnumber, $CancelBorrowerNumber);
-	$biblionumber[0] = $CancelBiblioNumber,
+    ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
+    $biblionumber[0] = $CancelBiblioNumber,
 }
 
 # 2) Cancel or modify the queue list of reserves (without item linked)
 else {
-	for (my $i=0;$i<$count;$i++){
-		UpdateReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves2
-	}
+    for (my $i=0;$i<$count;$i++){
+        undef $itemnumber[$i] unless $itemnumber[$i] ne '';
+        ModReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]); #from C4::Reserves
+    }
 }
-my $from=$input->param('from');
-if ($from eq 'borrower'){
-  print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
- } else {
-   print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
+my $from=$query->param('from');
+$from ||= q{};
+if ( $from eq 'borrower'){
+    print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
+} elsif ( $from eq 'circ'){
+    print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
+} else {
+     my $url = "/cgi-bin/koha/reserve/request.pl?";
+     if ($multi_hold) {
+         $url .= "multi_hold=1&biblionumbers=$biblionumbers";
+     } else {
+         $url .= "biblionumber=$biblionumber[0]";
+     }
+     print $query->redirect($url);
 }