From 14ed27ce422b82c893e64b65278fa57a06e0d696 Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Mon, 7 Apr 2014 11:25:23 -0400 Subject: [PATCH] This patch adds three params to allow for SMTP authentication -username -> Username to pass to the SMTP server for authentication -password -> Password to pass to the SMTP server for authentication -method -> Method is the type of authentication. Ie. LOGIN, DIGEST-MD5, etc. See the misc/cronjobs/CONFIGURE.gmail for an example of the use of these params. --- misc/cronjobs/runreport.pl | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl index 2357ed8..71b4ed9 100755 --- a/misc/cronjobs/runreport.pl +++ b/misc/cronjobs/runreport.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright 2008 Liblime +# Copyright 2014 Foundations Bible College, Inc. # # This file is part of Koha. # @@ -89,6 +90,18 @@ Current options are text, html, csv, and tsv. At the moment, text and tsv both p Whether to use e-mail (implied by --to or --from). +=item B<-username> + +Username to pass to the SMTP server for authentication + +=item B<-password> + +Password to pass to the SMTP server for authentication + +=item B<-method> + +Method is the type of authentication. Ie. LOGIN, DIGEST-MD5, etc. + =item B<-to> E-mail address to send report to. Defaults to KohaAdminEmailAddress. @@ -150,15 +163,23 @@ my $subject = 'Koha Saved Report'; my $separator = ','; my $quote = '"'; +my $username = undef; +my $password = undef; +my $method = 'LOGIN'; + GetOptions( - 'help|?' => \$help, - 'man' => \$man, - 'verbose' => \$verbose, - 'format=s' => \$format, - 'to=s' => \$to, - 'from=s' => \$from, - 'subject=s' => \$subject, - 'email' => \$email, + 'help|?' => \$help, + 'man' => \$man, + 'verbose' => \$verbose, + 'format=s' => \$format, + 'to=s' => \$to, + 'from=s' => \$from, + 'subject=s' => \$subject, + 'email' => \$email, + 'username:s' => \$username, + 'password:s' => \$password, + 'method:s' => \$method, + ) or pod2usage(2); pod2usage( -verbose => 2 ) if ($man); pod2usage( -verbose => 2 ) if ($help and $verbose); @@ -249,6 +270,8 @@ foreach my $report_id (@ARGV) { Subject => encode('utf8', $subject ), Message => encode('utf8', $message ) ); + $mail{'Auth'} = {user => $username, pass => $password, method => $method} if $username; +# $mail{'Auth'} = {user => 'librarian@foundations.edu', pass => '1974jl2010', method => 'LOGIN'}; sendmail(%mail) or carp 'mail not sent:' . $Mail::Sendmail::error; } else { print $message; -- 1.8.3.2