Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
84 lines
2.5 KiB
Perl
Executable file
84 lines
2.5 KiB
Perl
Executable file
#!/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 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use CGI::Cookie;
|
|
use Encode;
|
|
use JSON;
|
|
use URI::Escape qw( uri_unescape );
|
|
|
|
use C4::Context;
|
|
use C4::Auth qw( check_cookie_auth get_session );
|
|
use Koha::Uploader;
|
|
|
|
# upload-file.pl must authenticate the user
|
|
# before processing the POST request,
|
|
# and quickly bounce if the user is
|
|
# not authorized. Consequently, unlike
|
|
# most of the other CGI scripts, upload-file.pl
|
|
# requires that the session cookie already
|
|
# has been created.
|
|
|
|
my %cookies = CGI::Cookie->fetch;
|
|
my $sid = $cookies{'CGISESSID'}->value;
|
|
my ( $auth_status, $sessionID ) = check_cookie_auth( $sid );
|
|
my $uid = C4::Auth::get_session($sid)->param('id');
|
|
my $allowed = Koha::Uploader->allows_add_by( $uid );
|
|
|
|
if( $auth_status ne 'ok' || !$allowed ) {
|
|
send_reply( 'denied' );
|
|
exit 0;
|
|
}
|
|
|
|
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 );
|
|
} else {
|
|
# in case of multiple uploads, at least one got through
|
|
send_reply( 'done', $upload->result, $upload->err );
|
|
}
|
|
exit 0;
|
|
|
|
sub send_reply { # response will be sent back as JSON
|
|
my ( $upload_status, $data, $error ) = @_;
|
|
my $reply = CGI->new("");
|
|
print $reply->header( -type => 'text/html', -charset => 'UTF-8' );
|
|
print JSON::encode_json({
|
|
status => $upload_status,
|
|
fileid => $data,
|
|
errors => $error,
|
|
});
|
|
}
|
|
|
|
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
|
|
my $rv = {};
|
|
foreach my $p ( qw[public category temp] ) {
|
|
if( $qstr =~ /(^|&)$p=(\w+)(&|$)/ ) {
|
|
$rv->{$p} = $2;
|
|
}
|
|
}
|
|
return $rv;
|
|
}
|