Merge branch 'patch-2' into 'master'

Update monitor_tools.inc.php

See merge request ispconfig/ispconfig3!730

Author: Till Brehm

server/lib/classes/cron.d/300-quota_notify.inc.php

@@ -87,9 +87,13 @@ public function onRunJob() {
 						//* 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') {

server/lib/classes/monitor_tools.inc.php

@@ -811,7 +811,8 @@ public function send_notification_email($template, $placeholders, $recipients) {
 		$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;
 			}