X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmemberentry.pl;h=0466a8b0e7c084c5d05e4e7054fdc069cc3a9a47;hb=eaa62ab2cde8d52696559353e1506f5320fd7ec1;hp=5c39d84b4be4ab337d866c04e1b3b467d3f4a08d;hpb=be5cddb39df911d0ac033b6c91e7ffb8b4c11089;p=koha_gimpoz

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 5c39d84b4b..0466a8b0e7 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -19,6 +19,7 @@
 
 # pragma
 use strict;
+use warnings;
 
 # external modules
 use CGI;
@@ -57,22 +58,26 @@ my ($template, $loggedinuser, $cookie)
            authnotrequired => 0,
            flagsrequired => {borrowers => 1},
            debug => ($debug) ? 1 : 0,
-           });
-my $guarantorid=$input->param('guarantorid');
-my $borrowernumber=$input->param('borrowernumber');
-my $actionType=$input->param('actionType') || '';
-my $modify=$input->param('modify');
-my $delete=$input->param('delete');
-my $op=$input->param('op');
-my $destination=$input->param('destination');
-my $cardnumber=$input->param('cardnumber');
-my $check_member=$input->param('check_member');
-my $name_city=$input->param('name_city');
-my $nodouble=$input->param('nodouble');
-my $select_city=$input->param('select_city');
-my $nok=$input->param('nok');
-my $guarantorinfo=$input->param('guarantorinfo');
-my $step=$input->param('step') || 0;
+       });
+my $guarantorid    = $input->param('guarantorid');
+my $borrowernumber = $input->param('borrowernumber');
+my $actionType     = $input->param('actionType') || '';
+my $modify         = $input->param('modify');
+my $delete         = $input->param('delete');
+my $op             = $input->param('op');
+my $destination    = $input->param('destination');
+my $cardnumber     = $input->param('cardnumber');
+my $check_member   = $input->param('check_member');
+my $name_city      = $input->param('name_city');
+my $nodouble       = $input->param('nodouble');
+$nodouble = 1 if $op eq 'modify'; # FIXME hack to represent fact that if we're
+                                  # modifying an existing patron, it ipso facto
+                                  # isn't a duplicate.  Marking FIXME because this
+                                  # script needs to be refactored.
+my $select_city    = $input->param('select_city');
+my $nok            = $input->param('nok');
+my $guarantorinfo  = $input->param('guarantorinfo');
+my $step           = $input->param('step') || 0;
 my @errors;
 my $default_city;
 # $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
@@ -94,16 +99,16 @@ foreach (@field_check) {
 	$template->param( "mandatory$_" => 1);    
 }
 $template->param("add"=>1) if ($op eq 'add');
-$template->param("checked" => 1) if ($nodouble eq 1);
+$template->param("checked" => 1) if (defined($nodouble) && $nodouble eq 1);
 ($borrower_data = GetMember($borrowernumber,'borrowernumber')) if ($op eq 'modify' or $op eq 'save');
-my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'};
+my $categorycode  = $input->param('categorycode') || $borrower_data->{'categorycode'};
 my $category_type = $input->param('category_type');
 my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type.
 unless ($category_type or !($categorycode)){
-  my $borrowercategory= GetBorrowercategory($categorycode);
-  $category_type = $borrowercategory->{'category_type'};
-  my $category_name = $borrowercategory->{'description'}; 
-  $template->param("categoryname"=>$category_name);
+    my $borrowercategory = GetBorrowercategory($categorycode);
+    $category_type    = $borrowercategory->{'category_type'};
+    my $category_name = $borrowercategory->{'description'}; 
+    $template->param("categoryname"=>$category_name);
 }
 $category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
 
@@ -114,8 +119,10 @@ my %newdata;	# comes from $input->param()
 if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
     my @names= ($borrower_data && $op ne 'save') ? keys %$borrower_data : $input->param();
     foreach my $key (@names) {
-        $newdata{$key} = $input->param($key) if (defined $input->param($key));
-        $newdata{$key} =~ s/\"/"/gg unless $key eq 'borrowernotes' or $key eq 'opacnote';
+        if (defined $input->param($key)) {
+            $newdata{$key} = $input->param($key);
+            $newdata{$key} =~ s/\"/"/g unless $key eq 'borrowernotes' or $key eq 'opacnote';
+        }
     }
     my $dateobject = C4::Dates->new();
     my $syspref = $dateobject->regexp();		# same syspref format for all 3 dates
@@ -134,12 +141,12 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
     }
   # check permission to modify login info.
     if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($dbh,$userenv->{'id'},{'staffaccess'=>1})) )  {
-        $NoUpdateLogin =1;
+        $NoUpdateLogin = 1;
     }
 }
 
 #############test for member being unique #############
-if ($op eq 'insert'){
+if (($op eq 'insert') and !$nodouble){
         my $category_type_send=$category_type if ($category_type eq 'I'); 
         my $check_category; # recover the category code of the doublon suspect borrowers
 			#   ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
@@ -149,8 +156,10 @@ if ($op eq 'insert'){
 			($newdata{firstname}   ? $newdata{firstname}   : $data{firstname}  ),
 			($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth})
 		);
-          
-  #   recover the category type if the borrowers is a doublon 
+        if(!$check_member){
+            $nodouble = 1;
+        }
+  #   recover the category type if the borrowers is a doublon
     if ($check_category) {
       my $tmpborrowercategory=GetBorrowercategory($check_category);
       $check_categorytype=$tmpborrowercategory->{'category_type'};
@@ -158,21 +167,21 @@ if ($op eq 'insert'){
 }
 
   #recover all data from guarantor address phone ,fax... 
-if (($category_type eq 'C' || $category_type eq 'P') and $guarantorid ne '' ){
+if (defined($guarantorid) and ($category_type eq 'C' || $category_type eq 'P') and $guarantorid ne '' ){
   my $guarantordata=GetMember($guarantorid);
   $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
-  if (($data{'contactname'} eq '' or $data{'contactname'} ne $guarantordata->{'surname'})) {
-    $data{'contactfirstname'}= $guarantordata->{'firstname'};
-    $data{'contactname'}     = $guarantordata->{'surname'};
-    $data{'contacttitle'}    = $guarantordata->{'title'};
+  if (!defined($data{'contactname'}) or $data{'contactname'} eq '' or $data{'contactname'} ne $guarantordata->{'surname'}) {
+    $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
+    $newdata{'contactname'}     = $guarantordata->{'surname'};
+    $newdata{'contacttitle'}    = $guarantordata->{'title'};
 	  foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) {
-		$data{$_} = $guarantordata->{$_};
+		$newdata{$_} = $guarantordata->{$_};
 	}
   }
 }
 
 ###############test to take the right zipcode and city name ##############
-if ($guarantorid eq '') {
+if (!defined($guarantorid) or $guarantorid eq '') {
     # set only if parameter was passed from the form
     $newdata{'city'}    = $input->param('city')    if defined($input->param('city'));
     $newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode'));
@@ -180,13 +189,10 @@ if ($guarantorid eq '') {
 
 #builds default userid
 if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){
-  my $onefirstnameletter = substr($data{'firstname'},0,1);
-  my  $fivesurnameletter = substr($data{'surname'},0,9);
-  $newdata{'userid'}=lc($onefirstnameletter.$fivesurnameletter);
+    $newdata{'userid'} = Generate_Userid($borrowernumber, $newdata{'firstname'}, $newdata{'surname'});
 }
   
 $debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
-my $loginexist=0;
 my $extended_patron_attributes = ();
 if ($op eq 'save' || $op eq 'insert'){
   if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
@@ -213,11 +219,10 @@ if ($op eq 'save' || $op eq 'insert'){
   # Check if the userid is unique
   unless (Check_Userid($newdata{'userid'},$borrowernumber)) {
     push @errors, "ERROR_login_exist";
-    $loginexist=1; 
   }
   
   my $password = $input->param('password');
-    push @errors, "ERROR_short_password" if( $password && $minpw && (length($password) < $minpw ) );
+  push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) );
 
   if (C4::Context->preference('ExtendedPatronAttributes')) {
     $extended_patron_attributes = parse_extended_patron_attributes($input);
@@ -231,16 +236,15 @@ if ($op eq 'save' || $op eq 'insert'){
 }
 
 if ($op eq 'modify' || $op eq 'insert' || $op eq 'save' ){
-  unless ($newdata{'dateexpiry'}){
-	my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
-    $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
-  }
+    unless ($newdata{'dateexpiry'}){
+        my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
+        $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
+    }
 }
 
 ###  Error checks should happen before this line.
-
 $nok = $nok || scalar(@errors);
-if ((!$nok) and ($op eq 'insert' or $op eq 'save')){
+if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
 	$debug and warn "$op dates: " . join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
 	if ($op eq 'insert'){
 		# we know it's not a duplicate borrowernumber or there would already be an error
@@ -302,41 +306,43 @@ if ($delete){
 	exit;		# same as above
 }
 
-if ($nok){
-  $op="add" if ($op eq "insert");
-  $op="modify" if ($op eq "save");
-  %data=%newdata; 
-  $template->param( updtype => ($op eq 'add' ?'I':'M'));	# used to check for $op eq "insert"... but we just changed $op!
-  unless ($step){  
-    $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1);
-  }  
+if ($nok or !$nodouble){
+    $op="add" if ($op eq "insert");
+    $op="modify" if ($op eq "save");
+    %data=%newdata; 
+    $template->param( updtype => ($op eq 'add' ?'I':'M'));	# used to check for $op eq "insert"... but we just changed $op!
+    unless ($step){  
+        $template->param( step_1 => 1,step_2 => 1,step_3 => 1, step_4 => 1);
+    }  
 } 
 if (C4::Context->preference("IndependantBranches")) {
-  my $userenv = C4::Context->userenv;
-  if ($userenv->{flags} != 1 && $data{branchcode}){
-    unless ($userenv->{branch} eq $data{'branchcode'}){
-      print $input->redirect("/cgi-bin/koha/members/members-home.pl");
-	  exit;
+    my $userenv = C4::Context->userenv;
+    if ($userenv->{flags} != 1 && $data{branchcode}){
+        unless ($userenv->{branch} eq $data{'branchcode'}){
+            print $input->redirect("/cgi-bin/koha/members/members-home.pl");
+            exit;
+        }
     }
-  }
 }
 if ($op eq 'add'){
     my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
     $data{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
-    $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1, step_4 => 1);
+    $template->param( updtype => 'I', step_1=>1, step_2=>1, step_3=>1, step_4=>1);
 }
 if ($op eq "modify")  {
-  $template->param( updtype => 'M',modify => 1 );
-  $template->param( step_1=>1,step_2=>1,step_3=>1, step_4 => 1) unless $step;
+    $template->param( updtype => 'M',modify => 1 );
+    $template->param( step_1=>1, step_2=>1, step_3=>1, step_4=>1) unless $step;
 }
 # my $cardnumber=$data{'cardnumber'};
 $data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
-if ($data{'sex'} eq 'F'){
-  $template->param(female => 1);
+if(!defined($data{'sex'})){
+    $template->param( none => 1);
+} elsif($data{'sex'} eq 'F'){
+    $template->param( female => 1);
 } elsif ($data{'sex'} eq 'M'){
-    $template->param(male => 1);
+    $template->param(  male => 1);
 } else {
-    $template->param(none => 1);
+    $template->param(  none => 1);
 }
 
 ##Now all the data to modify a member.
@@ -362,7 +368,9 @@ foreach (qw(C A S P I X)) {
 	foreach my $cat (@$categories){
 		push @categoryloop,{'categorycode' => $cat,
 			  'categoryname' => $labels->{$cat},
-			  'categorycodeselected' => ($cat eq $borrower_data->{'categorycode'} || $cat eq $categorycode),
+			  'categorycodeselected' => ((defined($borrower_data->{'categorycode'}) && 
+                                                     $cat eq $borrower_data->{'categorycode'}) 
+                                                     || (defined($categorycode) && $cat eq $categorycode)),
 		};
 	}
 	my %typehash;
@@ -374,9 +382,9 @@ foreach (qw(C A S P I X)) {
 $template->param('typeloop' => \@typeloop);
 
 # test in city
-$select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
+$select_city=getidcity($data{'city'}) if defined $guarantorid and ($guarantorid ne '0');
 ($default_city=$select_city) if ($step eq 0);
-if ($select_city eq '' ){
+if (!defined($select_city) or $select_city eq '' ){
 	$default_city = &getidcity($data{'city'});
 }
 my($cityid);
@@ -412,12 +420,12 @@ my $borrotitlepopup = CGI::popup_menu(-name=>'title',
         -default=>$default_borrowertitle
         );    
 
-my @relationships = split /,|\|/,C4::Context->preference('BorrowerRelationship');
+my @relationships = split /,|\|/, C4::Context->preference('BorrowerRelationship');
 my @relshipdata;
 while (@relationships) {
   my $relship = shift @relationships || '';
   my %row = ('relationship' => $relship);
-  if ($data{'relationship'} eq $relship) {
+  if (defined($data{'relationship'}) and $data{'relationship'} eq $relship) {
     $row{'selected'}=' selected';
   } else {
     $row{'selected'}='';
@@ -499,20 +507,19 @@ if (C4::Context->preference("memberofinstitution")){
     );
 }
 
-
 # --------------------------------------------------------------------------------------------------------
 
 my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
 if ($CGIsort) {
-  $template->param(CGIsort1 => $CGIsort);
+    $template->param(CGIsort1 => $CGIsort);
 }
 $template->param( sort1 => $data{'sort1'});		# shouldn't this be in an "else" statement like the 2nd one?
 
 $CGIsort = buildCGIsort("Bsort2","sort2",$data{'sort2'});
 if ($CGIsort) {
-  $template->param(CGIsort2 => $CGIsort);
+    $template->param(CGIsort2 => $CGIsort);
 } else {
-  $template->param( sort2 => $data{'sort2'});
+    $template->param( sort2 => $data{'sort2'});
 }
 
 if ($nok) {
@@ -524,7 +531,7 @@ if ($nok) {
   
   #Formatting data for display    
   
-if ($data{'dateenrolled'} eq ''){
+if (!defined($data{'dateenrolled'}) or $data{'dateenrolled'} eq ''){
   $data{'dateenrolled'}=C4::Dates->today('iso');
 }
 if (C4::Context->preference('uppercasesurnames')) {
@@ -547,6 +554,7 @@ $template->param(%data);
 $template->param( "step_$step"  => 1) if $step;	# associate with step to know where u are
 $template->param(  step  => $step   ) if $step;	# associate with step to know where u are
 $template->param( debug  => $debug  ) if $debug;
+
 $template->param(
   BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
   category_type => $category_type,#to know the category type of the borrower
@@ -555,12 +563,12 @@ $template->param(
   "$category_type"  => 1,# associate with step to know where u are
   destination   => $destination,#to know wher u come from and wher u must go in redirect
   check_member    => $check_member,#to know if the borrower already exist(=>1) or not (=>0) 
-  flags   =>$data{'flags'},   
-  "op$op"   => 1,
+  "op$op"   => 1);
+
+$template->param(
   nodouble  => $nodouble,
-  borrowernumber  => $borrowernumber,#register number
-  "contacttitle_".$data{'contacttitle'} => "SELECTED" ,
-  guarantorid => $borrower_data ? $borrower_data->{'guarantorid'} : $guarantorid,
+  borrowernumber  => $borrowernumber, #register number
+  guarantorid => (defined($borrower_data->{'guarantorid'})) ? $borrower_data->{'guarantorid'} : $guarantorid,
   ethcatpopup => $ethcatpopup,
   relshiploop => \@relshipdata,
   citypopup => $citypopup,
@@ -578,6 +586,14 @@ $template->param(
   CGIorganisations => $CGIorganisations,
   NoUpdateLogin =>  $NoUpdateLogin
   );
+
+if(defined($data{'flags'})){
+  $template->param(flags=>$data{'flags'});
+}
+if(defined($data{'contacttitle'})){
+  $template->param("contacttitle_" . $data{'contacttitle'} => "SELECTED");
+}
+
   
 output_html_with_http_headers $input, $cookie, $template->output;
 
@@ -591,7 +607,7 @@ sub  parse_extended_patron_attributes {
         my $value = $input->param($key);
         next unless defined($value) and $value ne '';
         my $password = $input->param("${key}_password");
-        my $code = $input->param("${key}_code");
+        my $code     = $input->param("${key}_code");
         next if exists $dups{$code}->{$value};
         $dups{$code}->{$value} = 1;
         push @attr, { code => $code, value => $value, password => $password };