maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set from and reply to from settings in usage-report-mails

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-01-10 07:33:40 +01:00
parent c1ff010283
commit aff531a274
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/jobs/cron_usage_report.php
View File

@@ -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