diff options
author | Ivan Kohler <ivan@freeside.biz> | 2020-05-18 21:41:43 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2020-05-18 21:41:43 -0700 |
commit | ae09d41481da0937765821af91537b8e728169e4 (patch) | |
tree | a017522e81fa48f40f0a453dbc7674998ca64da3 | |
parent | bb23a2cae98e28ab4ac60e517a84393d54b0ca86 (diff) |
Email::Sender::Transport::SMTP::TLS no longer needed
-rw-r--r-- | FS/FS/Misc.pm | 28 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 13 insertions, 17 deletions
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index b787fb6..5eba874 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -135,7 +135,6 @@ use Date::Format; use MIME::Entity; use Email::Sender::Simple qw(sendmail); use Email::Sender::Transport::SMTP; -use Email::Sender::Transport::SMTP::TLS 0.11; use FS::UID; FS::UID->install_callback( sub { @@ -281,22 +280,19 @@ sub send_email { $smtp_opt{'port'} = $port; my $error = ''; - my $transport; - if ( defined($enc) && $enc eq 'starttls' ) { - foreach (qw(username password)) { - $smtp_opt{$_} = $conf->config("smtp-$_"); - $error = "SMTP settings misconfiguration: ". - "STARTTLS enabled in smtp-encryption but smtp-$_ missing" - if ! length($smtp_opt{$_}); - } - $transport = Email::Sender::Transport::SMTP::TLS->new( %smtp_opt ); - } else { - if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) { - $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password); - } - $smtp_opt{'ssl'} = 1 if defined($enc) && $enc eq 'tls'; - $transport = Email::Sender::Transport::SMTP->new( %smtp_opt ); + if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) { + $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password); + } elsif ( defined($enc) && $enc eq 'starttls') { + $error = "SMTP settings misconfiguration: STARTTLS enabled in ". + "smtp-encryption but smtp-username or smtp-password missing"; } + + if ( defined($enc) ) { + $smtp_opt{'ssl'} = 'starttls' if $enc eq 'starttls'; + $smtp_opt{'ssl'} = 1 if $enc eq 'tls'; + } + + my $transport = Email::Sender::Transport::SMTP->new( %smtp_opt ); push @to, $options{bcc} if defined($options{bcc}); # fully unpack all addresses found in @to (including Bcc) to make the diff --git a/debian/control b/debian/control index 2d46acc..5b8c021 100644 --- a/debian/control +++ b/debian/control @@ -68,7 +68,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip, fonts-dustin,libdatetime-perl,libdatetime-format-strptime-perl, libfile-slurp-perl,libspreadsheet-parseexcel-perl,libauthen-passphrase-perl, libnet-domain-tld-perl,libbusiness-us-usps-webtools-perl,libxml-simple-perl, - libemail-sender-perl,libemail-sender-transport-smtp-tls-perl, + libemail-sender-perl (>=1.300027), libhtml-defang-perl,libdatetime-format-natural-perl,libcgi-pm-perl, libfile-sharedir-perl,libmodule-versions-report-perl,libtext-wikiformat-perl, libnet-server-perl,libhttp-server-simple-perl,libhtml-rewriteattributes-perl, |