renaming currenttransfers to transferstoreceive
[koha.git] / C4 / Members.pm
index b1864a8..f628e48 100644 (file)
@@ -1,5 +1,3 @@
-# -*- tab-width: 8 -*-
-
 package C4::Members;
 
 # Copyright 2000-2003 Katipo Communications
@@ -24,13 +22,16 @@ package C4::Members;
 use strict;
 require Exporter;
 use C4::Context;
-use Date::Manip;
 use C4::Date;
 use Digest::MD5 qw(md5_base64);
+use Date::Calc qw/Today Add_Delta_YM/;
+use C4::Log; # logaction
+use C4::Overdues;
+use C4::Reserves;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
+$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -38,9 +39,11 @@ C4::Members - Perl Module containing convenience functions for member handling
 
 =head1 SYNOPSIS
 
+use C4::Members;
 
 =head1 DESCRIPTION
 
+This module contains routines for adding, modifying and deleting members/patrons/borrowers 
 
 =head1 FUNCTIONS
 
@@ -49,27 +52,78 @@ C4::Members - Perl Module containing convenience functions for member handling
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw();
-
-@EXPORT = qw(
-       &BornameSearch &getmember &borrdata &borrdata2 &fixup_cardnumber &findguarantees &findguarantor &GuarantornameSearch &NewBorrowerNumber &modmember &newmember &changepassword &borrissues &allissues
-       &checkuniquemember &getzipnamecity &getidcity &getguarantordata &getcategorytype
-       &calcexpirydate &checkuserpassword
-       &getboracctrecord
-       &borrowercategories &getborrowercategory
-       &fixEthnicity
-       &ethnicitycategories get_institutions
-    );
 
+#Get data
+push @EXPORT, qw(
+  &SearchBorrower 
+  &GetMemberDetails
+  &GetMember
+  
+  &GetGuarantees 
+  &findguarantor 
+  &GuarantornameSearch
+  
+  &GetBorrowerIssuesAndFines
+  &GetPendingIssues
+  &GetAllIssues
+  
+  &get_institutions 
+  &getzipnamecity 
+  &getidcity
+   
+  &GetAge 
+  &GetCities 
+  &GetRoadTypes 
+  &GetRoadTypeDetails 
+  
+  &GetBorrowerAcctRecord
+  
+  &GetborCatFromCatType 
+  &GetBorrowercategory
+  
+  &GetBorNotifyAcctRecord
+  &GetMembeReregistration
+  &GetSortDetails
+  
+  &GetBorrowersTitles  
+  &GetBorrowersWhoHaveNotBorrowedSince
+  &GetBorrowersWhoHaveNeverBorrowed
+  &GetBorrowersWithIssuesHistoryOlderThan
+  &GetBorrowersFromSurname 
+  
+  &GetExpiryDate
+);
+
+#Modify data
+push @EXPORT, qw(
+  &ModMember
+  &fixup_cardnumber
+  &changepassword
+);
+  
+#Delete data
+push @EXPORT, qw(
+  &DelMember
+);
+
+#Insert data
+push @EXPORT, qw(
+  &AddMember  
+  &checkuniquemember 
+  &checkuserpassword
+  &fixEthnicity
+  &ethnicitycategories 
+  &add_member_orgs
+  
+  &MoveMemberToDeleted
+);
 
-=item BornameSearch
+=item Searchborrower
 
-  ($count, $borrowers) = &BornameSearch($env, $searchstring, $type);
+  ($count, $borrowers) = &SearchBorrower($searchstring, $type);
 
 Looks up patrons (borrowers) by name.
 
-C<$env> is ignored.
-
 BUGFIX 499: C<$type> is now used to determine type of search.
 if $type is "simple", search is performed on the first letter of the
 surname only.
@@ -78,561 +132,872 @@ C<$searchstring> is a space-separated list of search terms. Each term
 must match the beginning a borrower's surname, first name, or other
 name.
 
-C<&BornameSearch> returns a two-element list. C<$borrowers> is a
+C<&SearchBorrower> returns a two-element list. C<$borrowers> is a
 reference-to-array; each element is a reference-to-hash, whose keys
 are the fields of the C<borrowers> table in the Koha database.
 C<$count> is the number of elements in C<$borrowers>.
 
 =cut
+
 #'
 #used by member enquiries from the intranet
 #called by member.pl
-sub BornameSearch  {
-       my ($env,$searchstring,$orderby,$type)=@_;
-       my $dbh = C4::Context->dbh;
-       my $query = ""; my $count; my @data;
-       my @bind=();
-
-       if($type eq "simple")   # simple search for one letter only
-       {
-               $query="Select * from borrowers where surname like ? order by $orderby";
-               @bind=("$searchstring%");
-       }
-       else    # advanced search looking in surname, firstname and othernames
-       {
-               @data=split(' ',$searchstring);
-               $count=@data;
-               $query="Select * from borrowers
-               where ((surname like ? or surname like ?
-               or firstname  like ? or firstname like ?
-               or othernames like ? or othernames like ?)
-               ";
-               @bind=("$data[0]%","% $data[0]%","$data[0]%","% $data[0]%","$data[0]%","% $data[0]%");
-               for (my $i=1;$i<$count;$i++){
-                       $query=$query." and (".
-                       " surname like ? or surname like ?
-                        or firstname  like ? or firstname like ?
-                       or othernames like ? or othernames like ?)";
-                       push(@bind,"$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%");
-                                       # FIXME - .= <<EOT;
-               }
-               $query=$query.") or cardnumber like ?
+sub SearchBorrower {
+    my ($searchstring, $orderby, $type,$category_type ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = "";
+    my $count;
+    my @data;
+    my @bind = ();
+
+    if ( $type eq "simple" )    # simple search for one letter only
+    {
+        $query =
+          "SELECT * FROM borrowers
+                  LEFT JOIN categories ON borrowers.categorycode=categories.categorycode ".
+                  ($category_type?" AND category_type = ".$dbh->quote($category_type):"").
+                  " WHERE surname LIKE ? ORDER BY $orderby";
+        @bind = ("$searchstring%");
+    }
+    else    # advanced search looking in surname, firstname and othernames
+    {
+        @data  = split( ' ', $searchstring );
+        $count = @data;
+        $query = "SELECT * FROM borrowers
+                    LEFT JOIN categories ON borrowers.categorycode=categories.categorycode
+               WHERE ((surname LIKE ? OR surname LIKE ?
+               OR firstname  LIKE ? OR firstname LIKE ?
+               OR othernames LIKE ? OR othernames LIKE ?)
+               ".
+                  ($category_type?" AND category_type = ".$dbh->quote($category_type):"");
+        @bind = (
+            "$data[0]%", "% $data[0]%", "$data[0]%", "% $data[0]%",
+            "$data[0]%", "% $data[0]%"
+        );
+        for ( my $i = 1 ; $i < $count ; $i++ ) {
+            $query = $query . " AND (" . " surname LIKE ? OR surname LIKE ?
+                        OR firstname  LIKE ? OR firstname LIKE ?
+                       OR othernames LIKE ? OR othernames LIKE ?)";
+            push( @bind,
+                "$data[$i]%",   "% $data[$i]%", "$data[$i]%",
+                "% $data[$i]%", "$data[$i]%",   "% $data[$i]%" );
+
+            # FIXME - .= <<EOT;
+        }
+        $query = $query . ") OR cardnumber LIKE ?
                order by $orderby";
-               push(@bind,$searchstring);
-                                       # FIXME - .= <<EOT;
-       }
+        push( @bind, $searchstring );
+
+        # FIXME - .= <<EOT;
+    }
+
+    my $sth = $dbh->prepare($query);
+
+    #  warn "Q $orderby : $query";
+    $sth->execute(@bind);
+    my @results;
+    my $cnt = $sth->rows;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push( @results, $data );
+    }
 
-       my $sth=$dbh->prepare($query);
-#      warn "Q $orderby : $query";
-       $sth->execute(@bind);
-       my @results;
-       my $cnt=$sth->rows;
-       while (my $data=$sth->fetchrow_hashref){
-       push(@results,$data);
-       }
-       #  $sth->execute;
-       $sth->finish;
-       return ($cnt,\@results);
+    #  $sth->execute;
+    $sth->finish;
+    return ( $cnt, \@results );
 }
 
-=item getmember
+=head2 GetMemberDetails
 
-  $borrower = &getmember($cardnumber, $borrowernumber);
+($borrower, $flags) = &GetMemberDetails($borrowernumber, $cardnumber);
 
-Looks up information about a patron (borrower) by either card number
-or borrower number. If $borrowernumber is specified, C<&borrdata>
-searches by borrower number; otherwise, it searches by card number.
+Looks up a patron and returns information about him or her. If
+C<$borrowernumber> is true (nonzero), C<&GetMemberDetails> looks
+up the borrower by number; otherwise, it looks up the borrower by card
+number.
 
-C<&getmember> returns a reference-to-hash whose keys are the fields of
-the C<borrowers> table in the Koha database.
+C<$borrower> is a reference-to-hash whose keys are the fields of the
+borrowers table in the Koha database. In addition,
+C<$borrower-E<gt>{flags}> is a hash giving more detailed information
+about the patron. Its keys act as flags :
+
+    if $borrower->{flags}->{LOST} {
+        # Patron's card was reported lost
+    }
+
+Each flag has a C<message> key, giving a human-readable explanation of
+the flag. If the state of a flag means that the patron should not be
+allowed to borrow any more books, then it will have a C<noissues> key
+with a true value.
+
+The possible flags are:
+
+=head3 CHARGES
+
+=over 4
+
+=item Shows the patron's credit or debt, if any.
+
+=back
+
+=head3 GNA
+
+=over 4
+
+=item (Gone, no address.) Set if the patron has left without giving a
+forwarding address.
+
+=back
+
+=head3 LOST
+
+=over 4
+
+=item Set if the patron's card has been reported as lost.
+
+=back
+
+=head3 DBARRED
+
+=over 4
+
+=item Set if the patron has been debarred.
+
+=back
+
+=head3 NOTES
+
+=over 4
+
+=item Any additional notes about the patron.
+
+=back
+
+=head3 ODUES
+
+=over 4
+
+=item Set if the patron has overdue items. This flag has several keys:
+
+C<$flags-E<gt>{ODUES}{itemlist}> is a reference-to-array listing the
+overdue items. Its elements are references-to-hash, each describing an
+overdue item. The keys are selected fields from the issues, biblio,
+biblioitems, and items tables of the Koha database.
+
+C<$flags-E<gt>{ODUES}{itemlist}> is a string giving a text listing of
+the overdue items, one per line.
+
+=back
+
+=head3 WAITING
+
+=over 4
+
+=item Set if any items that the patron has reserved are available.
+
+C<$flags-E<gt>{WAITING}{itemlist}> is a reference-to-array listing the
+available items. Each element is a reference-to-hash whose keys are
+fields from the reserves table of the Koha database.
+
+=back
 
 =cut
-#'
-sub getmember {
-  my ($cardnumber,$bornum)=@_;
-  $cardnumber = uc $cardnumber;
-  my $dbh = C4::Context->dbh;
-  my $sth;
-  if ($bornum eq ''){
-    $sth=$dbh->prepare("Select * from borrowers where cardnumber=?");
-    $sth->execute($cardnumber);
-  } else {
-    $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-  $sth->execute($bornum);
-  }
-  my $data=$sth->fetchrow_hashref;
-  $sth->finish;
-  if ($data) {
-       return($data);
-       } else { # try with firstname
-               if ($cardnumber) {
-                       my $sth=$dbh->prepare("select * from borrowers where firstname=?");
-                       $sth->execute($cardnumber);
-                       my $data=$sth->fetchrow_hashref;
-                       $sth->finish;
-                       return($data);
-               }
-       }
-       return undef;
-}
-
-=item borrdata
-
-  $borrower = &borrdata($cardnumber, $borrowernumber);
+
+sub GetMemberDetails {
+    my ( $borrowernumber, $cardnumber ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $query;
+    my $sth;
+    if ($borrowernumber) {
+        $sth = $dbh->prepare("select * from borrowers where borrowernumber=?");
+        $sth->execute($borrowernumber);
+    }
+    elsif ($cardnumber) {
+        $sth = $dbh->prepare("select * from borrowers where cardnumber=?");
+        $sth->execute($cardnumber);
+    }
+    else {
+        return undef;
+    }
+    my $borrower = $sth->fetchrow_hashref;
+    my ($amount) = GetBorrowerAcctRecord( $borrowernumber);
+    $borrower->{'amountoutstanding'} = $amount;
+    my $flags = patronflags( $borrower, $dbh );
+    my $accessflagshash;
+
+    $sth = $dbh->prepare("select bit,flag from userflags");
+    $sth->execute;
+    while ( my ( $bit, $flag ) = $sth->fetchrow ) {
+        if ( $borrower->{'flags'} && $borrower->{'flags'} & 2**$bit ) {
+            $accessflagshash->{$flag} = 1;
+        }
+    }
+    $sth->finish;
+    $borrower->{'flags'}     = $flags;
+    $borrower->{'authflags'} = $accessflagshash;
+
+    # find out how long the membership lasts
+    $sth =
+      $dbh->prepare(
+        "select enrolmentperiod from categories where categorycode = ?");
+    $sth->execute( $borrower->{'categorycode'} );
+    my $enrolment = $sth->fetchrow;
+    $borrower->{'enrolmentperiod'} = $enrolment;
+    return ($borrower);    #, $flags, $accessflagshash);
+}
+
+=head2 patronflags
+
+ Not exported
+
+ NOTE!: If you change this function, be sure to update the POD for
+ &GetMemberDetails.
+
+ $flags = &patronflags($patron, $dbh);
+
+ $flags->{CHARGES}
+        {message}    Message showing patron's credit or debt
+       {noissues}    Set if patron owes >$5.00
+         {GNA}            Set if patron gone w/o address
+        {message}    "Borrower has no valid address"
+        {noissues}    Set.
+        {LOST}        Set if patron's card reported lost
+        {message}    Message to this effect
+        {noissues}    Set.
+        {DBARRED}        Set is patron is debarred
+        {message}    Message to this effect
+        {noissues}    Set.
+         {NOTES}        Set if patron has notes
+        {message}    Notes about patron
+         {ODUES}        Set if patron has overdue books
+        {message}    "Yes"
+        {itemlist}    ref-to-array: list of overdue books
+        {itemlisttext}    Text list of overdue items
+         {WAITING}        Set if there are items available that the
+                patron reserved
+        {message}    Message to this effect
+        {itemlist}    ref-to-array: list of available items
+
+=cut
+
+sub patronflags {
+    my %flags;
+    my ( $patroninformation) = @_;
+    my $dbh=C4::Context->dbh;
+    my ($amount) = GetBorrowerAcctRecord( $patroninformation->{'borrowernumber'});
+    if ( $amount > 0 ) {
+        my %flaginfo;
+        my $noissuescharge = C4::Context->preference("noissuescharge");
+        $flaginfo{'message'} = sprintf "Patron owes \$%.02f", $amount;
+        if ( $amount > $noissuescharge ) {
+            $flaginfo{'noissues'} = 1;
+        }
+        $flags{'CHARGES'} = \%flaginfo;
+    }
+    elsif ( $amount < 0 ) {
+        my %flaginfo;
+        $flaginfo{'message'} = sprintf "Patron has credit of \$%.02f", -$amount;
+        $flags{'CHARGES'} = \%flaginfo;
+    }
+    if (   $patroninformation->{'gonenoaddress'}
+        && $patroninformation->{'gonenoaddress'} == 1 )
+    {
+        my %flaginfo;
+        $flaginfo{'message'}  = 'Borrower has no valid address.';
+        $flaginfo{'noissues'} = 1;
+        $flags{'GNA'}         = \%flaginfo;
+    }
+    if ( $patroninformation->{'lost'} && $patroninformation->{'lost'} == 1 ) {
+        my %flaginfo;
+        $flaginfo{'message'}  = 'Borrower\'s card reported lost.';
+        $flaginfo{'noissues'} = 1;
+        $flags{'LOST'}        = \%flaginfo;
+    }
+    if (   $patroninformation->{'debarred'}
+        && $patroninformation->{'debarred'} == 1 )
+    {
+        my %flaginfo;
+        $flaginfo{'message'}  = 'Borrower is Debarred.';
+        $flaginfo{'noissues'} = 1;
+        $flags{'DBARRED'}     = \%flaginfo;
+    }
+    if (   $patroninformation->{'borrowernotes'}
+        && $patroninformation->{'borrowernotes'} )
+    {
+        my %flaginfo;
+        $flaginfo{'message'} = "$patroninformation->{'borrowernotes'}";
+        $flags{'NOTES'}      = \%flaginfo;
+    }
+    my ( $odues, $itemsoverdue ) =
+      checkoverdues( $patroninformation->{'borrowernumber'}, $dbh );
+    if ( $odues > 0 ) {
+        my %flaginfo;
+        $flaginfo{'message'}  = "Yes";
+        $flaginfo{'itemlist'} = $itemsoverdue;
+        foreach ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
+            @$itemsoverdue )
+        {
+            $flaginfo{'itemlisttext'} .=
+              "$_->{'date_due'} $_->{'barcode'} $_->{'title'} \n";
+        }
+        $flags{'ODUES'} = \%flaginfo;
+    }
+    my $itemswaiting =
+      GetWaitingReserves( $patroninformation->{'borrowernumber'} );
+    my $nowaiting = scalar @$itemswaiting;
+    if ( $nowaiting > 0 ) {
+        my %flaginfo;
+        $flaginfo{'message'}  = "Reserved items available";
+        $flaginfo{'itemlist'} = $itemswaiting;
+        $flags{'WAITING'}     = \%flaginfo;
+    }
+    return ( \%flags );
+}
+
+
+=item GetMember
+
+  $borrower = &GetMember($information, $type);
 
 Looks up information about a patron (borrower) by either card number
-or borrower number. If $borrowernumber is specified, C<&borrdata>
-searches by borrower number; otherwise, it searches by card number.
+,firstname, or borrower number, depending on $type value.
+If C<$type> == 'cardnumber', C<&GetBorrower>
+searches by cardnumber then by firstname if not found in cardnumber; 
+otherwise, it searches by borrowernumber.
 
-C<&borrdata> returns a reference-to-hash whose keys are the fields of
+C<&GetBorrower> returns a reference-to-hash whose keys are the fields of
 the C<borrowers> table in the Koha database.
 
 =cut
+
 #'
-sub borrdata {
-  my ($cardnumber,$bornum)=@_;
-  $cardnumber = uc $cardnumber;
-  my $dbh = C4::Context->dbh;
-  my $sth;
-  if ($bornum eq ''){
-    $sth=$dbh->prepare("Select borrowers.*,categories.category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where cardnumber=?");
-    $sth->execute($cardnumber);
-  } else {
-    $sth=$dbh->prepare("Select borrowers.*,categories.category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where borrowernumber=?");
-  $sth->execute($bornum);
-  }
-  my $data=$sth->fetchrow_hashref;
-  warn "DATA".$data->{category_type};
-  $sth->finish;
-  if ($data) {
-       return($data);
-       } else { # try with firstname
-               if ($cardnumber) {
-                       my $sth=$dbh->prepare("Select borrowers.*,categories.category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode  where firstname=?");
-                       $sth->execute($cardnumber);
-                       my $data=$sth->fetchrow_hashref;
-                       $sth->finish;
-                       return($data);
-               }
-       }
-       return undef;
-}
-
-
-=item borrdata2
-
-  ($borrowed, $due, $fine) = &borrdata2($env, $borrowernumber);
+sub GetMember {
+    my ( $information, $type ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth;
+    if ($type eq 'cardnumber' || $type eq 'firstname'|| $type eq 'userid'|| $type eq 'borrowernumber'){
+      $information = uc $information;
+      $sth =
+          $dbh->prepare(
+"Select borrowers.*,categories.category_type,categories.description  from borrowers left join categories on borrowers.categorycode=categories.categorycode where $type=?"
+          );
+        $sth->execute($information);
+    }
+    else {
+        $sth =
+          $dbh->prepare(
+"Select borrowers.*,categories.category_type, categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where borrowernumber=?"
+          );
+        $sth->execute($information);
+    }
+    my $data = $sth->fetchrow_hashref;
+
+    $sth->finish;
+    if ($data) {
+        return ($data);
+    }
+    elsif ($type eq 'cardnumber' ||$type eq 'firstname') {    # try with firstname
+        my $sth =
+              $dbh->prepare(
+"Select borrowers.*,categories.category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode  where firstname like ?"
+            );
+            $sth->execute($information);
+            my $data = $sth->fetchrow_hashref;
+            $sth->finish;
+            return ($data);
+    }
+    else {
+        return undef;        
+    }
+}
+
+=item GetBorrowerIssuesAndFines
+
+  ($borrowed, $due, $fine) = &GetBorrowerIssuesAndFines($borrowernumber);
 
 Returns aggregate data about items borrowed by the patron with the
 given borrowernumber.
 
-C<$env> is ignored.
-
-C<&borrdata2> returns a three-element array. C<$borrowed> is the
+C<&GetBorrowerIssuesAndFines> returns a three-element array. C<$borrowed> is the
 number of books the patron currently has borrowed. C<$due> is the
 number of overdue items the patron currently has borrowed. C<$fine> is
 the total fine currently due by the borrower.
 
 =cut
+
 #'
-sub borrdata2 {
-  my ($env,$bornum)=@_;
-  my $dbh = C4::Context->dbh;
-  my $query="Select count(*) from issues where borrowernumber='$bornum' and
+sub GetBorrowerIssuesAndFines {
+    my ( $borrowernumber ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query =
+      "Select count(*) from issues where borrowernumber='$borrowernumber' and
     returndate is NULL";
+
     # print $query;
-  my $sth=$dbh->prepare($query);
-  $sth->execute;
-  my $data=$sth->fetchrow_hashref;
-  $sth->finish;
-  $sth=$dbh->prepare("Select count(*) from issues where
-    borrowernumber='$bornum' and date_due < now() and returndate is NULL");
-  $sth->execute;
-  my $data2=$sth->fetchrow_hashref;
-  $sth->finish;
-  $sth=$dbh->prepare("Select sum(amountoutstanding) from accountlines where
-    borrowernumber='$bornum'");
-  $sth->execute;
-  my $data3=$sth->fetchrow_hashref;
-  $sth->finish;
-
-return($data2->{'count(*)'},$data->{'count(*)'},$data3->{'sum(amountoutstanding)'});
-}
-
-sub modmember {
-       my (%data) = @_;
-       my $dbh = C4::Context->dbh;
-       $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-       $data{'expiry'}=format_date_in_iso($data{'expiry'});
-       my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
-       cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
-       streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
-       altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
-       emailaddress='$data{'emailaddress'}',streetcity='$data{'streetcity'}',
-       altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
-       categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
-       borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-       initials='$data{'initials'}',physstreet='$data{'physstreet'}',ethnicity='$data{'ethnicity'}',
-       gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
-       textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
-       zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}', sort1='$data{'sort1'}', sort2='$data{'sort2'}'
-       where borrowernumber=$data{'borrowernumber'}";
-       my $sth=$dbh->prepare($query);
-       $sth->execute;
-       $sth->finish;
-       # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
-       # so when we update information for an adult we should check for guarantees and update the relevant part
-       # of their records, ie addresses and phone numbers
-       if ($data{'categorycode'} eq 'A' || $data{'categorycode'} eq 'W'){
-               # is adult check guarantees;
-               updateguarantees(%data);
-       }
-}
-
-sub newmember {
-       my (%data) = @_;
-       my $dbh = C4::Context->dbh;
-       $data{'userid'}='' unless $data{'password'};
-       $data{'password'}=md5_base64($data{'password'}) if $data{'password'};
-       $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-       $data{'dateenrolled'}=format_date_in_iso($data{'dateenrolled'});
-       $data{expiry}=format_date_in_iso($data{expiry});
-my $query="insert into borrowers set cardnumber=".$dbh->quote($data{'cardnumber'}).
-                                                                       ",surname=".$dbh->quote($data{'surname'}).
-                                                                       ",firstname=".$dbh->quote($data{'firstname'}).
-                                                                       ",title=".$dbh->quote($data{'title'}).
-                                                                       ",othernames=".$dbh->quote($data{'othernames'}).
-                                                                       ",initials=".$dbh->quote($data{'initials'}).
-                                                                       ",streetnumber=".$dbh->quote($data{'streetnumber'}).
-                                                                       ",streettype=".$dbh->quote($data{'streettype'}).
-                                                                       ",address=".$dbh->quote($data{'address'}).
-                                                                       ",address2=".$dbh->quote($data{'address2'}).
-                                                                       ",zipcode=".$dbh->quote($data{'zipcode'}).
-                                                                       ",city=".$dbh->quote($data{'city'}).
-                                                                       ",phone=".$dbh->quote($data{'phone'}).
-                                                                       ",email=".$dbh->quote($data{'email'}).
-                                                                       ",mobile=".$dbh->quote($data{'mobile'}).
-                                                                       ",phonepro=".$dbh->quote($data{'phonepro'}).
-                                                                       ",opacnote=".$dbh->quote($data{'opacnote'}).
-                                                                       ",guarantorid=".$dbh->quote($data{'guarantorid'}).
-                                                                       ",dateofbirth=".$dbh->quote($data{'dateofbirth'}).
-                                                                       ",branchcode=".$dbh->quote($data{'branchcode'}).
-                                                                       ",categorycode=".$dbh->quote($data{'categorycode'}).
-                                                                       ",dateenrolled=".$dbh->quote($data{'dateenrolled'}).
-                                                                       ",contactname=".$dbh->quote($data{'contactname'}).
-                                                                       ",borrowernotes=".$dbh->quote($data{'borrowernotes'}).
-                                                                       ",dateexpiry=".$dbh->quote($data{'dateexpiry'}).
-                                                                       ",contactnote=".$dbh->quote($data{'contactnote'}).
-                                                                       ",b_address=".$dbh->quote($data{'b_address'}).
-                                                                       ",b_zipcode=".$dbh->quote($data{'b_zipcode'}).
-                                                                       ",b_city=".$dbh->quote($data{'b_city'}).
-                                                                       ",b_phone=".$dbh->quote($data{'b_phone'}).
-                                                                       ",b_email=".$dbh->quote($data{'b_email'},).
-                                                                       ",password=".$dbh->quote($data{'password'}).
-                                                                       ",userid=".$dbh->quote($data{'userid'}).
-                                                                       ",sort1=".$dbh->quote($data{'sort1'}).
-                                                                       ",sort2=".$dbh->quote($data{'sort2'}).
-                                                                       ",contacttitle=".$dbh->quote($data{'contacttitle'}).
-                                                                       ",emailpro=".$dbh->quote($data{'emailpro'}).
-                                                                       ",contactfirstname=".$dbh->quote($data{'contactfirstname'}).
-                                                                       ",sex=".$dbh->quote($data{'sex'}).
-                                                                       ",fax=".$dbh->quote($data{'fax'}).
-                                                                       ",flags=".$dbh->quote($data{'flags'}).
-                                                                       ",relationship=".$dbh->quote($data{'relationship'})
-                                                                       ;
-       my $sth=$dbh->prepare($query);
-       $sth->execute;
-       $sth->finish;
-       $data{'borrowerid'} =$dbh->{'mysql_insertid'};
-       return $data{'borrowerid'};
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+    $sth = $dbh->prepare(
+        "Select count(*) from issues where
+    borrowernumber='$borrowernumber' and date_due < now() and returndate is NULL"
+    );
+    $sth->execute;
+    my $data2 = $sth->fetchrow_hashref;
+    $sth->finish;
+    $sth = $dbh->prepare(
+        "Select sum(amountoutstanding) from accountlines where
+    borrowernumber='$borrowernumber'"
+    );
+    $sth->execute;
+    my $data3 = $sth->fetchrow_hashref;
+    $sth->finish;
+
+    return ( $data2->{'count(*)'}, $data->{'count(*)'},
+        $data3->{'sum(amountoutstanding)'} );
 }
 
-sub changepassword {
-       my ($uid,$member,$digest) = @_;
-       my $dbh = C4::Context->dbh;
-       #Make sure the userid chosen is unique and not theirs if non-empty. If it is not,
-       #Then we need to tell the user and have them create a new one.
-       my $sth=$dbh->prepare("select * from borrowers where userid=? and borrowernumber != ?");
-       $sth->execute($uid,$member);
-       if ( ($uid ne '') && ($sth->fetchrow) ) {
-               return 0;
-    } else {
-               #Everything is good so we can update the information.
-               $sth=$dbh->prepare("update borrowers set userid=?, password=? where borrowernumber=?");
-               $sth->execute($uid, $digest, $member);
-               return 1;
-       }
-}
-
-sub getmemberfromuserid {
-       my ($userid) = @_;
-       my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare("select * from borrowers where userid=?");
-       $sth->execute($userid);
-       return $sth->fetchrow_hashref;
-}
-sub updateguarantees {
-       my (%data) = @_;
-       my $dbh = C4::Context->dbh;
-       my ($count,$guarantees)=findguarantees($data{'borrowernumber'});
-       for (my $i=0;$i<$count;$i++){
-               # FIXME
-               # It looks like the $i is only being returned to handle walking through
-               # the array, which is probably better done as a foreach loop.
-               #
-               my $guaquery="update borrowers set streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',
-               streetcity='$data{'streetcity'}',phoneday='$data{'phoneday'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}'
-               ,streetaddress='$data{'address'}'
-               where borrowernumber='$guarantees->[$i]->{'borrowernumber'}'";
-               my $sth3=$dbh->prepare($guaquery);
-               $sth3->execute;
-               $sth3->finish;
-       }
-}
-################################################################################
+=head2
 
-=item fixup_cardnumber
+=item ModMember
 
-Warning: The caller is responsible for locking the members table in write
-mode, to avoid database corruption.
+  ($borrowed, $due, $fine) = &ModMember($borrowernumber);
 
-=cut
+Modify borrower's data
 
-use vars qw( @weightings );
-my @weightings = (8,4,6,3,5,2,1);
+=cut
 
-sub fixup_cardnumber ($) {
-    my($cardnumber) = @_;
-    my $autonumber_members = C4::Context->boolean_preference('autoMemberNum');
-    $autonumber_members = 0 unless defined $autonumber_members;
-    # Find out whether member numbers should be generated
-    # automatically. Should be either "1" or something else.
-    # Defaults to "0", which is interpreted as "no".
+#'
+sub ModMember {
+    my (%data) = @_;
+    my $dbh = C4::Context->dbh;
+    $data{'dateofbirth'}  = format_date_in_iso( $data{'dateofbirth'} );
+    $data{'dateexpiry'}   = format_date_in_iso( $data{'dateexpiry'} );
+    $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'} );
+
+    #          warn "num user".$data{'borrowernumber'};
+    my $query;
+    my $sth;
+    $data{'userid'} = '' if ( $data{'password'} eq '' );
+
+    # test to know if u must update or not the borrower password
+    if ( $data{'password'} eq '****' ) {
+
+        $query = "UPDATE borrowers SET 
+               cardnumber  = ?,surname = ?,firstname = ?,title = ?,othernames = ?,initials = ?,
+               streetnumber = ?,streettype = ?,address = ?,address2 = ?,city = ?,zipcode = ?,
+               email = ?,phone = ?,mobile = ?,fax = ?,emailpro = ?,phonepro = ?,B_streetnumber = ?,
+               B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email = ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
+               categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress = ?,lost = ?,debarred = ?,contactname = ?,
+               contactfirstname = ?,contacttitle = ?,guarantorid = ?,borrowernotes = ?,relationship =  ?,ethnicity = ?,
+               ethnotes = ?,sex = ?,userid = ?,opacnote = ?,contactnote = ?,sort1 = ?,sort2 = ? 
+               WHERE borrowernumber=$data{'borrowernumber'}";
+        $sth = $dbh->prepare($query);
+        $sth->execute(
+            $data{'cardnumber'},       $data{'surname'},
+            $data{'firstname'},        $data{'title'},
+            $data{'othernames'},       $data{'initials'},
+            $data{'streetnumber'},     $data{'streettype'},
+            $data{'address'},          $data{'address2'},
+            $data{'city'},             $data{'zipcode'},
+            $data{'email'},            $data{'phone'},
+            $data{'mobile'},           $data{'fax'},
+            $data{'emailpro'},         $data{'phonepro'},
+            $data{'B_streetnumber'},   $data{'B_streettype'},
+            $data{'B_address'},        $data{'B_city'},
+            $data{'B_zipcode'},        $data{'B_email'},
+            $data{'B_phone'},          $data{'dateofbirth'},
+            $data{'branchcode'},       $data{'categorycode'},
+            $data{'dateenrolled'},     $data{'dateexpiry'},
+            $data{'gonenoaddress'},    $data{'lost'},
+            $data{'debarred'},         $data{'contactname'},
+            $data{'contactfirstname'}, $data{'contacttitle'},
+            $data{'guarantorid'},      $data{'borrowernotes'},
+            $data{'relationship'},     $data{'ethnicity'},
+            $data{'ethnotes'},         $data{'sex'},
+            $data{'userid'},           $data{'opacnote'},
+            $data{'contactnote'},      $data{'sort1'},
+            $data{'sort2'}
+        );
+    }
+    else {
+
+        ( $data{'password'} = md5_base64( $data{'password'} ) )
+          if ( $data{'password'} ne '' );
+        $query = "UPDATE borrowers SET 
+               cardnumber  = ?,surname = ?,firstname = ?,title = ?,othernames = ?,initials = ?,
+               streetnumber = ?,streettype = ?,address = ?,address2 = ?,city = ?,zipcode = ?,
+               email = ?,phone = ?,mobile = ?,fax = ?,emailpro = ?,phonepro = ?,B_streetnumber = ?,
+               B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email = ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
+               categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress = ?,lost = ?,debarred = ?,contactname = ?,
+               contactfirstname = ?,contacttitle = ?,guarantorid = ?,borrowernotes = ?,relationship =  ?,ethnicity = ?,
+               ethnotes = ?,sex = ?,password = ?,userid = ?,opacnote = ?,contactnote = ?,sort1 = ?,sort2 = ? 
+               WHERE borrowernumber=$data{'borrowernumber'}";
+        $sth = $dbh->prepare($query);
+        $sth->execute(
+            $data{'cardnumber'},       $data{'surname'},
+            $data{'firstname'},        $data{'title'},
+            $data{'othernames'},       $data{'initials'},
+            $data{'streetnumber'},     $data{'streettype'},
+            $data{'address'},          $data{'address2'},
+            $data{'city'},             $data{'zipcode'},
+            $data{'email'},            $data{'phone'},
+            $data{'mobile'},           $data{'fax'},
+            $data{'emailpro'},         $data{'phonepro'},
+            $data{'B_streetnumber'},   $data{'B_streettype'},
+            $data{'B_address'},        $data{'B_city'},
+            $data{'B_zipcode'},        $data{'B_email'},
+            $data{'B_phone'},          $data{'dateofbirth'},
+            $data{'branchcode'},       $data{'categorycode'},
+            $data{'dateenrolled'},     $data{'dateexpiry'},
+            $data{'gonenoaddress'},    $data{'lost'},
+            $data{'debarred'},         $data{'contactname'},
+            $data{'contactfirstname'}, $data{'contacttitle'},
+            $data{'guarantorid'},      $data{'borrowernotes'},
+            $data{'relationship'},     $data{'ethnicity'},
+            $data{'ethnotes'},         $data{'sex'},
+            $data{'password'},         $data{'userid'},
+            $data{'opacnote'},         $data{'contactnote'},
+            $data{'sort1'},            $data{'sort2'}
+        );
+    }
+    $sth->finish;
 
-#     if ($cardnumber !~ /\S/ && $autonumber_members) {
-    if ($autonumber_members) {
-               my $dbh = C4::Context->dbh;
-               if (C4::Context->preference('checkdigit') eq 'katipo') {
-                       # if checkdigit is selected, calculate katipo-style cardnumber.
-                       # otherwise, just use the max()
-                       # purpose: generate checksum'd member numbers.
-                       # We'll assume we just got the max value of digits 2-8 of member #'s
-                       # from the database and our job is to increment that by one,
-                       # determine the 1st and 9th digits and return the full string.
-                       my $sth=$dbh->prepare("select max(substring(borrowers.cardnumber,2,7)) from borrowers");
-                       $sth->execute;
-               
-                       my $data=$sth->fetchrow_hashref;
-                       $cardnumber=$data->{'max(substring(borrowers.cardnumber,2,7))'};
-                       $sth->finish;
-                       if (! $cardnumber) {                    # If DB has no values,
-                               $cardnumber = 1000000;          # start at 1000000
-                       } else {
-                               $cardnumber += 1;
-                       }
-               
-                       my $sum = 0;
-                       for (my $i = 0; $i < 8; $i += 1) {
-                               # read weightings, left to right, 1 char at a time
-                               my $temp1 = $weightings[$i];
-               
-                               # sequence left to right, 1 char at a time
-                               my $temp2 = substr($cardnumber,$i,1);
-               
-                               # mult each char 1-7 by its corresponding weighting
-                               $sum += $temp1 * $temp2;
-                       }
-               
-                       my $rem = ($sum%11);
-                       $rem = 'X' if $rem == 10;
-               
-                       $cardnumber="V$cardnumber$rem";
-               } else {
-                       # MODIFIED BY JF: mysql4.1 allows casting as an integer, which is probably
-            # better. I'll leave the original in in case it needs to be changed for you
-            my $sth=$dbh->prepare("select max(cast(cardnumber as signed)) from borrowers");
-            #my $sth=$dbh->prepare("select max(borrowers.cardnumber) from borrowers");
-
-                       $sth->execute;
-               
-                       my ($result)=$sth->fetchrow;
-                       $sth->finish;
-                       $cardnumber=$result+1;
-               }
-       }
-    return $cardnumber;
-}
+# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
+# so when we update information for an adult we should check for guarantees and update the relevant part
+# of their records, ie addresses and phone numbers
+    my $borrowercategory= GetBorrowercategory( $data{'category_type'} );
+    if ( $borrowercategory->{'category_type'} eq 'A' ) {
+        # is adult check guarantees;
+        UpdateGuarantees(%data);
 
-sub findguarantees {
-  my ($bornum)=@_;
-  my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("select cardnumber,borrowernumber from borrowers where
-  guarantorid=?");
-  $sth->execute($bornum);
-  my @dat;
-  my $i=0;
-  while (my $data=$sth->fetchrow_hashref){
-    $dat[$i]=$data;
-    $i++;
-  }
-  $sth->finish;
-  return($i,\@dat);
+    }
+    &logaction(C4::Context->userenv->{'number'},"MEMBERS","MODIFY",$data{'borrowernumber'},"") 
+        if C4::Context->preference("BorrowersLog");
 }
 
-=item findguarantor
+=head2
 
-  $guarantor = &findguarantor($borrower_no);
-  $guarantor_cardno = $guarantor->{"cardnumber"};
-  $guarantor_surname = $guarantor->{"surname"};
-  ...
+=item AddMember
 
-C<&findguarantor> takes a borrower number (presumably that of a child
-patron), finds the guarantor for C<$borrower_no> (the child's parent),
-and returns the record for the guarantor.
+  $borrowernumber = &ModMember(%borrower);
 
-C<&findguarantor> returns a reference-to-hash. Its keys are the fields
-from the C<borrowers> database table;
+insert new borrower into table
 
 =cut
+
 #'
-sub findguarantor{
-  my ($bornum)=@_;
-  my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-  $sth->execute($bornum);
-  my $data=$sth->fetchrow_hashref;
-  $sth->finish;
-  return($data);
+sub AddMember {
+    my (%data) = @_;
+    my $dbh = C4::Context->dbh;
+    $data{'userid'} = '' unless $data{'password'};
+    $data{'password'} = md5_base64( $data{'password'} ) if $data{'password'};
+    $data{'dateofbirth'} = format_date_in_iso( $data{'dateofbirth'} );
+    $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'} );
+    $data{'dateexpiry'}   = format_date_in_iso( $data{'dateexpiry'} );
+    my $query =
+        "insert into borrowers set cardnumber="
+      . $dbh->quote( $data{'cardnumber'} )
+      . ",surname="
+      . $dbh->quote( $data{'surname'} )
+      . ",firstname="
+      . $dbh->quote( $data{'firstname'} )
+      . ",title="
+      . $dbh->quote( $data{'title'} )
+      . ",othernames="
+      . $dbh->quote( $data{'othernames'} )
+      . ",initials="
+      . $dbh->quote( $data{'initials'} )
+      . ",streetnumber="
+      . $dbh->quote( $data{'streetnumber'} )
+      . ",streettype="
+      . $dbh->quote( $data{'streettype'} )
+      . ",address="
+      . $dbh->quote( $data{'address'} )
+      . ",address2="
+      . $dbh->quote( $data{'address2'} )
+      . ",zipcode="
+      . $dbh->quote( $data{'zipcode'} )
+      . ",city="
+      . $dbh->quote( $data{'city'} )
+      . ",phone="
+      . $dbh->quote( $data{'phone'} )
+      . ",email="
+      . $dbh->quote( $data{'email'} )
+      . ",mobile="
+      . $dbh->quote( $data{'mobile'} )
+      . ",phonepro="
+      . $dbh->quote( $data{'phonepro'} )
+      . ",opacnote="
+      . $dbh->quote( $data{'opacnote'} )
+      . ",guarantorid="
+      . $dbh->quote( $data{'guarantorid'} )
+      . ",dateofbirth="
+      . $dbh->quote( $data{'dateofbirth'} )
+      . ",branchcode="
+      . $dbh->quote( $data{'branchcode'} )
+      . ",categorycode="
+      . $dbh->quote( $data{'categorycode'} )
+      . ",dateenrolled="
+      . $dbh->quote( $data{'dateenrolled'} )
+      . ",contactname="
+      . $dbh->quote( $data{'contactname'} )
+      . ",borrowernotes="
+      . $dbh->quote( $data{'borrowernotes'} )
+      . ",dateexpiry="
+      . $dbh->quote( $data{'dateexpiry'} )
+      . ",contactnote="
+      . $dbh->quote( $data{'contactnote'} )
+      . ",B_address="
+      . $dbh->quote( $data{'B_address'} )
+      . ",B_zipcode="
+      . $dbh->quote( $data{'B_zipcode'} )
+      . ",B_city="
+      . $dbh->quote( $data{'B_city'} )
+      . ",B_phone="
+      . $dbh->quote( $data{'B_phone'} )
+      . ",B_email="
+      . $dbh->quote( $data{'B_email'}, )
+      . ",password="
+      . $dbh->quote( $data{'password'} )
+      . ",userid="
+      . $dbh->quote( $data{'userid'} )
+      . ",sort1="
+      . $dbh->quote( $data{'sort1'} )
+      . ",sort2="
+      . $dbh->quote( $data{'sort2'} )
+      . ",contacttitle="
+      . $dbh->quote( $data{'contacttitle'} )
+      . ",emailpro="
+      . $dbh->quote( $data{'emailpro'} )
+      . ",contactfirstname="
+      . $dbh->quote( $data{'contactfirstname'} ) . ",sex="
+      . $dbh->quote( $data{'sex'} ) . ",fax="
+      . $dbh->quote( $data{'fax'} )
+      . ",relationship="
+      . $dbh->quote( $data{'relationship'} )
+      . ",B_streetnumber="
+      . $dbh->quote( $data{'B_streetnumber'} )
+      . ",B_streettype="
+      . $dbh->quote( $data{'B_streettype'} )
+      . ",gonenoaddress="
+      . $dbh->quote( $data{'gonenoaddress'} )
+      . ",lost="
+      . $dbh->quote( $data{'lost'} )
+      . ",debarred="
+      . $dbh->quote( $data{'debarred'} )
+      . ",ethnicity="
+      . $dbh->quote( $data{'ethnicity'} )
+      . ",ethnotes="
+      . $dbh->quote( $data{'ethnotes'} );
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    $sth->finish;
+    $data{'borrowernumber'} = $dbh->{'mysql_insertid'};
+    
+    &logaction(C4::Context->userenv->{'number'},"MEMBERS","CREATE",$data{'borrowernumber'},"") 
+        if C4::Context->preference("BorrowersLog");
+        
+    return $data{'borrowernumber'};
 }
 
-=item GuarantornameSearch
+sub changepassword {
+    my ( $uid, $member, $digest ) = @_;
+    my $dbh = C4::Context->dbh;
 
-  ($count, $borrowers) = &GuarantornameSearch($env, $searchstring, $type);
+#Make sure the userid chosen is unique and not theirs if non-empty. If it is not,
+#Then we need to tell the user and have them create a new one.
+    my $sth =
+      $dbh->prepare(
+        "select * from borrowers where userid=? and borrowernumber != ?");
+    $sth->execute( $uid, $member );
+    if ( ( $uid ne '' ) && ( $sth->fetchrow ) ) {
+        return 0;
+    }
+    else {
+
+        #Everything is good so we can update the information.
+        $sth =
+          $dbh->prepare(
+            "update borrowers set userid=?, password=? where borrowernumber=?");
+        $sth->execute( $uid, $digest, $member );
+        return 1;
+    }
+    
+    &logaction(C4::Context->userenv->{'number'},"MEMBERS","CHANGE PASS",$member,"") 
+        if C4::Context->preference("BorrowersLog");
+}
 
-Looks up guarantor  by name.
 
-C<$env> is ignored.
+sub UpdateGuarantees {
+    my (%data) = @_;
+    my $dbh = C4::Context->dbh;
+    my ( $count, $guarantees ) = GetGuarantees( $data{'borrowernumber'} );
+    for ( my $i = 0 ; $i < $count ; $i++ ) {
+
+        # FIXME
+        # It looks like the $i is only being returned to handle walking through
+        # the array, which is probably better done as a foreach loop.
+        #
+        my $guaquery = qq|UPDATE borrowers 
+                         SET address='$data{'address'}',fax='$data{'fax'}',
+                             B_city='$data{'B_city'}',mobile='$data{'mobile'}',city='$data{'city'}',phone='$data{'phone'}'
+                         WHERE borrowernumber='$guarantees->[$i]->{'borrowernumber'}'
+               |;
+        my $sth3 = $dbh->prepare($guaquery);
+        $sth3->execute;
+        $sth3->finish;
+    }
+}
 
-BUGFIX 499: C<$type> is now used to determine type of search.
-if $type is "simple", search is performed on the first letter of the
-surname only.
+=item fixup_cardnumber
 
-C<$searchstring> is a space-separated list of search terms. Each term
-must match the beginning a borrower's surname, first name, or other
-name.
+Warning: The caller is responsible for locking the members table in write
+mode, to avoid database corruption.
 
-C<&GuarantornameSearch> returns a two-element list. C<$borrowers> is a
-reference-to-array; each element is a reference-to-hash, whose keys
-are the fields of the C<borrowers> table in the Koha database.
-C<$count> is the number of elements in C<$borrowers>.
+=cut
 
-return all info from guarantor =>only category_type A
+use vars qw( @weightings );
+my @weightings = ( 8, 4, 6, 3, 5, 2, 1 );
 
-=cut
-#'
-#used by member enquiries from the intranet
-#called by guarantor_search.pl
-sub GuarantornameSearch  {
-       my ($env,$searchstring,$orderby,$type)=@_;
-       my $dbh = C4::Context->dbh;
-       my $query = ""; my $count; my @data;
-       my @bind=();
-
-       if($type eq "simple")   # simple search for one letter only
-       {
-               $query="Select * from borrowers,categories  where borrowers.categorycode=categories.categorycode and category_type='A'  and  surname like ? order by $orderby";
-               @bind=("$searchstring%");
-       }
-       else    # advanced search looking in surname, firstname and othernames
-       {
-               @data=split(' ',$searchstring);
-               $count=@data;
-               $query="Select * from borrowers,categories
-               where ((surname like ? or surname like ?
-               or firstname  like ? or firstname like ?
-               or othernames like ? or othernames like ?) and borrowers.categorycode=categories.categorycode and category_type='A' 
-               ";
-               @bind=("$data[0]%","% $data[0]%","$data[0]%","% $data[0]%","$data[0]%","% $data[0]%");
-               for (my $i=1;$i<$count;$i++){
-                       $query=$query." and (".
-                       " surname like ? or surname like ?
-                        or firstname  like ? or firstname like ?
-                       or othernames like ? or othernames like ?)";
-                       push(@bind,"$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%");
-                                       # FIXME - .= <<EOT;
-               }
-               $query=$query.") or cardnumber like ?
-               order by $orderby";
-               push(@bind,$searchstring);
-                                       # FIXME - .= <<EOT;
-       }
+sub fixup_cardnumber ($) {
+    my ($cardnumber) = @_;
+    my $autonumber_members = C4::Context->boolean_preference('autoMemberNum');
+    $autonumber_members = 0 unless defined $autonumber_members;
+
+    # Find out whether member numbers should be generated
+    # automatically. Should be either "1" or something else.
+    # Defaults to "0", which is interpreted as "no".
 
-       my $sth=$dbh->prepare($query);
-       $sth->execute(@bind);
-       my @results;
-       my $cnt=$sth->rows;
-       while (my $data=$sth->fetchrow_hashref){
-       push(@results,$data);
-       }
-       #  $sth->execute;
-       $sth->finish;
-       return ($cnt,\@results);
+    #     if ($cardnumber !~ /\S/ && $autonumber_members) {
+    if ($autonumber_members) {
+        my $dbh = C4::Context->dbh;
+        if ( C4::Context->preference('checkdigit') eq 'katipo' ) {
+
+            # if checkdigit is selected, calculate katipo-style cardnumber.
+            # otherwise, just use the max()
+            # purpose: generate checksum'd member numbers.
+            # We'll assume we just got the max value of digits 2-8 of member #'s
+            # from the database and our job is to increment that by one,
+            # determine the 1st and 9th digits and return the full string.
+            my $sth =
+              $dbh->prepare(
+                "select max(substring(borrowers.cardnumber,2,7)) from borrowers"
+              );
+            $sth->execute;
+
+            my $data = $sth->fetchrow_hashref;
+            $cardnumber = $data->{'max(substring(borrowers.cardnumber,2,7))'};
+            $sth->finish;
+            if ( !$cardnumber ) {    # If DB has no values,
+                $cardnumber = 1000000;    # start at 1000000
+            }
+            else {
+                $cardnumber += 1;
+            }
+
+            my $sum = 0;
+            for ( my $i = 0 ; $i < 8 ; $i += 1 ) {
+
+                # read weightings, left to right, 1 char at a time
+                my $temp1 = $weightings[$i];
+
+                # sequence left to right, 1 char at a time
+                my $temp2 = substr( $cardnumber, $i, 1 );
+
+                # mult each char 1-7 by its corresponding weighting
+                $sum += $temp1 * $temp2;
+            }
+
+            my $rem = ( $sum % 11 );
+            $rem = 'X' if $rem == 10;
+
+            $cardnumber = "V$cardnumber$rem";
+        }
+        else {
+
+     # MODIFIED BY JF: mysql4.1 allows casting as an integer, which is probably
+     # better. I'll leave the original in in case it needs to be changed for you
+            my $sth =
+              $dbh->prepare(
+                "select max(cast(cardnumber as signed)) from borrowers");
+
+      #my $sth=$dbh->prepare("select max(borrowers.cardnumber) from borrowers");
+
+            $sth->execute;
+
+            my ($result) = $sth->fetchrow;
+            $sth->finish;
+            $cardnumber = $result + 1;
+        }
+    }
+    return $cardnumber;
 }
 
-=item NewBorrowerNumber
+=head2 GetGuarantees
 
-  $num = &NewBorrowerNumber();
+  ($num_children, $children_arrayref) = &GetGuarantees($parent_borrno);
+  $child0_cardno = $children_arrayref->[0]{"cardnumber"};
+  $child0_borrno = $children_arrayref->[0]{"borrowernumber"};
 
-Allocates a new, unused borrower number, and returns it.
+C<&GetGuarantees> takes a borrower number (e.g., that of a patron
+with children) and looks up the borrowers who are guaranteed by that
+borrower (i.e., the patron's children).
+
+C<&GetGuarantees> returns two values: an integer giving the number of
+borrowers guaranteed by C<$parent_borrno>, and a reference to an array
+of references to hash, which gives the actual results.
 
 =cut
+
 #'
-# FIXME - This is identical to C4::Circulation::Borrower::NewBorrowerNumber.
-# Pick one and stick with it. Preferably use the other one. This function
-# doesn't belong in C4::Search.
-sub NewBorrowerNumber {
-  my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select max(borrowernumber) from borrowers");
-  $sth->execute;
-  my $data=$sth->fetchrow_hashref;
-  $sth->finish;
-  $data->{'max(borrowernumber)'}++;
-  return($data->{'max(borrowernumber)'});
+sub GetGuarantees {
+    my ($borrowernumber) = @_;
+    my $dbh              = C4::Context->dbh;
+    my $sth              =
+      $dbh->prepare(
+"select cardnumber,borrowernumber, firstname, surname from borrowers where guarantorid=?"
+      );
+    $sth->execute($borrowernumber);
+
+    my @dat;
+    my $data = $sth->fetchall_arrayref({}); 
+    $sth->finish;
+    return ( scalar(@$data), $data );
 }
 
-=item borrissues
+=head2 GetPendingIssues
 
-  ($count, $issues) = &borrissues($borrowernumber);
+  ($count, $issues) = &GetPendingIssues($borrowernumber);
 
 Looks up what the patron with the given borrowernumber has borrowed.
 
-C<&borrissues> returns a two-element array. C<$issues> is a
+C<&GetPendingIssues> returns a two-element array. C<$issues> is a
 reference-to-array, where each element is a reference-to-hash; the
 keys are the fields from the C<issues>, C<biblio>, and C<items> tables
 in the Koha database. C<$count> is the number of elements in
 C<$issues>.
 
 =cut
+
 #'
-sub borrissues {
-  my ($bornum)=@_;
-  my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select * from issues,biblio,items where borrowernumber=?
-   and items.itemnumber=issues.itemnumber
+sub GetPendingIssues {
+    my ($borrowernumber) = @_;
+    my $dbh              = C4::Context->dbh;
+    my $sth              = $dbh->prepare(
+        "Select * from issues,biblio,items where borrowernumber=?
+        and items.itemnumber=issues.itemnumber
        and items.biblionumber=biblio.biblionumber
-       and issues.returndate is NULL order by date_due");
-    $sth->execute($bornum);
-  my @result;
-  while (my $data = $sth->fetchrow_hashref) {
-    push @result, $data;
-  }
-  $sth->finish;
-  return(scalar(@result), \@result);
+       and issues.returndate is NULL order by date_due"
+    );
+    $sth->execute($borrowernumber);
+    my $data = $sth->fetchall_arrayref({});
+    return ( scalar(@$data), $data );
 }
 
-=item allissues
+=head2 GetAllIssues
 
-  ($count, $issues) = &allissues($borrowernumber, $sortkey, $limit);
+  ($count, $issues) = &GetAllIssues($borrowernumber, $sortkey, $limit);
 
 Looks up what the patron with the given borrowernumber has borrowed,
 and sorts the results.
@@ -643,86 +1008,156 @@ C<biblioitems>, or C<items> table in the Koha database.
 
 C<$limit> is the maximum number of results to return.
 
-C<&allissues> returns a two-element array. C<$issues> is a
+C<&GetAllIssues> returns a two-element array. C<$issues> is a
 reference-to-array, where each element is a reference-to-hash; the
 keys are the fields from the C<issues>, C<biblio>, C<biblioitems>, and
 C<items> tables of the Koha database. C<$count> is the number of
 elements in C<$issues>
 
 =cut
+
 #'
-sub allissues {
-  my ($bornum,$order,$limit)=@_;
-  #FIXME: sanity-check order and limit
-  my $dbh = C4::Context->dbh;
-  my $query="Select * from issues,biblio,items,biblioitems
+sub GetAllIssues {
+    my ( $borrowernumber, $order, $limit ) = @_;
+
+    #FIXME: sanity-check order and limit
+    my $dbh   = C4::Context->dbh;
+    my $count = 0;
+    my $query =
+"Select *,items.timestamp AS itemstimestamp from issues,biblio,items,biblioitems
   where borrowernumber=? and
   items.biblioitemnumber=biblioitems.biblioitemnumber and
   items.itemnumber=issues.itemnumber and
   items.biblionumber=biblio.biblionumber order by $order";
-  if ($limit !=0){
-    $query.=" limit $limit";
-  }
-  #print $query;
-  my $sth=$dbh->prepare($query);
-  $sth->execute($bornum);
-  my @result;
-  my $i=0;
-  while (my $data=$sth->fetchrow_hashref){
-    $result[$i]=$data;;
-    $i++;
-  }
-  $sth->finish;
-  return($i,\@result);
-}
-
-=item getboracctrecord
-
-  ($count, $acctlines, $total) = &getboracctrecord($env, $borrowernumber);
+    if ( $limit != 0 ) {
+        $query .= " limit $limit";
+    }
 
-Looks up accounting data for the patron with the given borrowernumber.
+    #print $query;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrowernumber);
+    my @result;
+    my $i = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        $result[$i] = $data;
+        $i++;
+        $count++;
+    }
+
+    # get all issued items for borrowernumber from oldissues table
+    # large chunk of older issues data put into table oldissues
+    # to speed up db calls for issuing items
+    if ( C4::Context->preference("ReadingHistory") ) {
+        my $query2 = "SELECT * FROM oldissues,biblio,items,biblioitems
+                      WHERE borrowernumber=? 
+                      AND items.biblioitemnumber=biblioitems.biblioitemnumber
+                      AND items.itemnumber=oldissues.itemnumber
+                      AND items.biblionumber=biblio.biblionumber
+                      ORDER BY $order";
+        if ( $limit != 0 ) {
+            $limit = $limit - $count;
+            $query2 .= " limit $limit";
+        }
+
+        my $sth2 = $dbh->prepare($query2);
+        $sth2->execute($borrowernumber);
+
+        while ( my $data2 = $sth2->fetchrow_hashref ) {
+            $result[$i] = $data2;
+            $i++;
+        }
+        $sth2->finish;
+    }
+    $sth->finish;
+
+    return ( $i, \@result );
+}
 
-C<$env> is ignored.
 
-(FIXME - I'm not at all sure what this is about.)
+=head2 GetBorrowerAcctRecord
+
+  ($total, $acctlines, $count) = &GetBorrowerAcctRecord($borrowernumber);
+
+Looks up accounting data for the patron with the given borrowernumber.
 
-C<&getboracctrecord> returns a three-element array. C<$acctlines> is a
+C<&GetBorrowerAcctRecord> returns a three-element array. C<$acctlines> is a
 reference-to-array, where each element is a reference-to-hash; the
 keys are the fields of the C<accountlines> table in the Koha database.
 C<$count> is the number of elements in C<$acctlines>. C<$total> is the
 total amount outstanding for all of the account lines.
 
 =cut
+
 #'
-sub getboracctrecord {
-   my ($env,$params) = @_;
-   my $dbh = C4::Context->dbh;
-   my @acctlines;
-   my $numlines=0;
-   my $sth=$dbh->prepare("Select * from accountlines where
-borrowernumber=? order by date desc,timestamp desc");
-#   print $query;
-   $sth->execute($params->{'borrowernumber'});
-   my $total=0;
-   while (my $data=$sth->fetchrow_hashref){
-   #FIXME before reinstating: insecure?
-#      if ($data->{'itemnumber'} ne ''){
-#        $query="Select * from items,biblio where items.itemnumber=
-#      '$data->{'itemnumber'}' and biblio.biblionumber=items.biblionumber";
-#      my $sth2=$dbh->prepare($query);
-#      $sth2->execute;
-#      my $data2=$sth2->fetchrow_hashref;
-#      $sth2->finish;
-#      $data=$data2;
- #     }
-      $acctlines[$numlines] = $data;
-      $numlines++;
-      $total += $data->{'amountoutstanding'};
-   }
-   $sth->finish;
-   return ($numlines,\@acctlines,$total);
+sub GetBorrowerAcctRecord {
+    my ($borrowernumber,$date) = @_;
+    my $dbh = C4::Context->dbh;
+    my @acctlines;
+    my $numlines = 0;
+    my $strsth      = qq(
+        Select * from accountlines where
+borrowernumber=? order by date desc,timestamp desc
+    );
+    my @bind = ($borrowernumber);
+    if ($date && $date ne ''){
+    $strsth.=" AND date < ?";
+    push(@bind,$date);
+    }
+
+    my $sth= $dbh->prepare( $strsth );
+    $sth->execute( $borrowernumber);
+    my $total = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        $acctlines[$numlines] = $data;
+        $numlines++;
+        $total += $data->{'amountoutstanding'};
+    }
+    $sth->finish;
+    return ( $total, \@acctlines,$numlines);
 }
 
+=head2 GetBorNotifyAcctRecord
+
+  ($count, $acctlines, $total) = &GetBorNotifyAcctRecord($params,$notifyid);
+
+Looks up accounting data for the patron with the given borrowernumber per file number.
+
+(FIXME - I'm not at all sure what this is about.)
+
+C<&GetBorNotifyAcctRecord> returns a three-element array. C<$acctlines> is a
+reference-to-array, where each element is a reference-to-hash; the
+keys are the fields of the C<accountlines> table in the Koha database.
+C<$count> is the number of elements in C<$acctlines>. C<$total> is the
+total amount outstanding for all of the account lines.
+
+=cut
+
+sub GetBorNotifyAcctRecord {
+    my ( $params, $notifyid ) = @_;
+    my $dbh = C4::Context->dbh;
+    my @acctlines;
+    my $numlines = 0;
+    my $query    = qq| SELECT * 
+                       FROM accountlines 
+                       WHERE borrowernumber=? 
+                       AND notify_id=? 
+                       AND (accounttype='FU' OR accounttype='N' OR accounttype='M'OR accounttype='A'OR accounttype='F'OR accounttype='L' OR accounttype='IP' OR accounttype='CH' OR accounttype='RE' OR accounttype='RL')
+                       AND amountoutstanding != '0' 
+                       ORDER BY notify_id,accounttype
+               |;
+    my $sth = $dbh->prepare($query);
+
+    $sth->execute( $params->{'borrowernumber'}, $notifyid );
+    my $total = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        $acctlines[$numlines] = $data;
+        $numlines++;
+        $total += $data->{'amountoutstanding'};
+    }
+    $sth->finish;
+    return ( $numlines, \@acctlines, $total );
+}
 
 =head2 checkuniquemember (OUEST-PROVENCE)
 
@@ -739,32 +1174,40 @@ C<&dateofbirth> is the date of birth (only if collectivity=0)
 
 =cut
 
-sub checkuniquemember{
-       my ($collectivity,$surname,$firstname,$dateofbirth)=@_;
-       my $dbh = C4::Context->dbh;
-       my $request;
-       if ($collectivity ) {
+sub checkuniquemember {
+    my ( $collectivity, $surname, $firstname, $dateofbirth ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $request;
+    if ($collectivity) {
+
 #                              $request="select count(*) from borrowers where surname=? and categorycode=?";
-               $request="select borrowernumber,categorycode from borrowers where surname=? ";
-       } else {
+        $request =
+          "select borrowernumber,categorycode from borrowers where surname=? ";
+    }
+    else {
+
 #                              $request="select count(*) from borrowers where surname=? and categorycode=? and firstname=? and dateofbirth=?";
-               $request="select borrowernumber,categorycode from borrowers where surname=?  and firstname=? and dateofbirth=?";
-       }
-       my $sth=$dbh->prepare($request);
-       if ($collectivity) {
-               $sth->execute(uc($surname));
-       } else {
-               $sth->execute(uc($surname),ucfirst($firstname),$dateofbirth);
-       }
-       my @data= $sth->fetchrow; 
-       if ($data[0]){
-               $sth->finish;
-       return $data[0],$data[1];                               
-#                      
-       }else{
-               $sth->finish;
-       return 0;
-       }
+        $request =
+"select borrowernumber,categorycode from borrowers where surname=?  and firstname=? and dateofbirth=?";
+    }
+    my $sth = $dbh->prepare($request);
+    if ($collectivity) {
+        $sth->execute( uc($surname) );
+    }
+    else {
+        $sth->execute( uc($surname), ucfirst($firstname), $dateofbirth );
+    }
+    my @data = $sth->fetchrow;
+    if ( $data[0] ) {
+        $sth->finish;
+        return $data[0], $data[1];
+
+        #
+    }
+    else {
+        $sth->finish;
+        return 0;
+    }
 }
 
 =head2 getzipnamecity (OUEST-PROVENCE)
@@ -773,67 +1216,53 @@ take all info from table city for the fields city and  zip
 check for the name and the zip code of the city selected
 
 =cut
+
 sub getzipnamecity {
-       my ($cityid)=@_;
-       my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("select city_name,city_zipcode from cities where cityid=? ");
-       $sth->execute($cityid);
-       my @data = $sth->fetchrow;
-       return $data[0],$data[1];
+    my ($cityid) = @_;
+    my $dbh      = C4::Context->dbh;
+    my $sth      =
+      $dbh->prepare(
+        "select city_name,city_zipcode from cities where cityid=? ");
+    $sth->execute($cityid);
+    my @data = $sth->fetchrow;
+    return $data[0], $data[1];
 }
 
-=head2 updatechildguarantor (OUEST-PROVENCE)
-
-check for title,firstname,surname,adress,zip code and city  from guarantor to 
-guarantorchild
-
-=cut
-sub getguarantordata{
-       my ($borrowerid)=@_;
-       my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("Select title,firstname,surname,streetnumber,address,streettype,address2,zipcode,city,phone,phonepro,mobile,email,emailpro  from borrowers where borrowernumber =? ");
-       $sth->execute($borrowerid);
-       my $guarantor_data=$sth->fetchrow_hashref;
-       $sth->finish;  
-       return $guarantor_data;                 
-}
 
 =head2 getdcity (OUEST-PROVENCE)
+
 recover cityid  with city_name condition
+
 =cut
+
 sub getidcity {
-       my ($city_name)=@_;
-       my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("select cityid from cities where city_name=? ");
-       $sth->execute($city_name);
-       my $data = $sth->fetchrow;
-       return $data;
+    my ($city_name) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("select cityid from cities where city_name=? ");
+    $sth->execute($city_name);
+    my $data = $sth->fetchrow;
+    return $data;
 }
 
 
-=head2 getcategorytype (OUEST-PROVENCE)
+=head2 GetExpiryDate 
 
-check for the category_type with categorycode
-and return the category_type 
+  $expirydate = GetExpiryDate($categorycode, $dateenrolled);
+process expiry date given a date and a categorycode
 
 =cut
-sub getcategorytype {
-                       my ($categorycode)=@_;
-                       my $dbh = C4::Context->dbh;
-                       my $sth=$dbh->prepare("Select category_type,description from categories where categorycode=?  ");
-                       $sth->execute($categorycode);
-                       my ($category_type,$description) = $sth->fetchrow;
-                       return $category_type,$description;
-}
-
-sub calcexpirydate {
-       my ($categorycode,$dateenrolled)=@_;
-       my $dbh=C4::Context->dbh;
-       my $sth = $dbh->prepare("select enrolmentperiod from categories where categorycode=?");
-       $sth->execute($categorycode);
-       my ($enrolmentperiod) = $sth->fetchrow;
-       $enrolmentperiod = 12 unless ($enrolmentperiod);
-       return format_date_in_iso(&DateCalc($dateenrolled,"$enrolmentperiod months"));
+sub GetExpiryDate {
+    my ( $categorycode, $dateenrolled ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth =
+      $dbh->prepare(
+        "select enrolmentperiod from categories where categorycode=?");
+    $sth->execute($categorycode);
+    my ($enrolmentperiod) = $sth->fetchrow;
+    $enrolmentperiod = 12 unless ($enrolmentperiod);
+    my @date=split /-/,format_date_in_iso($dateenrolled);
+    @date=Add_Delta_YM($date[0],$date[1],$date[2],0,$enrolmentperiod);
+    return sprintf("%04d-%02d-%02d",$date[0],$date[1],$date[2]);
 }
 
 =head2 checkuserpassword (OUEST-PROVENCE)
@@ -843,20 +1272,24 @@ return the number of record
 0=> NOT USED 1=> USED
 
 =cut
-sub checkuserpassword{
-                       my ($borrowerid,$userid,$password)=@_;
-                       $password=md5_base64($password);
-                       my $dbh = C4::Context->dbh;
-                       my $sth=$dbh->prepare("Select count(*) from borrowers where borrowernumber !=? and userid =? and password=? ");
-                       $sth->execute($borrowerid,$userid,$password);
-                       my $number_rows=$sth->fetchrow;
-  return $number_rows;                 
-                       
+
+sub checkuserpassword {
+    my ( $borrowernumber, $userid, $password ) = @_;
+    $password = md5_base64($password);
+    my $dbh = C4::Context->dbh;
+    my $sth =
+      $dbh->prepare(
+"Select count(*) from borrowers where borrowernumber !=? and userid =? and password=? "
+      );
+    $sth->execute( $borrowernumber, $userid, $password );
+    my $number_rows = $sth->fetchrow;
+    return $number_rows;
+
 }
 
-=head2 borrowercategories
+=head2 GetborCatFromCatType
 
-  ($codes_arrayref, $labels_hashref) = &borrowercategories();
+  ($codes_arrayref, $labels_hashref) = &GetborCatFromCatType();
 
 Looks up the different types of borrowers in the database. Returns two
 elements: a reference-to-array, which lists the borrower category
@@ -864,44 +1297,56 @@ codes, and a reference-to-hash, which maps the borrower category codes
 to category descriptions.
 
 =cut
+
 #'
-sub borrowercategories {
-       my ($category_type,$action)=@_;
-       my $dbh = C4::Context->dbh;
-       my $request;
-       $request="Select categorycode,description from categories where category_type=? order by categorycode";         
-       my $sth=$dbh->prepare($request);
-       $sth->execute($category_type);
-       my %labels;
-       my @codes;
-       while (my $data=$sth->fetchrow_hashref){
-               push @codes,$data->{'categorycode'};
-               $labels{$data->{'categorycode'}}=$data->{'description'};
-       }
-       $sth->finish;
-       return(\@codes,\%labels);
-}
-
-=item getborrowercategory
-
-  $description = &getborrowercategory($categorycode);
+sub GetborCatFromCatType {
+    my ( $category_type, $action ) = @_;
+    my $dbh     = C4::Context->dbh;
+    my $request = qq|  SELECT categorycode,description 
+                       FROM categories 
+                       $action
+                       ORDER BY categorycode|;
+    my $sth = $dbh->prepare($request);
+    if ($action) {
+        $sth->execute($category_type);
+    }
+    else {
+        $sth->execute();
+    }
+
+    my %labels;
+    my @codes;
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @codes, $data->{'categorycode'};
+        $labels{ $data->{'categorycode'} } = $data->{'description'};
+    }
+    $sth->finish;
+    return ( \@codes, \%labels );
+}
+
+=head2 GetBorrowercategory
+
+  $hashref = &GetBorrowercategory($categorycode);
 
 Given the borrower's category code, the function returns the corresponding
-description for a comprehensive information display.
+data hashref for a comprehensive information display.
 
 =cut
 
-sub getborrowercategory
-{
-       my ($catcode) = @_;
-       my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare("SELECT description FROM categories WHERE categorycode = ?");
-       $sth->execute($catcode);
-       my $description = $sth->fetchrow();
-       $sth->finish();
-       return $description;
-} # sub getborrowercategory
-
+sub GetBorrowercategory {
+    my ($catcode) = @_;
+    my $dbh       = C4::Context->dbh;
+    my $sth       =
+      $dbh->prepare(
+"SELECT description,dateofbirthrequired,upperagelimit,category_type FROM categories WHERE categorycode = ?"
+      );
+    $sth->execute($catcode);
+    my $data =
+      $sth->fetchrow_hashref;
+    $sth->finish();
+    return $data;
+}    # sub getborrowercategory
 
 =head2 ethnicitycategories
 
@@ -913,20 +1358,21 @@ reference-to-hash, which maps the ethnicity codes to ethnicity
 descriptions.
 
 =cut
+
 #'
 
 sub ethnicitycategories {
     my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("Select code,name from ethnicity order by name");
+    my $sth = $dbh->prepare("Select code,name from ethnicity order by name");
     $sth->execute;
     my %labels;
     my @codes;
-    while (my $data=$sth->fetchrow_hashref){
-      push @codes,$data->{'code'};
-      $labels{$data->{'code'}}=$data->{'name'};
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @codes, $data->{'code'};
+        $labels{ $data->{'code'} } = $data->{'name'};
     }
     $sth->finish;
-    return(\@codes,\%labels);
+    return ( \@codes, \%labels );
 }
 
 =head2 fixEthnicity
@@ -938,38 +1384,459 @@ corresponding descriptive name from the C<ethnicity> table in the
 Koha database ("European" or "Pacific Islander").
 
 =cut
-#'
 
-sub fixEthnicity($) {
+#'
 
+sub fixEthnicity {
     my $ethnicity = shift;
-    my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("Select name from ethnicity where code = ?");
+    return unless $ethnicity;
+    my $dbh       = C4::Context->dbh;
+    my $sth       = $dbh->prepare("Select name from ethnicity where code = ?");
     $sth->execute($ethnicity);
-    my $data=$sth->fetchrow_hashref;
+    my $data = $sth->fetchrow_hashref;
     $sth->finish;
     return $data->{'name'};
-} # sub fixEthnicity
+}    # sub fixEthnicity
+
+=head2 GetAge
+
+  $dateofbirth,$date = &GetAge($date);
+
+this function return the borrowers age with the value of dateofbirth
+
+=cut
+
+#'
+sub GetAge{
+    my ( $date, $date_ref ) = @_;
+
+    if ( not defined $date_ref ) {
+        $date_ref = sprintf( '%04d-%02d-%02d', Today() );
+    }
+
+    my ( $year1, $month1, $day1 ) = split /-/, $date;
+    my ( $year2, $month2, $day2 ) = split /-/, $date_ref;
+
+    my $age = $year2 - $year1;
+    if ( $month1 . $day1 > $month2 . $day2 ) {
+        $age--;
+    }
+
+    return $age;
+}    # sub get_age
 
 =head2 get_institutions
-  
   $insitutions = get_institutions();
 
 Just returns a list of all the borrowers of type I, borrownumber and name
-  
+
 =cut
-#'
 
+#'
 sub get_institutions {
     my $dbh = C4::Context->dbh();
-    my $sth = $dbh->prepare("SELECT borrowernumber,surname FROM borrowers WHERE categorycode=? ORDER BY surname");
+    my $sth =
+      $dbh->prepare(
+"SELECT borrowernumber,surname FROM borrowers WHERE categorycode=? ORDER BY surname"
+      );
     $sth->execute('I');
     my %orgs;
-    while (my $data = $sth->fetchrow_hashref()){
-       $orgs{$data->{'borrowernumber'}}=$data;
+    while ( my $data = $sth->fetchrow_hashref() ) {
+        $orgs{ $data->{'borrowernumber'} } = $data;
     }
     $sth->finish();
-    return(\%orgs);
+    return ( \%orgs );
+
+}    # sub get_institutions
+
+=head2 add_member_orgs
+
+  add_member_orgs($borrowernumber,$borrowernumbers);
+
+Takes a borrowernumber and a list of other borrowernumbers and inserts them into the borrowers_to_borrowers table
+
+=cut
+
+#'
+sub add_member_orgs {
+    my ( $borrowernumber, $otherborrowers ) = @_;
+    my $dbh   = C4::Context->dbh();
+    my $query =
+      "INSERT INTO borrowers_to_borrowers (borrower1,borrower2) VALUES (?,?)";
+    my $sth = $dbh->prepare($query);
+    foreach my $otherborrowernumber (@$otherborrowers) {
+        $sth->execute( $borrowernumber, $otherborrowernumber );
+    }
+    $sth->finish();
+
+}    # sub add_member_orgs
+
+=head2 GetBorrowersFromSurname
+
+=over 4
+
+\@resutlts = GetBorrowersFromSurname($surname)
+this function get the list of borrower names like $surname.
+return :
+the table of results in @results
+
+=back
+
+=cut
+
+sub GetBorrowersFromSurname {
+    my ($searchstring) = @_;
+    my $dbh = C4::Context->dbh;
+    $searchstring =~ s/\'/\\\'/g;
+    my @data  = split( ' ', $searchstring );
+    my $count = @data;
+    my $query = qq|
+        SELECT   surname,firstname
+        FROM     borrowers
+        WHERE    (surname like ?)
+        ORDER BY surname
+    |;
+    my $sth = $dbh->prepare($query);
+    $sth->execute("$data[0]%");
+    my @results;
+    $count = 0;
+
+    my $data = $sth->fetchall_arrayref({});
+    $sth->finish;
+    return ( scalar(@$data), $data );
+}
+
+=head2 GetCities (OUEST-PROVENCE)
+
+  ($id_cityarrayref, $city_hashref) = &GetCities();
+
+Looks up the different city and zip in the database. Returns two
+elements: a reference-to-array, which lists the zip city
+codes, and a reference-to-hash, which maps the name of the city.
+WHERE =>OUEST PROVENCE OR EXTERIEUR
+
+=cut
+
+sub GetCities {
+
+    #my ($type_city) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = qq|SELECT cityid,city_name 
+               FROM cities 
+               ORDER BY city_name|;
+    my $sth = $dbh->prepare($query);
+
+    #$sth->execute($type_city);
+    $sth->execute();
+    my %city;
+    my @id;
+
+    #    insert empty value to create a empty choice in cgi popup
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        push @id, $data->{'cityid'};
+        $city{ $data->{'cityid'} } = $data->{'city_name'};
+    }
+
+#test to know if the table contain some records if no the function return nothing
+    my $id = @id;
+    $sth->finish;
+    if ( $id eq 0 ) {
+        return ();
+    }
+    else {
+        unshift( @id, "" );
+        return ( \@id, \%city );
+    }
+}
+
+=head2 GetSortDetails (OUEST-PROVENCE)
+
+  ($lib) = &GetSortDetails($category,$sortvalue);
+
+Returns the authorized value  details
+C<&$lib>return value of authorized value details
+C<&$sortvalue>this is the value of authorized value 
+C<&$category>this is the value of authorized value category
+
+=cut
+
+sub GetSortDetails {
+    my ( $category, $sortvalue ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = qq|SELECT lib 
+               FROM authorised_values 
+               WHERE category=?
+               AND authorised_value=? |;
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $category, $sortvalue );
+    my $lib = $sth->fetchrow;
+    return ($lib);
+}
+
+=head2 DeleteBorrower 
+
+  () = &DeleteBorrower($member);
+
+delete all data fo borrowers and add record to deletedborrowers table
+C<&$member>this is the borrowernumber
+
+=cut
+
+sub MoveMemberToDeleted {
+    my ($member) = @_;
+    my $dbh = C4::Context->dbh;
+    my $query;
+    $query = qq|SELECT * 
+                 FROM borrowers 
+                 WHERE borrowernumber=?|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($member);
+    my @data = $sth->fetchrow_array;
+    $sth->finish;
+    $sth =
+      $dbh->prepare( "Insert into deletedborrowers values ("
+          . ( "?," x ( scalar(@data) - 1 ) )
+          . "?)" );
+    $sth->execute(@data);
+    $sth->finish;
+}
+
+=head2 DelMember
+
+DelMember($borrowernumber);
+
+This function remove directly a borrower whitout writing it on deleteborrower.
++ Deletes reserves for the borrower
+
+=cut
+
+sub DelMember {
+    my $dbh            = C4::Context->dbh;
+    my $borrowernumber = shift;
+    return unless $borrowernumber;    # borrowernumber is mandatory.
+
+    my $query = qq|DELETE 
+                 FROM  reserves 
+                 WHERE borrowernumber=?|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrowernumber);
+    $sth->finish;
+    $query = "
+       DELETE
+       FROM borrowers
+       WHERE borrowernumber = ?
+   ";
+    my $sth = $dbh->prepare($query);
+    &logaction(C4::Context->userenv->{'number'},"MEMBERS","DELETE",$borrowernumber,"") 
+        if C4::Context->preference("BorrowersLog");
+    return $sth->rows;
+}
+
+=head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE)
+
+$date= ExtendMemberSubscriptionTo($borrowerid, $date);
+Extending the subscription to a given date or to the expiry date calculated on local date.
+returns date 
+=cut
+
+sub ExtendMemberSubscriptionTo {
+    my ( $borrowerid,$date) = @_;
+    my $dbh = C4::Context->dbh;
+    unless ($date){
+      $date=POSIX::strftime("%Y-%m-%d",localtime(time));
+      my $borrower = GetBorrower($borrowerid,'borrowernumber');
+      $date = GetExpiryDate( $borrower->{'categorycode'}, $date );
+    }
+    my $sth = $dbh->do(<<EOF);
+UPDATE borrowers 
+SET  dateexpiry='$date' 
+WHERE borrowernumber='$borrowerid'
+EOF
+    return $date if ($sth);
+    return 0;
+}
+
+=head2 GetRoadTypes (OUEST-PROVENCE)
+
+  ($idroadtypearrayref, $roadttype_hashref) = &GetRoadTypes();
+
+Looks up the different road type . Returns two
+elements: a reference-to-array, which lists the id_roadtype
+codes, and a reference-to-hash, which maps the road type of the road .
+
+
+=cut
+
+sub GetRoadTypes {
+    my $dbh   = C4::Context->dbh;
+    my $query = qq|SELECT roadtypeid,road_type 
+               FROM roadtype 
+               ORDER BY road_type|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute();
+    my %roadtype;
+    my @id;
+
+    #    insert empty value to create a empty choice in cgi popup
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        push @id, $data->{'roadtypeid'};
+        $roadtype{ $data->{'roadtypeid'} } = $data->{'road_type'};
+    }
+
+#test to know if the table contain some records if no the function return nothing
+    my $id = @id;
+    $sth->finish;
+    if ( $id eq 0 ) {
+        return ();
+    }
+    else {
+        unshift( @id, "" );
+        return ( \@id, \%roadtype );
+    }
+}
+
+
+
+=head2 GetBorrowersTitles (OUEST-PROVENCE)
+
+  ($borrowertitle)= &GetBorrowersTitles();
+
+Looks up the different title . Returns array  with all borrowers title
+
+=cut
+
+sub GetBorrowersTitles {
+    my @borrowerTitle = split /,|\|/,C4::Context->preference('BorrowersTitles');
+    unshift( @borrowerTitle, "" );
+    return ( \@borrowerTitle);
+    }
+
+
+
+=head2 GetRoadTypeDetails (OUEST-PROVENCE)
+
+  ($roadtype) = &GetRoadTypeDetails($roadtypeid);
+
+Returns the description of roadtype
+C<&$roadtype>return description of road type
+C<&$roadtypeid>this is the value of roadtype s
+
+=cut
+
+sub GetRoadTypeDetails {
+    my ($roadtypeid) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $query        = qq|SELECT road_type 
+               FROM roadtype 
+               WHERE roadtypeid=?|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($roadtypeid);
+    my $roadtype = $sth->fetchrow;
+    return ($roadtype);
+}
+
+=head2 GetBorrowersWhoHaveNotBorrowedSince
+
+&GetBorrowersWhoHaveNotBorrowedSince($date)
+
+this function get all borrowers who haven't borrowed since the date given on input arg.
+
+=cut
+
+sub GetBorrowersWhoHaveNotBorrowedSince {
+    my $date = shift;
+    return unless $date;    # date is mandatory.
+    my $dbh   = C4::Context->dbh;
+    my $query = "
+        SELECT borrowers.borrowernumber,max(timestamp)
+        FROM   borrowers
+          LEFT JOIN issues ON borrowers.borrowernumber = issues.borrowernumber
+        WHERE issues.borrowernumber IS NOT NULL
+        GROUP BY borrowers.borrowernumber
+   ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    my @results;
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @results, $data;
+    }
+    return \@results;
+}
+
+=head2 GetBorrowersWhoHaveNeverBorrowed
+
+$results = &GetBorrowersWhoHaveNeverBorrowed
+
+this function get all borrowers who have never borrowed.
+
+I<$result> is a ref to an array which all elements are a hasref.
+
+=cut
+
+sub GetBorrowersWhoHaveNeverBorrowed {
+    my $dbh   = C4::Context->dbh;
+    my $query = "
+        SELECT borrowers.borrowernumber,max(timestamp)
+        FROM   borrowers
+          LEFT JOIN issues ON borrowers.borrowernumber = issues.borrowernumber
+        WHERE issues.borrowernumber IS NULL
+   ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    my @results;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @results, $data;
+    }
+    return \@results;
+}
+
+=head2 GetBorrowersWithIssuesHistoryOlderThan
+
+$results = &GetBorrowersWithIssuesHistoryOlderThan($date)
+
+this function get all borrowers who has an issue history older than I<$date> given on input arg.
+
+I<$result> is a ref to an array which all elements are a hashref.
+This hashref is containt the number of time this borrowers has borrowed before I<$date> and the borrowernumber.
+
+=cut
+
+sub GetBorrowersWithIssuesHistoryOlderThan {
+    my $dbh  = C4::Context->dbh;
+    my $date = shift;
+    return unless $date;    # date is mandatory.
+    my $query = "
+       SELECT count(borrowernumber) as n,borrowernumber
+       FROM issues
+       WHERE returndate < ?
+         AND borrowernumber IS NOT NULL 
+       GROUP BY borrowernumber
+   ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($date);
+    my @results;
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @results, $data;
+    }
+    return \@results;
+}
+
+END { }    # module clean-up code here (global destructor)
 
-} # sub get_institutions
 1;
+
+__END__
+
+=back
+
+=head1 AUTHOR
+
+Koha Team
+
+=cut