[Koha-cvs] CVS: koha newmember.pl,1.8,1.9

[Mike Hansen]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv2414/koha

Modified Files:
	newmember.pl 
Log Message:
Fixed problems with non-US date such as 28/10/1983.


Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** newmember.pl	25 Mar 2003 05:13:26 -0000	1.8
--- newmember.pl	26 Mar 2003 03:46:20 -0000	1.9
***************
*** 43,47 ****
  use Date::Manip;
  use HTML::Template;
! 
  my %env;
  my $input = new CGI;
--- 43,47 ----
  use Date::Manip;
  use HTML::Template;
! use C4::Date;
  my %env;
  my $input = new CGI;
***************
*** 127,135 ****
      if ($data{'joining'} eq ''){
  	$data{'joining'}=ParseDate('today');
! 	$data{'joining'}=&UnixDate($data{'joining'},'%Y-%m-%d');
      }
      if ($data{'expiry'} eq ''){
  	$data{'expiry'}=ParseDate('in 1 year');
! 	$data{'expiry'}=&UnixDate($data{'expiry'},'%Y-%m-%d');
      }
      my $ethnic=$data{'ethnicity'}." ".$data{'ethnicnotes'};
--- 127,135 ----
      if ($data{'joining'} eq ''){
  	$data{'joining'}=ParseDate('today');
! 	$data{'joining'}=format_date($data{'joining'});
      }
      if ($data{'expiry'} eq ''){
  	$data{'expiry'}=ParseDate('in 1 year');
! 	$data{'expiry'}=format_date($data{'expiry'});
      }
      my $ethnic=$data{'ethnicity'}." ".$data{'ethnicnotes'};
***************
*** 156,164 ****
  		     area => $data{'area'},
  		     fee => $data{'fee'},
! 		     joindate => $data{'joining'},
! 		     expdate => $data{'expiry'},
  		     joinbranch => $data{'joinbranch'},
  		     ethnic => $ethnic,
! 		     dob => $data{'dateofbirth'},
  		     sex => $sex,
  		     postal => $postal,
--- 156,164 ----
  		     area => $data{'area'},
  		     fee => $data{'fee'},
! 		     joindate => format_date($data{'joining'}),
! 		     expdate => format_date($data{'expiry'}),
  		     joinbranch => $data{'joinbranch'},
  		     ethnic => $ethnic,
! 		     dob => format_date($data{'dateofbirth'}),
  		     sex => $sex,
  		     postal => $postal,