diff options
| author | Marius Halden <marius.h@lden.org> | 2017-11-03 16:13:59 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-11-03 16:13:59 +0100 |
| commit | 42d874db498d0fabae92d0c87acf99054d92391b (patch) | |
| tree | d0cf5afdee3d244c4e5da6fe1ab9acba620634df /perllib/FixMyStreet/Email/Sender.pm | |
| parent | 19a7c5dda85a47a68040c742791e9cd9d3e52be6 (diff) | |
| parent | dc7613329c275cd158fdde8faf1c0e301f5b7202 (diff) | |
Merge tag 'v2.2' into fiksgatami-dev
Diffstat (limited to 'perllib/FixMyStreet/Email/Sender.pm')
| -rw-r--r-- | perllib/FixMyStreet/Email/Sender.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Email/Sender.pm b/perllib/FixMyStreet/Email/Sender.pm index e6148a56c..2fb819fbc 100644 --- a/perllib/FixMyStreet/Email/Sender.pm +++ b/perllib/FixMyStreet/Email/Sender.pm @@ -28,11 +28,14 @@ sub build_default_transport { if ( FixMyStreet->test_mode ) { Email::Sender::Util->easy_transport(Test => {}); } elsif ( my $smtp_host = FixMyStreet->config('SMTP_SMARTHOST') ) { - my $type = FixMyStreet->config('SMTP_TYPE') || ''; + my $type = lc (FixMyStreet->config('SMTP_TYPE') || ''); my $port = FixMyStreet->config('SMTP_PORT') || ''; my $username = FixMyStreet->config('SMTP_USERNAME') || ''; my $password = FixMyStreet->config('SMTP_PASSWORD') || ''; + die "Bad SMTP_TYPE config: is $type, should be tls, ssl, or blank" + unless $type =~ /^(tls|ssl|)$/; + my $ssl = $type eq 'tls' ? 'starttls' : $type eq 'ssl' ? 'ssl' : ''; my $args = { host => $smtp_host, |