Merge branch '5938-layout-mailq-monitor' into 'develop'

Marius Burkard · Marius Burkard · commit fc06aab09864 · 2020-12-09T09:42:29.000+01:00
Preserve indentation from mailq output using &lt;pre&gt;.

Closes #5938

See merge request ispconfig/ispconfig3!1339
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
@@ -568,7 +568,7 @@ function showMailq() {
 
 		if(isset($record['data'])) {
 			$data = unserialize($record['data']);
-			$html = nl2br($data['output']);
+                       $html = '<pre>' . htmlspecialchars($data['output']) . '</pre>';
 		} else {
 			$html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';
 		}

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ function showMailq() {`
`568`	`568`
`569`	`569`	`if(isset($record['data'])) {`
`570`	`570`	`$data = unserialize($record['data']);`
`571`		`- $html = nl2br($data['output']);`
	`571`	`+ $html = '<pre>' . htmlspecialchars($data['output']) . '</pre>';`
`572`	`572`	`} else {`
`573`	`573`	`$html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';`
`574`	`574`	`}`