X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reserve%2Fplacerequest.pl;h=c896c9d6d9c9b13dc496ecb1123bd0e423967a21;hb=bc39f0392bbebaad4c083f81308f652a325be042;hp=b299c174026b2f9379167de3ad832ba604b0e1be;hpb=4747ea7462c04770484386538b1594c1760bc75b;p=koha.git

diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index b299c17402..c896c9d6d9 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -1,60 +1,62 @@
 #!/usr/bin/perl
 
 #script to place reserves/requests
-#writen 2/1/00 by chris@katipo.oc.nz
+#written 2/1/00 by chris@katipo.oc.nz
 
 
 # Copyright 2000-2002 Katipo Communications
 #
 # 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., 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, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
+
+use CGI qw ( -utf8 );
 use C4::Biblio;
 use C4::Items;
-use CGI;
 use C4::Output;
 use C4::Reserves;
 use C4::Circulation;
 use C4::Members;
+use C4::Auth qw/checkauth/;
+
+my $input = CGI->new();
+
+checkauth($input, 0, { reserveforothers => 'place_holds' }, 'intranet');
 
-my $input = new CGI;
-#print $input->header;
-
-
-my @bibitems=$input->param('biblioitem');
-# FIXME I think reqbib does not exist anymore, it's used in line 82, to AddReserve of contraint type 'o'
-#       I bet it's a 2.x feature, reserving a given biblioitem, that is useless in Koha 3.0
-#       we can remove this line, the AddReserve of constrainttype 'o',
-#       and probably remove the reserveconstraint table as well, I never could fill anything in this table.
-my @reqbib=$input->param('reqbib'); 
-my $biblionumber=$input->param('biblionumber');
-my $borrower=$input->param('member');
-my $notes=$input->param('notes');
-my $branch=$input->param('pickup');
-my $startdate=$input->param('reserve_date') || '';
-my @rank=$input->param('rank-request');
-my $type=$input->param('type');
-my $title=$input->param('title');
-my $borrowernumber=GetMember('cardnumber'=>$borrower);
-my $checkitem=$input->param('checkitem');
+my @bibitems       = $input->multi_param('biblioitem');
+my @reqbib         = $input->multi_param('reqbib');
+my $biblionumber   = $input->param('biblionumber');
+my $borrowernumber = $input->param('borrowernumber');
+my $notes          = $input->param('notes');
+my $branch         = $input->param('pickup');
+my $startdate      = $input->param('reserve_date') || '';
+my @rank           = $input->multi_param('rank-request');
+my $type           = $input->param('type');
+my $title          = $input->param('title');
+my $checkitem      = $input->param('checkitem');
+my $expirationdate = $input->param('expiration_date');
+my $itemtype       = $input->param('itemtype') || undef;
+
+my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
 
 my $multi_hold = $input->param('multi_hold');
 my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
 my $bad_bibs = $input->param('bad_bibs');
+my $holds_to_place_count = $input->param('holds_to_place_count') || 1;
 
 my %bibinfos = ();
 my @biblionumbers = split '/', $biblionumbers;
@@ -69,7 +71,7 @@ my $found;
 
 # if we have an item selectionned, and the pickup branch is the same as the holdingbranch
 # of the document, we force the value $rank and $found .
-if ($checkitem ne ''){
+if (defined $checkitem && $checkitem ne ''){
     $rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
     my $item = $checkitem;
     $item = GetItem($item);
@@ -78,37 +80,39 @@ if ($checkitem ne ''){
     }
 }
 
-if ($type eq 'str8' && $borrowernumber ne ''){
+if ( $type eq 'str8' && $borrower ) {
 
-    foreach my $biblionumber (keys %bibinfos) {
-        my $count=@bibitems;
-        @bibitems=sort @bibitems;
-        my $i2=1;
+    foreach my $biblionumber ( keys %bibinfos ) {
+        my $count = @bibitems;
+        @bibitems = sort @bibitems;
+        my $i2 = 1;
         my @realbi;
-        $realbi[0]=$bibitems[0];
-        for (my $i=1;$i<$count;$i++) {
-            my $i3=$i2-1;
-            if ($realbi[$i3] ne $bibitems[$i]) {
-                $realbi[$i2]=$bibitems[$i];
+        $realbi[0] = $bibitems[0];
+        for ( my $i = 1 ; $i < $count ; $i++ ) {
+            my $i3 = $i2 - 1;
+            if ( $realbi[$i3] ne $bibitems[$i] ) {
+                $realbi[$i2] = $bibitems[$i];
                 $i2++;
             }
         }
-        my $const;
+
+        if ( defined $checkitem && $checkitem ne '' ) {
+            my $item = GetItem($checkitem);
+            if ( $item->{'biblionumber'} ne $biblionumber ) {
+                $biblionumber = $item->{'biblionumber'};
+            }
+        }
 
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
-            AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
-                       $bibinfo->{rank},$startdate,$notes,$bibinfo->{title},$checkitem,$found);
+            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
+                       $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
         } else {
-            if ($input->param('request') eq 'any'){
-                # place a request on 1st available
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$notes,$title,$checkitem,$found);
-            } elsif ($reqbib[0] ne ''){
-                # FIXME : elsif probably never reached, (see top of the script)
-                # place a request on a given item
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$notes,$title,$checkitem, $found);
-            } else {
-                AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$notes,$title,$checkitem, $found);
+            # place a request on 1st available
+            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
+                AddReserve( $branch, $borrower->{'borrowernumber'},
+                    $biblionumber, \@realbi, $rank[0], $startdate, $expirationdate, $notes, $title,
+                    $checkitem, $found, $itemtype );
             }
         }
     }
@@ -118,11 +122,16 @@ if ($type eq 'str8' && $borrowernumber ne ''){
             $biblionumbers .= $bad_bibs;
         }
         print $input->redirect("request.pl?biblionumbers=$biblionumbers&multi_hold=1");
-    } else {
+    }
+    else {
         print $input->redirect("request.pl?biblionumber=$biblionumber");
     }
-} elsif ($borrowernumber eq ''){
-	print $input->header();
-	print "Invalid card number please try again";
-	print $input->Dump;
+}
+elsif ( $borrower eq '' ) {
+    print $input->header();
+    print "Invalid borrower number please try again";
+
+    # Not sure that Dump() does HTML escaping. Use firebug or something to trace
+    # instead.
+    #	print $input->Dump;
 }