X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fsetstatus.pl;h=2c13401abc2edd60029de023ec147a45503fba2b;hb=HEAD;hp=c2b7a38857d94a9d4877dc63ff5fd13928dca01c;hpb=d579648df109eef4d807e5e29602b9710b8193bf;p=koha.git

diff --git a/members/setstatus.pl b/members/setstatus.pl
index c2b7a38857..2c13401abc 100755
--- a/members/setstatus.pl
+++ b/members/setstatus.pl
@@ -6,6 +6,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Parts copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -18,11 +19,12 @@
 # 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::Context;
@@ -32,15 +34,13 @@ use C4::Auth;
 
 my $input = new CGI;
 
-my $flagsrequired;
-$flagsrequired->{borrowers}=1;
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
+checkauth($input, 0, { borrowers => 1 }, 'intranet');
 
-my $destination = $input->param("destination");
+my $destination = $input->param("destination") || '';
 my $cardnumber = $input->param("cardnumber");
 my $borrowernumber=$input->param('borrowernumber');
 my $status = $input->param('status');
-my $reregistration = $input->param('reregistration');
+my $reregistration = $input->param('reregistration') || '';
 
 my $dbh = C4::Context->dbh;
 my $dateexpiry;
@@ -49,21 +49,21 @@ if ( $reregistration eq 'y' ) {
 	# re-reregistration function to automatic calcul of date expiry
 	$dateexpiry = ExtendMemberSubscriptionTo( $borrowernumber );
 } else {
-	my $sth=$dbh->prepare("Update borrowers set debarred = ? where borrowernumber = ?");
-	$sth->execute($status,$borrowernumber);	
+    my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
+    $sth->execute( $status, $borrowernumber );
 	$sth->finish;
 	}
 
 if($destination eq "circ"){
 	if($dateexpiry){
-		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&dateexpiry=$dateexpiry");
+        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1");
 	} else {
 		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
 	}
 } else {
 	if($dateexpiry){
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber&dateexpiry=$dateexpiry");
+        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
 	} else {
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
 	}
 }