From aff531a274849fee22c23b38136e0398933e7684 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sat, 10 Jan 2015 07:33:40 +0100 Subject: [PATCH] set from and reply to from settings in usage-report-mails Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_usage_report.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/jobs/cron_usage_report.php b/scripts/jobs/cron_usage_report.php index 9672b8e9..e6cb3c8b 100644 --- a/scripts/jobs/cron_usage_report.php +++ b/scripts/jobs/cron_usage_report.php @@ -24,9 +24,15 @@ $yesterday = time() - (60 * 60 * 24); * Initialize the mailingsystem */ $mail = new PHPMailer(true); - $mail->CharSet = "UTF-8"; -$mail->SetFrom(Settings::Get('panel.adminmail'), 'Froxlor Administrator'); + +if (PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) { + // set return-to address and custom sender-name, see #76 + $mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname')); + if (Settings::Get('panel.adminmail_return') != '') { + $mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname')); + } +} // Warn the customers at xx% traffic-usage