Bug 28786: Two-factor authentication for staff client - TOTP

[koha-ffzg.git] / circ / ysearch.pl

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index 8e43b8e..3f2650c 100755 (executable)
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -7,18 +7,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 ysearch.pl
 
@@ -27,18 +27,20 @@
 use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Auth qw/check_cookie_auth/;
-use Koha::Borrowers;
+use C4::Auth qw( check_cookie_auth );
+use Koha::Patrons;
+use Koha::DateUtils qw( format_sqldatetime );
+use Koha::Libraries;
 
 use JSON qw( to_json );
 
-my $input = new CGI;
+my $input = CGI->new;
 my $query = $input->param('term');
 
 binmode STDOUT, ":encoding(UTF-8)";
 print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
 
-my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { circulate => '*' } );
+my ( $auth_status ) = check_cookie_auth( $input->cookie('CGISESSID'), { catalogue => '1' } );
 if ( $auth_status ne "ok" ) {
     exit 0;
 }
@@ -51,19 +53,29 @@ if (   C4::Context->preference("IndependentBranches")
     $limit_on_branch = 1;
 }
 
-my $borrowers_rs = Koha::Borrowers->search(
-    {   -or => {
-            surname    => { -like => "$query%" },
-            firstname  => { -like => "$query%" },
-            cardnumber => { -like => "$query%" },
-            ( $limit_on_branch ? { branchcode => C4::Context->userenv->{branch} } : () ),
-        },
-    },
+my @parts = split( /,\s|\s/, $query );
+my @params;
+foreach my $p (@parts) {
+    push(
+        @params,
+        -or => [
+            surname    => { -like => "%$p%" },
+            firstname  => { -like => "%$p%" },
+            cardnumber => { -like => "$p%" },
+        ]
+    );
+}
+
+push( @params, { 'me.branchcode' => C4::Context->userenv->{branch} } ) if $limit_on_branch;
+
+my $borrowers_rs = Koha::Patrons->search_limited(
+    { -and => \@params },
     {
         # Get the first 10 results
         page     => 1,
         rows     => 10,
         order_by => [ 'surname', 'firstname' ],
+        prefetch => 'branchcode',
     },
 );
 
@@ -71,13 +83,17 @@ my @borrowers;
 while ( my $b = $borrowers_rs->next ) {
     push @borrowers,
       { borrowernumber => $b->borrowernumber,
-        surname        => $b->surname,
-        firstname      => $b->firstname,
-        cardnumber     => $b->cardnumber,
-        address        => $b->address,
-        city           => $b->city,
-        zipcode        => $b->zipcode,
-        country        => $b->country
+        surname        => $b->surname    // '',
+        firstname      => $b->firstname  // '',
+        cardnumber     => $b->cardnumber // '',
+        dateofbirth    => format_sqldatetime($b->dateofbirth, undef, undef, 1) // '',
+        age            => $b->get_age    // '',
+        address        => $b->address    // '',
+        city           => $b->city       // '',
+        zipcode        => $b->zipcode    // '',
+        country        => $b->country    // '',
+        branchcode     => $b->branchcode // '',
+        branchname     => $b->library->branchname // '',
       };
 }