[Koha-cvs] koha/members deletemem.pl memberentry.pl

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Bruno Toumi <btoumi>	06/06/06 16:18:00

Modified files:
	members        : deletemem.pl memberentry.pl 

Log message:
	bug fix:	
	deletemem.pl:
	 syntax error in sql request ( bad field name) 
	memberentry.pl
	syntax error (bad variable name)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.25&r2=1.26

Patches:
Index: deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- deletemem.pl	26 Oct 2005 09:13:11 -0000	1.6
+++ deletemem.pl	6 Jun 2006 16:18:00 -0000	1.7
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.6 2005/10/26 09:13:11 tipaul Exp $
+# $Id: deletemem.pl,v 1.7 2006/06/06 16:18:00 btoumi Exp $
 
 #script to delete items
 #written 2/5/00
@@ -46,6 +46,7 @@
 #print $input->header;
 my $member=$input->param('member');
 my %env;
+warn "user num".$member;
 $env{'nottodayissues'}=1;
 my %member2;
 $member2{'borrowernumber'}=$member;
@@ -66,7 +67,7 @@
 	}
 }
 my $dbh = C4::Context->dbh;
-my $sth=$dbh->prepare("Select * from borrowers where guarantor=?");
+my $sth=$dbh->prepare("Select * from borrowers where guarantorid=?");
 $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 $sth->finish;

Index: memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- memberentry.pl	2 Jun 2006 15:37:29 -0000	1.25
+++ memberentry.pl	6 Jun 2006 16:18:00 -0000	1.26
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.25 2006/06/02 15:37:29 btoumi Exp $
+# $Id: memberentry.pl,v 1.26 2006/06/06 16:18:00 btoumi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -113,7 +113,7 @@
 	if ($op eq 'add' && $step eq 2){
 		(my $category_type_send=$category_type ) if ($category_type eq 'I'); 
  		my $check_category; # recover the category code of the doublon suspect borrowers
-	   ($check_member,$check_category)= checkuniquemember($category_type_send,$data{'surname'},$data{'firstname'},format_date_in_iso($data{'dateofbirth'}));
+	   ($check_member,$check_category)=checkuniquemember($category_type_send,$data{'surname'},$data{'firstname'},format_date_in_iso($data{'dateofbirth'}));
 # 	recover the category type if the borrowers is a duplicate
 	($check_categorytype,undef)=getcategorytype($check_category);
 	}
@@ -170,10 +170,10 @@
 	}
 # STEP 2
 	if ($step eq 2) {
-			if ( ($data{'login'} eq '')){
+			if ( ($data{'userid'} eq '')){
 				my $onefirstnameletter=substr($data{'firstname'},0,1);
 				my $fivesurnameletter=substr($data{'surname'},0,5);
-				$data{'login'}=lc($onefirstnameletter.$fivesurnameletter);
+				$data{'userid'}=lc($onefirstnameletter.$fivesurnameletter);
 			}
 			if ($op eq 'add' and $data{'dateenrolled'} eq ''){
  				my $today= sprintf('%04d-%02d-%02d', Today());
@@ -193,13 +193,13 @@
 # STEP 3
 	if ($step eq 3) {
 		# this value show if the login and password are been used
-		my $loginexist=checkuserpassword($borrowerid,$data{'login'},$data{'password'});
+		my $loginexist=checkuserpassword($borrowernumber,$data{'userid'},$data{'password'});
 		# test to know if u must save or create the borrowers
 		if ($op eq 'modify'){
 			# test to know if another user have the same password and same login		
 			if ($loginexist eq 0) {
 				&modmember(%data);		
-				logaction($loggedinuser,"MEMBERS","modify member", $borrowerid, "");
+				logaction($loggedinuser,"MEMBERS","modify member", $borrowernumber, "");
 			}
 			else {
 				push @errors, "ERROR_login_exist";
@@ -226,7 +226,7 @@
 				print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
 			} else {
 				if ($loginexist == 0) {
-				print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowerid");
+				print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
 				}
 			}
 		}
@@ -243,7 +243,6 @@
 }
 
 if ($delete){
-	print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowerid");
 	print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
 } else {  # this else goes down the whole script
 	# retrieve previous values : either in DB or in CGI, in case of errors in values