Merge branch '3651-mem' into 'stable-3.1'

Till Brehm · Till Brehm · commit d5214d16ecd6 · 2020-08-27T13:12:02.000+02:00
Show memory usage in MB's (#3651)

Closes #3651

See merge request ispconfig/ispconfig3!1094
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
@@ -184,9 +184,10 @@ function showMemUsage () {
 
 			foreach($data as $key => $value) {
 				if ($key != '') {
+					$memory = $app->functions->formatBytes($value);
 					$html .= '<tr>
                         <td>' . $key . ':</td>
-                        <td>' . $value . '</td>
+                        <td>' . $memory . '</td>
                         </tr>';
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,10 @@ function showMemUsage () {`
`184`	`184`
`185`	`185`	`foreach($data as $key => $value) {`
`186`	`186`	`if ($key != '') {`
	`187`	`+ $memory = $app->functions->formatBytes($value);`
`187`	`188`	`$html .= '<tr>`
`188`	`189`	`<td>' . $key . ':</td>`
`189`		`- <td>' . $value . '</td>`
	`190`	`+ <td>' . $memory . '</td>`
`190`	`191`	`</tr>';`
`191`	`192`	`}`
`192`	`193`	`}`