Merge remote-tracking branch 'origin/new/bug_8585'

[koha.git] / tools / upload-file-progress.pl

diff --git a/tools/upload-file-progress.pl b/tools/upload-file-progress.pl
index c7b1f3e..c457dbb 100755 (executable)
--- a/tools/upload-file-progress.pl
+++ b/tools/upload-file-progress.pl
@@ -13,51 +13,35 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 
 # standard or CPAN modules used
 use IO::File;
 use CGI;
 use CGI::Session;
 use C4::Context;
-use C4::Auth qw/get_session check_cookie_auth/;
+use C4::Auth qw/check_cookie_auth/;
+use C4::UploadedFile;
 use CGI::Cookie; # need to check cookies before
                  # having CGI parse the POST request
-use Digest::MD5;
 
 my %cookies = fetch CGI::Cookie;
-my %cookies = fetch CGI::Cookie;
-my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value, { tools => 1 });
+my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value, { tools => '*' });
 if ($auth_status ne "ok") {
     my $reply = CGI->new("");
     print $reply->header(-type => 'text/html');
-    print "{ progress: 0 }";
+    print '{"progress":"0"}';
     exit 0;
 }
 
-my $session = get_session($sessionID);
-
-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 $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 . '"}';