Bug 13663: (followup) fixes tab char QA test fails

[srvgit] / tools / upload-file-progress.pl

diff --git a/tools/upload-file-progress.pl b/tools/upload-file-progress.pl
index dd2479b..91af827 100755 (executable)
--- a/tools/upload-file-progress.pl
+++ b/tools/upload-file-progress.pl
@@ -1,59 +1,62 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 # Copyright (C) 2007 LibLime
 #
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 
 # standard or CPAN modules used
 use IO::File;
-use CGI;
+use CGI qw ( -utf8 );
 use CGI::Session;
 use C4::Context;
+use C4::Auth qw/check_cookie_auth haspermission/;
+use C4::UploadedFile;
 use CGI::Cookie; # need to check cookies before
                  # having CGI parse the POST request
-use Digest::MD5;
+
+my $flags_required = [
+     {circulate => 'circulate_remaining_permissions'},
+     {tools     => 'stage_marc_import'},
+     {tools     => 'upload_local_cover_images'},
+];
 
 my %cookies = fetch CGI::Cookie;
-my $sessionID = $cookies{'CGISESSID'}->value;
-
-my $dbh = C4::Context->dbh;
-# FIXME get correct session -- not just mysql
-my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
-
-# FIXME - add authentication based on cookie
-
-my $query = CGI->new;
-my $fileid = $session->param('current_upload');
-
-my $reported_progress = 0;
-if (defined $fileid and $fileid ne "") {
-    my $progress = $session->param("$fileid.uploadprogress");
-    if (defined $progress) {
-        if ($progress eq "done") {
-            $reported_progress = 100;
-        } else {
-            $reported_progress = $progress;
-        }
+
+my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value);
+
+my $auth_failure = 1;
+foreach my $flag_required ( @{$flags_required} ) {
+    if ( my $flags = haspermission( C4::Context->config('user'), $flag_required ) ) {
+        $auth_failure = 0 if $auth_status eq 'ok';
     }
 }
 
+if ($auth_failure) {
+    my $reply = CGI->new("");
+    print $reply->header(-type => 'text/html');
+    print '{"progress":"0"}';
+    exit 0;
+}
+
+my $reported_progress = C4::UploadedFile->upload_progress($sessionID);
 
 my $reply = CGI->new("");
 print $reply->header(-type => 'text/html');
 # response will be sent back as JSON
-print "{ progress: $reported_progress }";
+print '{"progress":"' . $reported_progress . '"}';