From 871a44f15e7b59120fe04c033c2158785f5af216 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 13 Mar 2020 18:28:13 +0100 Subject: [PATCH] Do not hardcode From mail address --- examples/travelynx.conf | 20 ++++++++++++-------- lib/Travelynx/Helper/Sendmail.pm | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/examples/travelynx.conf b/examples/travelynx.conf index fe3e960..851698c 100644 --- a/examples/travelynx.conf +++ b/examples/travelynx.conf @@ -22,14 +22,6 @@ password => die("Changeme!"), }, - mail => { - # If you want to disable outgoing mail for development purposes, - # uncomment the following line. Mails will instead be logged as - # Mojolicious "info" messages, causing their content to be printed on - # stdout. - ## disabled => 1, - }, - # See the Mojo::Server::Hypnotoad manual for details on the following # settings. hypnotoad => { @@ -41,6 +33,18 @@ spare => 2, }, + mail => { + # If you want to disable outgoing mail for development purposes, + # uncomment the following line. Mails will instead be logged as + # Mojolicious "info" messages, causing their content to be printed on + # stdout. + ## disabled => 1, + + # Otherwise, specify the sender ("From" field) for mail sent by travelynx + # here. E.g. 'Travelynx ' + from => die("Changeme!"), + }, + # Secrets used for cookie signing and verification. Must contain at least # one random string. If you specify several strings, the first one will # be used for signing new cookies, and the remaining ones will still be diff --git a/lib/Travelynx/Helper/Sendmail.pm b/lib/Travelynx/Helper/Sendmail.pm index fa3c4fd..73b08cd 100644 --- a/lib/Travelynx/Helper/Sendmail.pm +++ b/lib/Travelynx/Helper/Sendmail.pm @@ -21,7 +21,7 @@ sub custom { my $reg_mail = Email::Simple->create( header => [ To => $to, - From => 'Travelynx ', + From => $self->{config}{from}, Subject => $subject, 'Content-Type' => 'text/plain; charset=UTF-8', ],