From e30b16c474b695af9deb954784e61f469a72f4f8 Mon Sep 17 00:00:00 2001
From: Chris Nighswonger <cnighswonger@foundations.edu>
Date: Mon, 7 Apr 2014 11:55:35 -0400
Subject: [PATCH] [SIGNED OFF] Bug 12040 - Add 3 parameters 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.

Test Plan
---------
As for testing manually using a Gmail account:

1. Set up your sendmail as shown in misc/cronjobs/CONFIGURE.gmail
2. Before applying this patch, run misc/cronjobs/runreports.pl on your favorite report including the proper email parameters against your gmail account.
3. Note the failure message stating the authentication requirement.
4. Apply this patch, and return the script including the additional parameters and specifying "LOGIN" for the method.
5. Note the successful send.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Note: My Mail/Sendmail.pm was in /usr/share/perl5/Mail/Sendmail.pm
      I tested the case with the patch applied, with and without
      expected parameters. The parameters don't exist before, so
      I don't see how to pass values for them.
---
 misc/cronjobs/runreport.pl |   38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl
index 41e9761..fe65286 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);
@@ -260,6 +281,7 @@ foreach my $report_id (@ARGV) {
               Message => encode('utf8', $message )
           );
         }
+        $mail{'Auth'} = {user => $username, pass => $password, method => $method} if $username;
         sendmail(%mail) or carp 'mail not sent:' . $Mail::Sendmail::error;
     } else {
         print $message;
-- 
1.7.9.5