Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / offline_circ / service.pl

diff --git a/offline_circ/service.pl b/offline_circ/service.pl
index a23e2b8..bbae44b 100755 (executable)
--- a/offline_circ/service.pl
+++ b/offline_circ/service.pl
@@ -18,8 +18,7 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Auth;
@@ -29,9 +28,13 @@ use DateTime::TimeZone;
 
 my $cgi = CGI->new;
 
+# used by the KOCT firefox extension
+# (or any third-party that doesn't want to rely on cookies for authentication)
+my $nocookie = $cgi->param('nocookie') || 0;
+
 # get the status of the user, this will check his credentials and rights
 my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($cgi, undef);
-($status, $sessionId) = C4::Auth::check_cookie_auth($cgi, undef) if ($status ne 'ok');
+($status, $sessionId) = C4::Auth::check_cookie_auth($cgi, undef) if ($status ne 'ok' && !$nocookie);
 
 my $result;
 
@@ -77,9 +80,11 @@ if ($status eq 'ok') { # if authentication is ok
             }
         );
     }
-} else {
-    $result = "Authentication failed."
+
+    print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8');
+    print $result;
+    exit;
 }
 
-print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8');
+print CGI::header('-type'=>'text/plain', '-charset'=>'utf-8', '-status' => '401 Unauthorized');
 print $result;