X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-renew.pl;h=03c4a714a4a411bd2cf18a2e922a0a795fb4956c;hb=0a0fcd31e039a01c0d7693b58a4d787109161954;hp=7b59f4752b40288b04f292544040df89837ce6a1;hpb=ae81b7c47345948f13c26508aaa07b53bd139ac0;p=koha.git

diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index 7b59f4752b..03c4a714a4 100755
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -7,29 +7,30 @@
 
 # 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::Circulation;
 use C4::Auth;
 use C4::Context;
 use C4::Items;
 use C4::Members;
+use Koha::Patrons;
 use Date::Calc qw( Today Date_to_Days );
 my $query = new CGI;
 
@@ -39,21 +40,20 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
 	}
 ); 
-my @items = $query->param('item');
+my @items = $query->multi_param('item');
 
 my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
 
 my $errorstring = q{};
 my $renewed     = q{};
 
-my $member_details = GetMemberDetails($borrowernumber);
+my $patron = Koha::Patrons->find( $borrowernumber );
 
-if (   $member_details->{'BlockExpiredPatronOpacActions'}
-    && $member_details->{'is_expired'} )
+if (   $patron->category->effective_BlockExpiredPatronOpacActions
+    && $patron->is_expired )
 {
     $errorstring = 'card_expired';
 }
@@ -70,7 +70,7 @@ else {
                 $branchcode = $item->{'homebranch'};
             }
             elsif ( $renewalbranch eq 'patronhomebranch' ) {
-                my $borrower = GetMemberDetails($borrowernumber);
+                my $borrower = GetMember( borrowernumber => $borrowernumber );
                 $branchcode = $borrower->{'branchcode'};
             }
             elsif ( $renewalbranch eq 'checkoutbranch' ) {
@@ -90,7 +90,7 @@ else {
             $errorstring .= $error . "|";
         }
     }
-    $renewed = join( '|', @renewed );
+    $renewed = join( ':', @renewed );
 }
 
 print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring&renewed=$renewed");