Fix for bug 1686
[koha.git] / members / memberentry.pl
index 234be6b..2f8b659 100755 (executable)
@@ -1,14 +1,6 @@
 #!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
 
-# $Id$
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris@katipo.co.nz
-
-
-# Copyright 2000-2002 Katipo Communications
+# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
 # This file is part of Koha.
 #
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# pragma
 use strict;
+
+# external modules
+use Date::Calc qw/Today/;
+use CGI;
+# use Digest::MD5 qw(md5_base64);
+
+# internal modules
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
 use C4::Members;
 use C4::Koha;
-use HTML::Template;
-use Date::Manip;
-use C4::Date;
+use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Input;
+use C4::Log;
+use C4::Branch; # GetBranches
+
+use vars qw($debug);
 
+BEGIN {
+       $debug = $ENV{DEBUG} || 0;
+}
+       
 my $input = new CGI;
+($debug) or $debug = $input->param('debug') || 0;
+my %data;
 
 my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/memberentry.tmpl",
-                            query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
-                            debug => 1,
-                            });
-
+    = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+           query => $input,
+           type => "intranet",
+           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 $categorycode=$input->param('categorycode');
 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 @errors;
+my $default_city;
+# $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
+my $check_categorytype=$input->param('check_categorytype');
+# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
+my $borrower_data;
+my $NoUpdateLogin;
+my $userenv = C4::Context->userenv;
+
+$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
+
+# function to designate mandatory fields (visually with css)
+my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
+my @field_check=split(/\|/,$check_BorrowerMandatoryField);
+foreach (@field_check) {
+       $template->param( "mandatory$_" => 1);    
+}
+$template->param("add"=>1) if ($op eq 'add');
+$template->param("checked" => 1) if ($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 $category_type = $input->param('category_type');
+unless ($category_type or !($categorycode)){
+  my $borrowercategory= GetBorrowercategory($categorycode);
+  $category_type = $borrowercategory->{'category_type'};
+}
+$category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
 
-my $nok;
 # if a add or modify is requested => check validity of data.
-if ($op eq 'add' or $op eq 'modify') {
-       my %data;
-       my @names=$input->param;
-       foreach my $key (@names){
-               $data{$key}=$input->param($key);
-               $data{$key}=~ s/\'/\\\'/g;
-               $data{$key}=~ s/\"/\\\"/g;
-       }
-       my @errors;
-       if ($data{'cardnumber'} eq ''){
-               push @errors,"ERROR_cardnumber";
-               $nok=1;
-       } else {
-               #check cardnumber is valid
-               my $nounique;
-               if ( $op eq "add" )    {
-                       $nounique = 0;
+%data = %$borrower_data if ($borrower_data);
+
+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';
+    }
+       my $dateobject = C4::Dates->new();
+       my $syspref = $dateobject->regexp();            # same syspref format for all 3 dates
+       my $iso     = $dateobject->regexp('iso');       # 
+       foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+               my $userdate = $newdata{$_} or next;
+               if ($userdate =~ /$syspref/) {
+                       $newdata{$_} = format_date_in_iso($userdate);   # if they match syspref format, then convert to ISO
+               } elsif ($userdate =~ /$iso/) {
+                       warn "Date $_ ($userdate) is already in ISO format";
                } else {
-                       $nounique = 1;
+                       ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'";
+                       $template->param( "ERROR_$_" => 1 );    # else ERROR!
+                       push(@errors,"ERROR_$_");
                }
-               my $valid=checkdigit('',$data{'cardnumber'}, $nounique);
-               if ($valid != 1){
-                       $nok=1;
-                       push @errors, "ERROR_invalid_cardnumber";
-               }
-       }
-
-       if ($data{'sex'} eq '' && $categorycode ne "I"){
-               push @errors, "ERROR_gender";
-               $nok=1;
-       }
-       if ($data{'firstname'} eq '' && $categorycode ne "I"){
-               push @errors,"ERROR_firstname";
-               $nok=1;
-       }
-       if ($data{'surname'} eq ''){
-               push @errors,"ERROR_surname";
-               $nok=1;
        }
-       if ($data{'streetaddress'} eq ''){
-               push @errors, "ERROR_address";
-               $nok=1;
+  # 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;
        }
-       if ($data{'city'} eq ''){
-               push @errors, "ERROR_city";
-               $nok=1;
-       }
-       if (C4::Context->preference("IndependantBranches")) {
-               my $userenv = C4::Context->userenv;
-               if ($userenv->{flags} != 1){
-                       unless ($userenv->{branch} eq $data{'branchcode'}){
-                               push @errors, "ERROR_branch";
-                               $nok=1;
-                       }
-               }
+}
+
+#############test for member being unique #############
+if ($op eq 'insert'){
+        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)
+        ($check_member,$check_category) = checkuniquemember(
+                       $category_type_send, 
+                       ($newdata{surname}     ? $newdata{surname}     : $data{surname}    ),
+                       ($newdata{firstname}   ? $newdata{firstname}   : $data{firstname}  ),
+                       ($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth})
+               );
+          
+  #   recover the category type if the borrowers is a doublon 
+        my $tmpborrowercategory=GetBorrowercategory($check_category);
+        $check_categorytype=$tmpborrowercategory->{'category_type'};
+}
+
+  #recover all data from guarantor address phone ,fax... 
+if (($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'};  
+         foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) {
+               $data{$_} = $guarantordata->{$_};
        }
-       if ($nok) {
-               foreach my $error (@errors) {
-                       $template->param( $error => 1);
-               }
-               $template->param(nok => 1);
-       } else {
-               my $query="Select * from borrowers where borrowernumber=?";
-               my $sth=$dbh->prepare($query);
-               $sth->execute($data{'borrowernumber'});
-               if (my $data2=$sth->fetchrow_hashref){
-                       &modmember(%data);
-               }else{
-                       $borrowernumber = &newmember(%data);
+  }
+}
+
+###############test to take the right zipcode and city name ##############
+if ( $guarantorid eq ''){
+  if ($select_city){
+    my ($borrower_city,$borrower_zipcode)=&getzipnamecity($select_city);
+    $newdata{'city'}= $borrower_city;
+    $newdata{'zipcode'}=$borrower_zipcode;
+    }
+}
+#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);
+}
+  
+$debug and warn join "\t", map {"$_: $newdata{$_}"} qw(dateofbirth dateenrolled dateexpiry);
+my $loginexist=0;
+if ($op eq 'save' || $op eq 'insert'){
+  if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ 
+    push @errors, 'ERROR_cardnumber';
+  } 
+  my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
+  if ($newdata{dateofbirth} && $dateofbirthmandatory) {
+    my $age = GetAge($newdata{dateofbirth});
+    my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});   
+       my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
+    if (($age > $high) or ($age < $low)) {
+      push @errors, 'ERROR_age_limitations';
+         $template->param('ERROR_age_limitations' => "$low to $high");
+    }
+  }
+  if (C4::Context->preference("IndependantBranches")) {
+    if ($userenv && $userenv->{flags} != 1){
+      $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
+      unless (!$newdata{'branchcode'} || $userenv->{branch} eq $newdata{'branchcode'}){
+        push @errors, "ERROR_branch";
+      }
+    }
+  }
+  # Check if the userid is unique
+  unless (Check_Userid($newdata{'userid'},$borrowernumber)) {
+    push @errors, "ERROR_login_exist";
+    $loginexist=1; 
+  }
+}
+
+if ($op eq 'modify' || $op eq 'insert'){
+  unless ($newdata{'dateexpiry'}){
+       my $arg2 = $newdata{'dateenrolled'} || sprintf('%04d-%02d-%02d', Today());
+    $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')){
+       $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
+               $borrowernumber = &AddMember(%newdata);
+               if ($data{'organisations'}){            
+                       # need to add the members organisations
+                       my @orgs=split(/\|/,$data{'organisations'});
+                       add_member_orgs($borrowernumber,\@orgs);
                }
-               
-       if($destination eq "circ"){
-               print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
-       } else {
-               print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+       } elsif ($op eq 'save'){ 
+               if ($NoUpdateLogin) {
+                       delete $newdata{'password'};
+                       delete $newdata{'userid'};
                }
+               &ModMember(%newdata);    
        }
+       print scalar ($destination eq "circ") ? 
+               $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber") :
+               $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber") ;
+       exit;           # You can only send 1 redirect!  After that, content or other headers don't matter.
 }
+
 if ($delete){
        print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
-} else {  # this else goes down the whole script
-       if ($actionType eq 'Add'){
-               $template->param( addAction => 1);
-       } else {
-               $template->param( addAction =>0);
-       }
-       # retrieve previous values : either in DB or in CGI, in case of errors in values
-       my $data;
-       if ($nok) {
-               my @names=$input->param;
-               foreach my $key (@names){
-                       $data->{$key}=$input->param($key);
-               }
-       } else {
-               $data=borrdata('',$borrowernumber);
-       }
-       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");
-                       }
-               }
-       }
-       if ($actionType eq 'Add'){
-               $template->param( updtype => 'I');
-       } else {
-               $template->param( updtype => 'M');
-       }
-       my $cardnumber=$data->{'cardnumber'};
-       $cardnumber=fixup_cardnumber($data->{'cardnumber'}) if $actionType eq 'Add';
-       if ($data->{'sex'} eq 'F'){
-               $template->param(female => 1);
-       }
-       my ($categories,$labels)=ethnicitycategories();
-       my $ethnicitycategoriescount=$#{$categories};
-       my $ethcatpopup;
-       if ($ethnicitycategoriescount>=0) {
-               $ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
-                                       -id => 'ethnicity',
-                                       -values=>$categories,
-                                       -default=>$data->{'ethnicity'},
-                                       -labels=>$labels);
-               $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
-       }
+       exit;           # same as above
+}
 
-       ($categories,$labels)=borrowercategories();
-       my $catcodepopup = CGI::popup_menu(-name=>'categorycode',
-                                       -id => 'categorycode',
-                                       -values=>$categories,
-                                       -default=>$data->{'categorycode'},
-                                       -labels=>$labels);
-
-       my @relationships = ('','workplace', 'relative','friend', 'neighbour');
-       my @relshipdata;
-       while (@relationships) {
-               my $relship = shift @relationships;
-               my %row = ('relationship' => $relship);
-               if ($data->{'altrelationship'} eq $relship) {
-                       $row{'selected'}=' selected';
-               } else {
-                       $row{'selected'}='';
-               }
-               push(@relshipdata, \%row);
+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);
+  }  
+} 
+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;
+    }
+  }
+}
+if ($op eq 'add'){
+  $template->param( updtype => 'I',step_1=>1,step_2=>1,step_3=>1);
+} 
+if ($op eq "modify")  {
+  $template->param( updtype => 'M',modify => 1 );
+  $template->param( step_1=>1,step_2=>1,step_3=>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);
+} elsif ($data{'sex'} eq 'M'){
+    $template->param(male => 1);
+} else {
+    $template->param(none => 1);
+}
+
+##Now all the data to modify a member.
+my ($categories,$labels)=ethnicitycategories();
+  
+my $ethnicitycategoriescount=$#{$categories};
+my $ethcatpopup;
+if ($ethnicitycategoriescount>=0) {
+  $ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
+        -id => 'ethnicity',
+        -tabindex=>'',
+        -values=>$categories,
+        -default=>$data{'ethnicity'},
+        -labels=>$labels);
+  $template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
+}
+
+my @typeloop;
+foreach (qw(C A S P I)){
+       my $action="WHERE category_type=?";
+       ($categories,$labels)=GetborCatFromCatType($_,$action);
+       my @categoryloop;
+       foreach my $cat (@$categories){
+               push @categoryloop,{'categorycode' => $cat,
+                         'categoryname' => $labels->{$cat},
+                         'categorycodeselected' => ($cat eq $borrower_data->{'categorycode'}),
+               };
        }
+       my %typehash;
+       $typehash{'typename'}=$_;
+       $typehash{'categoryloop'}=\@categoryloop;
+       push @typeloop,{'typename' => $_,
+         'categoryloop' => \@categoryloop};
+}  
+$template->param('typeloop' => \@typeloop);
+
+# test in city
+$select_city=getidcity($data{'city'}) if ($guarantorid ne '0');
+($default_city=$select_city) if ($step eq 0);
+if ($select_city eq '' ){
+       $default_city = &getidcity($data{'city'});
+}
+my($cityid);
+($cityid,$name_city)=GetCities();
+$template->param( city_cgipopup => 1) if ($cityid );
+my $citypopup = CGI::popup_menu(-name=>'select_city',
+        -id => 'select_city',
+        -values=>$name_city,
+        -labels=>$name_city,
+        -default=>$default_city,
+        );  
+  
+my $default_roadtype;
+$default_roadtype=$data{'streettype'} ;
+my($roadtypeid,$road_type)=GetRoadTypes();
+  $template->param( road_cgipopup => 1) if ($roadtypeid );
+my $roadpopup = CGI::popup_menu(-name=>'streettype',
+        -id => 'streettype',
+        -values=>$roadtypeid,
+        -labels=>$road_type,
+        -override => 1,
+        -default=>$default_roadtype
+        );  
+
+my $default_borrowertitle;
+$default_borrowertitle=$data{'title'} ;
+my($borrowertitle)=GetTitles();
+$template->param( title_cgipopup => 1) if ($borrowertitle);
+my $borrotitlepopup = CGI::popup_menu(-name=>'title',
+        -id => 'btitle',
+        -values=>$borrowertitle,
+        -override => 1,
+        -default=>$default_borrowertitle
+        );    
 
-       # %flags: keys=$data-keys, datas=[formname, HTML-explanation]
-       my %flags = ('gonenoaddress' => ['gna', 'Gone no address'],
-                               'lost'          => ['lost', 'Lost'],
-                               'debarred'      => ['debarred', 'Debarred']);
+my @relationships = split /,|\|/,C4::Context->preference('BorrowerRelationship');
+my @relshipdata;
+while (@relationships) {
+  my $relship = shift @relationships || '';
+  my %row = ('relationship' => $relship);
+  if ($data{'relationship'} eq $relship) {
+    $row{'selected'}=' selected';
+  } else {
+    $row{'selected'}='';
+  }
+  push(@relshipdata, \%row);
+}
 
-       my @flagdata;
-       foreach (keys(%flags)) {
+my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
+        'lost'          => ['lost'],
+        'debarred'      => ['debarred']);
+
+my @flagdata;
+foreach (keys(%flags)) {
        my $key = $_;
        my %row =  ('key'   => $key,
-                       'name'  => $flags{$key}[0],
-                       'html'  => $flags{$key}[1]);
-       if ($data->{$key}) {
+                   'name'  => $flags{$key}[0]);
+       if ($data{$key}) {
                $row{'yes'}=' checked';
                $row{'no'}='';
-       } else {
+    }
+       else {
                $row{'yes'}='';
                $row{'no'}=' checked';
        }
-       push(@flagdata, \%row);
-       }
+       push @flagdata,\%row;
+}
 
-       if ($modify){
-       $template->param( modify => 1 );
-       }
+#get Branches
+my @branches;
+my @select_branch;
+my %select_branches;
 
-       #Convert dateofbirth to correct format
-       $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
-
-       my @branches;
-       my @select_branch;
-       my %select_branches;
-       my $branches=getbranches();
-       my $default;
-       foreach my $branch (keys %$branches) {
-               if ((not C4::Context->preference("IndependantBranches")) || (C4::Context->userenv->{'flags'} == 1)) {
-                       push @select_branch, $branch;
-                       $select_branches{$branch} = $branches->{$branch}->{'branchname'};
-                       $default = $data->{'branchcode'};
-               } else {
-                               push @select_branch, $branch if ($branch eq C4::Context->userenv->{'branch'});
-                               $select_branches{$branch} = $branches->{$branch}->{'branchname'} if ($branch eq C4::Context->userenv->{'branch'});
-                               $default = C4::Context->userenv->{'branch'};
-               }
-       }
-       
-       my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
-                               -id => 'branchcode',
-                               -values   => \@select_branch,
-                               -default  => $data->{'branchcode'},
-                               -labels   => \%select_branches,
-                               -size     => 1,
-                               -multiple => 0 );
-       
-       my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
-       if ($CGIsort1) {
-               $template->param(CGIsort1 => $CGIsort1);
-       } else {
-               $template->param( sort1 => $data->{'sort1'});
-       }
-       
-       my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
-       if ($CGIsort2) {
-               $template->param(CGIsort2 =>$CGIsort2);
-       } else {
-               $template->param( sort2 => $data->{'sort2'});
-       }
+my $onlymine=(C4::Context->preference('IndependantBranches') && 
+              C4::Context->userenv && 
+              C4::Context->userenv->{flags} !=1  && 
+              C4::Context->userenv->{branch}?1:0);
+              
+my $branches=GetBranches($onlymine);
+my $default;
 
-       my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
-       if ($CGIsort1) {
-               $template->param(CGIsort1 => $CGIsort1);
-       } else {
-               $template->param( sort1 => $data->{'sort1'});
-       }
+foreach my $branch (sort keys %$branches) {
+    push @select_branch,$branch;
+    $select_branches{$branch} = $branches->{$branch}->{'branchname'};
+    $default = C4::Context->userenv->{'branch'} if (C4::Context->userenv && C4::Context->userenv->{'branch'});
+}
+# --------------------------------------------------------------------------------------------------------
+  #in modify mod :default value from $CGIbranch comes from borrowers table
+  #in add mod: default value come from branches table (ip correspendence)
+$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C'));
+my $CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
+            -name   => 'branchcode',
+            -values => \@select_branch,
+            -labels => \%select_branches,
+            -size   => 1,
+            -override => 1,  
+            -multiple =>0,
+            -default => $default,
+        );
+my $CGIorganisations;
+my $member_of_institution;
+if (C4::Context->preference("memberofinstitution")){
+    my $organisations=get_institutions();
+    my @orgs;
+    my %org_labels;
+    foreach my $organisation (keys %$organisations) {
+        push @orgs,$organisation;
+        $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
+    }
+    $member_of_institution=1;
+    
+    $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
+        -name     => 'organisations',
+        -labels   => \%org_labels,
+        -values   => \@orgs,
+        -size     => 5,
+        -multiple => 'true'
 
-       my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
-       if ($CGIsort2) {
-               $template->param(CGIsort2 =>$CGIsort2);
-       } else {
-               $template->param( sort2 => $data->{'sort2'});
-       }
-       
-       $template->param(       actionType              => $actionType,
-                               destination => $destination,
-                               borrowernumber          => $borrowernumber,
-                               address         => $data->{'streetaddress'},
-                               firstname       => $data->{'firstname'},
-                               surname         => $data->{'surname'},
-                               othernames      => $data->{'othernames'},
-                               initials        => $data->{'initials'},
-                               ethcatpopup     => $ethcatpopup,
-                               catcodepopup    => $catcodepopup,
-                               streetaddress   => $data->{'streetaddress'},
-                               physstreet   => $data->{'physstreet'},
-                               zipcode => $data->{'zipcode'},
-                               streetcity      => $data->{'streetcity'},
-                               homezipcode => $data->{'homezipcode'},
-                               city            => $data->{'city'},
-                               phone           => $data->{'phone'},
-                               phoneday        => $data->{'phoneday'},
-                               faxnumber       => $data->{'faxnumber'},
-                               emailaddress    => $data->{'emailaddress'},
-                               textmessaging   => $data->{'textmessaging'},
-                               contactname     => $data->{'contactname'},
-                               altphone        => $data->{'altphone'},
-                               altnotes        => $data->{'altnotes'},
-                               borrowernotes   => $data->{'borrowernotes'},
-                               flagloop        => \@flagdata,
-                               relshiploop     => \@relshipdata,
-                               "title_".$data->{'title'} => " SELECTED ",
-                               joining => format_date($data->{'dateenrolled'}),
-                               expiry          => format_date($data->{'expiry'}),
-                               cardnumber      => $cardnumber,
-                               dateofbirth     => $data->{'dateofbirth'},
-                               dateformat      => display_date_format(),
-                               modify          => $modify,
-                               CGIbranch => $CGIbranch);
-       $template->param(Institution => 1) if ($categorycode eq "I");
-       output_html_with_http_headers $input, $cookie, $template->output;
+    );
+}
+
+
+# --------------------------------------------------------------------------------------------------------
+
+my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
+if ($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);
+} else {
+  $template->param( sort2 => $data{'sort2'});
+}
 
+if ($nok) {
+    foreach my $error (@errors) {
+        $template->param($error) || $template->param( $error => 1);
+    }
+    $template->param(nok => 1);
+}
+  
+  #Formatting data for display    
+  
+if ($data{'dateenrolled'} eq ''){
+  my $today = sprintf('%04d-%02d-%02d', Today());      # ISO format
+  $data{'dateenrolled'}=$today;
+}
+if (C4::Context->preference('uppercasesurnames')) {
+       $data{'surname'}    =uc($data{'surname'}    );
+       $data{'contactname'}=uc($data{'contactname'});
 }
+foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+       $data{$_} = format_date($data{$_});     # back to syspref for display
+       $template->param( $_ => $data{$_});
+}
+
+$template->param( "showguarantor"  => ($category_type=~/A|I|S/) ? 0 : 1); # associate with step to know where you are
+$debug and warn "memberentry step: $step";
+$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
+  DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+  select_city => $select_city,
+  "$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,
+  nodouble  => $nodouble,
+  borrowernumber  => $borrowernumber,#register number
+  "contacttitle_".$data{'contacttitle'} => "SELECTED" ,
+  guarantorid => $guarantorid,
+  ethcatpopup => $ethcatpopup,
+  relshiploop => \@relshipdata,
+  citypopup => $citypopup,
+  roadpopup => $roadpopup,  
+  borrotitlepopup => $borrotitlepopup,
+  guarantorinfo   => $guarantorinfo,
+  flagloop  => \@flagdata,
+  dateformat      => C4::Dates->new()->visual(),
+  C4::Context->preference('dateformat') => 1,
+  check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
+  modify          => $modify,
+  nok     => $nok,#flag to konw if an error 
+  CGIbranch => $CGIbranch,
+  memberofinstution => $member_of_institution,
+  CGIorganisations => $CGIorganisations,
+  NoUpdateLogin =>  $NoUpdateLogin
+  );
+  
+output_html_with_http_headers $input, $cookie, $template->output;
 
 # Local Variables:
 # tab-width: 8