Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

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

diff --git a/tools/upload-file.pl b/tools/upload-file.pl
index f54d6b1..86ef2c5 100755 (executable)
--- a/tools/upload-file.pl
+++ b/tools/upload-file.pl
@@ -27,7 +27,7 @@ use URI::Escape;
 
 use C4::Context;
 use C4::Auth qw/check_cookie_auth haspermission/;
-use Koha::Upload;
+use Koha::Uploader;
 
 # upload-file.pl must authenticate the user
 # before processing the POST request,
@@ -37,30 +37,18 @@ use Koha::Upload;
 # requires that the session cookie already
 # has been created.
 
-my $flags_required = [
-    {circulate  => 'circulate_remaining_permissions'},
-    {tools      => 'stage_marc_import'},
-    {tools      => 'upload_local_cover_images'}
-];
-
 my %cookies = CGI::Cookie->fetch;
 my $sid = $cookies{'CGISESSID'}->value;
-
-my $auth_failure = 1;
 my ( $auth_status, $sessionID ) = check_cookie_auth( $sid );
 my $uid = C4::Auth::get_session($sid)->param('id');
-foreach my $flag_required ( @{$flags_required} ) {
-    if ( my $flags = haspermission( $uid, $flag_required ) ) {
-        $auth_failure = 0 if $auth_status eq 'ok';
-    }
-}
+my $allowed = Koha::Uploader->allows_add_by( $uid );
 
-if ($auth_failure) {
+if( $auth_status ne 'ok' || !$allowed ) {
     send_reply( 'denied' );
     exit 0;
 }
 
-my $upload = Koha::Upload->new( upload_pars($ENV{QUERY_STRING}) );
+my $upload = Koha::Uploader->new( upload_pars($ENV{QUERY_STRING}) );
 if( !$upload || !$upload->cgi || !$upload->count ) {
     # not one upload succeeded
     send_reply( 'failed', undef, $upload? $upload->err: undef );
@@ -81,7 +69,8 @@ sub send_reply {    # response will be sent back as JSON
    });
 }
 
-sub upload_pars {
+sub upload_pars { # this sub parses QUERY_STRING in order to build the
+                  # parameter hash for Koha::Uploader
     my ( $qstr ) = @_;
     $qstr = Encode::decode_utf8( uri_unescape( $qstr ) );
     # category could include a utf8 character