Bug 18314: Add link to 'reset your password' from staff

[koha.git] / members / routing-lists.pl

diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index 1925880..c3e6c8d 100755 (executable)
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -21,8 +21,7 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use CGI qw ( -utf8 );
 use C4::Output;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Branch; # GetBranches
+use C4::Auth qw/:DEFAULT/;
 use C4::Members;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Context;
@@ -32,19 +31,6 @@ use CGI::Session;
 
 my $query = new CGI;
 
-my $sessionID = $query->cookie("CGISESSID") ;
-my $session = get_session($sessionID);
-
-# branch are now defined by the userenv
-# but first we have to check if someone has tried to change them
-
-my $branch = $query->param('branch');
-if ($branch){
-    # update our session so the userenv is updated
-    $session->param('branch', $branch);
-    $session->param('branchname', GetBranchName($branch));
-}
-
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
         template_name   => 'members/routing-lists.tt',
@@ -55,19 +41,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     }
 );
 
-my $branches = GetBranches();
-
 my $findborrower = $query->param('findborrower');
 $findborrower =~ s|,| |g;
 
 my $borrowernumber = $query->param('borrowernumber');
 
-$branch  = C4::Context->userenv->{'branch'};
+my $branch = C4::Context->userenv->{'branch'};
 
 # get the borrower information.....
 my $borrower;
 if ($borrowernumber) {
-    $borrower = GetMemberDetails( $borrowernumber, 0 );
+    $borrower = GetMember( borrowernumber => $borrowernumber );
 }
 
 
@@ -96,12 +80,11 @@ if ($borrowernumber) {
         routinglistview => 1
     );
 
-    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
+    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' || $borrower->{'category_type'} eq 'I' );
 }
 
 ##################################################################################
 
-
 $template->param(%$borrower);
 
 $template->param(
@@ -109,7 +92,6 @@ $template->param(
     borrower          => $borrower,
     borrowernumber    => $borrowernumber,
     branch            => $branch,
-    branchname        => GetBranchName($borrower->{'branchcode'}),
     categoryname      => $borrower->{description},
     RoutingSerials    => C4::Context->preference('RoutingSerials'),
 );