[Koha-cvs] CVS: koha/members memberentry.pl,1.5.2.2,1.5.2.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26769/members

Modified Files:
      Tag: rel_2_2
	memberentry.pl 
Log Message:
some bugfixes in physaddress and streetaddress. members table is really clumsy. Should be rewritten in 2.4...

NELSONVILLE : those are only bugfixes, but may have some consequences on NPL templates. Check twice please

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** memberentry.pl	1 Mar 2005 13:13:03 -0000	1.5.2.2
--- memberentry.pl	25 Mar 2005 17:03:37 -0000	1.5.2.3
***************
*** 53,57 ****
  			     });
  
! my $member=$input->param('bornum');
  my $actionType=$input->param('actionType') || '';
  my $modify=$input->param('modify');
--- 53,57 ----
  			     });
  
! my $borrowernumber=$input->param('borrowernumber');
  my $actionType=$input->param('actionType') || '';
  my $modify=$input->param('modify');
***************
*** 101,105 ****
  		$nok=1;
  	}
! 	if ($data{'address'} eq ''){
  		push @errors, "ERROR_address";
  		$nok=1;
--- 101,105 ----
  		$nok=1;
  	}
! 	if ($data{'streetaddress'} eq ''){
  		push @errors, "ERROR_address";
  		$nok=1;
***************
*** 121,125 ****
  			&modmember(%data);
  		}else{
! 			$data{borrowernumber} = &newmember(%data);
  		}
  		
--- 121,125 ----
  			&modmember(%data);
  		}else{
! 			$borrowernumber = &newmember(%data);
  		}
  		
***************
*** 127,136 ****
  		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
  	} else {
! 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");
  		}
  	}
  }
  if ($delete){
! 	print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member");
  } else {  # this else goes down the whole script
  	if ($actionType eq 'Add'){
--- 127,136 ----
  		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
  	} else {
! 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
  		}
  	}
  }
  if ($delete){
! 	print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
  } else {  # this else goes down the whole script
  	if ($actionType eq 'Add'){
***************
*** 147,151 ****
  		}
  	} else {
! 		$data=borrdata('',$member);
  	}
  	if ($actionType eq 'Add'){
--- 147,151 ----
  		}
  	} else {
! 		$data=borrdata('',$borrowernumber);
  	}
  	if ($actionType eq 'Add'){
***************
*** 236,240 ****
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				member          => $member,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
--- 236,240 ----
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				borrowernumber          => $borrowernumber,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
***************
*** 244,248 ****
  				ethcatpopup	=> $ethcatpopup,
  				catcodepopup	=> $catcodepopup,
! 				streetaddress   => $data->{'physstreet'},
  				zipcode => $data->{'zipcode'},
  				streetcity      => $data->{'streetcity'},
--- 244,249 ----
  				ethcatpopup	=> $ethcatpopup,
  				catcodepopup	=> $catcodepopup,
! 				streetaddress   => $data->{'streetaddress'},
! 				physstreet   => $data->{'physstreet'},
  				zipcode => $data->{'zipcode'},
  				streetcity      => $data->{'streetcity'},