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>
176 lines
5.4 KiB
Perl
Executable file
176 lines
5.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#
|
|
# 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;
|
|
|
|
BEGIN {
|
|
# find Koha's Perl modules
|
|
# test carefully before changing this
|
|
use FindBin ();
|
|
eval { require "$FindBin::Bin/../kohalib.pl" };
|
|
}
|
|
|
|
use Koha::Script -cron;
|
|
use Getopt::Long qw( GetOptions );
|
|
use Pod::Usage qw( pod2usage );
|
|
|
|
use C4::Log qw( cronlogaction );
|
|
use C4::Reports::Guided qw( EmailReport );
|
|
|
|
cronlogaction();
|
|
|
|
=head1 NAME
|
|
|
|
patron_emailer.pl
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
patron_emailer.pl
|
|
[--report ][--notice][--module] --library --from
|
|
|
|
Options:
|
|
--help brief help
|
|
--report report ID to use as data for email template
|
|
--notice specific notice code to use
|
|
--module which module to find the above notice in
|
|
--library specified branch for selecting notice, will use all libraries by default
|
|
--from specified email for 'from' address, report column 'from' used if not specified
|
|
--email specified column to use as 'to' email address, report column 'email' used if not specified
|
|
--verbose increased verbosity, will print notices and errors
|
|
--commit send emails, without this script will only report
|
|
|
|
=head1 OPTIONS
|
|
|
|
=over 8
|
|
|
|
=item B<-help>
|
|
|
|
Print brief help and exit.
|
|
|
|
=item B<-man>
|
|
|
|
Print full documentation and exit.
|
|
|
|
=item B<-report>
|
|
|
|
Specify a saved SQL report id in the Koha system to user for the emails. All, and only,
|
|
columns in the report will be available for notice template variables
|
|
|
|
=item B<-notice>
|
|
|
|
Specific notice (CODE) to select
|
|
|
|
=item B<-module>
|
|
|
|
Which module to find the specified notice in
|
|
|
|
=item B<-library>
|
|
|
|
Option to specify which branches notice should be used, 'All libraries' is used if not specified
|
|
|
|
=item B<-from>
|
|
|
|
Specify the sender address of the email, if not specified a 'from' column in the report will be used.
|
|
|
|
=item B<-email>
|
|
|
|
Specify the column to find recipient address of the email, if not specified an 'email' column in the report will be used.
|
|
|
|
=item B<-verbose>
|
|
|
|
Increased verbosity, reports successes and errors.
|
|
|
|
=item B<-commit>
|
|
|
|
Send emails, if omitted script will report as verbose.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
my $help = 0;
|
|
my $report_id;
|
|
my $notice;
|
|
my $module; #this is only for selecting correct notice - report itself defines available columns, not module
|
|
my $library; #as above, determines which notice to use, will use 'all libraries' if not specified
|
|
my $email; #to specify which column should be used as email in report will use 'email' from borrwers table
|
|
my $from; #to specify from address, will expect 'from' column in report if not specified
|
|
my $verbose = 0;
|
|
my $commit = 0;
|
|
|
|
my $error_msgs = {
|
|
MISSING_PARAMS => "You must supply a report ID, letter module and code at minimum\n",
|
|
NO_LETTER => "The specified letter was not found, please check your input\n",
|
|
NO_REPORT => "The specified report was not found, please check your input\n",
|
|
REPORT_FAIL => "There was an error running the report, please check your SQL\n",
|
|
NO_BOR_COL => "There was no borrowernumber found for row ",
|
|
NO_EMAIL_COL => "There was no email found for row ",
|
|
NO_FROM_COL => "No from email was specified for row ",
|
|
NO_BOR => "There is no borrower with borrowernumber "
|
|
};
|
|
|
|
GetOptions(
|
|
'help|?' => \$help,
|
|
'report=i' => \$report_id,
|
|
'notice=s' => \$notice,
|
|
'module=s' => \$module,
|
|
'library=s' => \$library,
|
|
'email=s' => \$email,
|
|
'from=s' => \$from,
|
|
'verbose' => \$verbose,
|
|
'commit' => \$commit
|
|
) or pod2usage(1);
|
|
pod2usage(1) if $help;
|
|
pod2usage(1) unless $report_id && $notice && $module;
|
|
|
|
my ( $emails, $errors ) = C4::Reports::Guided::EmailReport({
|
|
email => $email,
|
|
from => $from,
|
|
report_id => $report_id,
|
|
module => $module,
|
|
code => $notice,
|
|
branch => $library,
|
|
verbose => $verbose,
|
|
commit => $commit,
|
|
});
|
|
|
|
foreach my $email (@$emails){
|
|
print "No emails will be sent!\n" unless $commit;
|
|
if( $verbose || !$commit ){
|
|
print "Email generated to $email->{to_address} from $email->{from_address}\n";
|
|
print "Content:\n";
|
|
print $email->{letter}->{content} ."\n";
|
|
}
|
|
C4::Letters::EnqueueLetter({
|
|
letter => $email->{letter},
|
|
borrowernumber => $email->{borrowernumber},
|
|
message_transport_type => 'email',
|
|
from_address => $email->{from_address},
|
|
to_address => $email->{to_address},
|
|
}) if $commit;
|
|
}
|
|
|
|
if( $verbose || !$commit ){
|
|
foreach my $error ( @$errors ){
|
|
foreach ( keys %{$error} ){
|
|
print "$_\n";
|
|
if ( $_ eq 'FATAL' ) { print $error_msgs->{ ${$error}{$_} } }
|
|
else { print $error_msgs->{$_} . ${$error}{$_} . "\n" }
|
|
}
|
|
}
|
|
}
|