Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv27882 Modified Files: deletemem.pl Log Message: Fixing member deletion, so that it checks fines, issues and guarantees before deleting Index: deletemem.pl =================================================================== RCS file: /cvsroot/koha/koha/deletemem.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** deletemem.pl 2001/07/05 21:37:59 1.1 --- deletemem.pl 2001/09/11 02:03:26 1.2 *************** *** 19,35 **** my %env; $env{'nottodayissues'}=1; ! my %member2; ! $member2{'borrowernumber'}=$member; ! my $issues=currentissues(\%env,\%member2); ! my $i=0; ! foreach (sort keys %$issues) { $i++; ! } ! if ($i > 0){ print $input->header; ! print "error borrower has items on issue"; } else { ! delmember($member); ! print $input->redirect("/members/"); } --- 19,56 ---- my %env; $env{'nottodayissues'}=1; ! my %member2; ! $member2{'borrowernumber'}=$member; ! my $issues=currentissues(\%env,\%member2); ! my $i=0; ! foreach (sort keys %$issues) { $i++; ! } ! my ($bor,$flags)=getpatroninformation(\%env, $member,''); ! my $dbh=C4Connect; ! my $query="Select * from borrowers where guarantor='$member'"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my $data=$sth->fetchrow_hashref; ! $sth->finish; ! $dbh->disconnect; ! ! ! if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){ print $input->header; ! print "<table border=1>"; ! if ($i > 0){ ! print "<TR><TD>Items on Issue</td><td align=right>$i</td></tr>"; ! } ! if ($flags->{'CHARGES'} ne ''){ ! print "<TR><TD>Charges</td><td>$flags->{'CHARGES'}->{'message'}</tr>"; ! } ! if ($data ne ''){ ! print "<TR><TD>Guarantees</td></tr>"; ! } ! print "</table>"; ! } else { ! delmember($member); ! print $input->redirect("/members/"); } *************** *** 52,55 **** --- 73,80 ---- $sth->finish; $query = "Delete from borrowers where borrowernumber='$member'"; + $sth=$dbh->prepare($query); + $sth->execute; + $sth->finish; + $query="Delete from reserves where borrowernumber='$member'"; $sth=$dbh->prepare($query); $sth->execute;