X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmember.pl;h=11cbc41a32f625cd2f863f99d3b8187d86a95c4f;hb=0c43fa326afa23ef9c98ae2e7b464f6a0e55d880;hp=1cc5ac560690888f54ef97e956a46196e87b04b1;hpb=f1925cf89dbc1039fc48abfabad1472289387148;p=koha.git

diff --git a/members/member.pl b/members/member.pl
index 1cc5ac5606..11cbc41a32 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -27,11 +27,9 @@ use Modern::Perl;
 use C4::Auth;
 use C4::Output;
 use CGI qw( -utf8 );
-use C4::Branch;
-use C4::Category;
-use C4::Members qw( GetMember );
 use Koha::DateUtils;
 use Koha::List::Patron;
+use Koha::Patrons;
 
 my $input = new CGI;
 
@@ -40,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {borrowers => 1},
+                 flagsrequired => {borrowers => 'edit_borrowers'},
                  });
 
 my $theme = $input->param('theme') || "default";
@@ -50,26 +48,24 @@ my $quicksearch = $input->param('quicksearch') // 0;
 
 if ( $quicksearch and $searchmember ) {
     my $branchcode;
-    if ( C4::Branch::onlymine ) {
+    if ( C4::Context::only_my_library ) {
         my $userenv = C4::Context->userenv;
         $branchcode = $userenv->{'branch'};
     }
-    my $member = GetMember(
-        cardnumber => $searchmember,
-        ( $branchcode ? ( branchcode => $branchcode ) : () ),
-    );
-    if( $member ){
-        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=" . $member->{borrowernumber});
+    my $patron = Koha::Patrons->find( { cardnumber => $searchmember } );
+    if (
+        $patron
+        and (  ( $branchcode and $patron->branchcode eq $branchcode )
+            or ( not $branchcode ) )
+      )
+    {
+        print $input->redirect( "/cgi-bin/koha/members/moremember.pl?borrowernumber=" . $patron->borrowernumber );
         exit;
     }
 }
 
 my $searchfieldstype = $input->param('searchfieldstype') || 'standard';
 
-if ( $searchfieldstype eq "dateofbirth" ) {
-    $searchmember = output_pref({dt => dt_from_string($searchmember), dateformat => 'iso', dateonly => 1});
-}
-
 $template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
 
 my $view = $input->request_method() eq "GET" ? "show_form" : "show_results";
@@ -77,9 +73,9 @@ my $view = $input->request_method() eq "GET" ? "show_form" : "show_results";
 $template->param(
     patron_lists => [ GetPatronLists() ],
     searchmember        => $searchmember,
-    branchcode_filter   => $input->param('branchcode_filter'),
-    categorycode_filter => $input->param('categorycode_filter'),
-    searchtype          => $input->param('searchtype') || 'start_with',
+    branchcode_filter   => scalar $input->param('branchcode_filter'),
+    categorycode_filter => scalar $input->param('categorycode_filter'),
+    searchtype          => scalar $input->param('searchtype') || 'contain',
     searchfieldstype    => $searchfieldstype,
     PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
     view                => $view,