From 8ff30553f1cc0973de07001d472d82079c880854 Mon Sep 17 00:00:00 2001 From: Olivier BOUMATI Date: Tue, 13 Feb 2018 10:45:12 +0100 Subject: [PATCH 1/2] Update monitor_tools.inc.php --- server/lib/classes/monitor_tools.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index 577fd4eb2b..69ca8e1bd1 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -811,7 +811,8 @@ class monitor_tools { $mailSubject = ''; $inHeader = true; for($l = 0; $l < count($lines); $l++) { - if(trim($lines[$l]) == '') { + /* Trim only in headers */ + if($inHeader && trim($lines[$l]) == '') { $inHeader = false; continue; } -- GitLab From bcbbd4f23301cb48d4559c4ac543a74709ac8f28 Mon Sep 17 00:00:00 2001 From: Olivier BOUMATI Date: Tue, 13 Feb 2018 11:11:37 +0100 Subject: [PATCH 2/2] Update 300-quota_notify.inc.php Make traffic quota datas available for template --- server/lib/classes/cron.d/300-quota_notify.inc.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php index 5d652d0820..b681ef967d 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -87,9 +87,13 @@ class cronjob_quota_notify extends cronjob { //* Send traffic notifications if($rec['traffic_quota_lock'] != 'y' && ($web_config['overtraffic_notify_admin'] == 'y' || $web_config['overtraffic_notify_client'] == 'y')) { - $placeholders = array('{domain}' => $rec['domain'], - '{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root')); - + $placeholders = array('{domain}' => $rec['domain'], + '{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root'), + '{used}' => $web_traffic, + '{limit}' => $web_traffic_quota, + '{ratio}' => number_format(($web_traffic_quota > 0 ? $web_traffic/$web_traffic_quota : 0) * 100, 2, '.', '').'%' + ); + $recipients = array(); //* send email to admin if($global_config['admin_mail'] != '' && $web_config['overtraffic_notify_admin'] == 'y') { -- GitLab