summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-04-13 18:56:06 +0200
committerDaniel Friesel <derf@finalrewind.org>2019-04-13 18:56:06 +0200
commit13dbcf876178da53509cf6af2fb579311ef93d78 (patch)
treef06b739516157ea85558c28dd8810c84f39d75e8 /lib
parent4d413d06a37c0cefd1d99d38b10bcdf7b506d538 (diff)
add explicit config toggle to disable sendmail
Diffstat (limited to 'lib')
-rwxr-xr-xlib/Travelynx.pm3
-rw-r--r--lib/Travelynx/Helper/Sendmail.pm2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 0600494..8da796d 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -583,7 +583,8 @@ qq{select * from pending_mails where email = ? and num_tries > 1;}
$self->helper(
sendmail => sub {
state $sendmail
- = Travelynx::Helper::Sendmail->new( config => $self->config );
+ = Travelynx::Helper::Sendmail->new(
+ config => ( $self->config->{mail} // {} ) );
}
);
diff --git a/lib/Travelynx/Helper/Sendmail.pm b/lib/Travelynx/Helper/Sendmail.pm
index 19e7d05..9f19e74 100644
--- a/lib/Travelynx/Helper/Sendmail.pm
+++ b/lib/Travelynx/Helper/Sendmail.pm
@@ -28,7 +28,7 @@ sub custom {
body => encode( 'utf-8', $body ),
);
- if ( $self->{config}->{db}->{database} =~ m{travelynx_dev} ) {
+ if ( $self->{config}->{disabled} ) {
# Do not send mail in dev mode
say "sendmail to ${to}: ${subject}\n\n${body}";