diff options
| author | Simon Rettberg | 2016-11-18 16:51:27 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-11-18 16:51:27 +0100 |
| commit | 56a6912ace8c1b90719f80595e2b3d970c121af4 (patch) | |
| tree | 07b61e4076feb1e2613dbe138b7a6853645e610f /modules-available/statistics/page.inc.php | |
| parent | [statistics] Make static function static (diff) | |
| download | slx-admin-56a6912ace8c1b90719f80595e2b3d970c121af4.tar.gz slx-admin-56a6912ace8c1b90719f80595e2b3d970c121af4.tar.xz slx-admin-56a6912ace8c1b90719f80595e2b3d970c121af4.zip | |
[statistics] Add support for parsing GPT output from busybox fdisk
Diffstat (limited to 'modules-available/statistics/page.inc.php')
| -rw-r--r-- | modules-available/statistics/page.inc.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index cf33c8af..ab7d589c 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -683,6 +683,9 @@ class Page_Statistics extends Page $client['kvmclass'] = $this->kvmColorClass($client['kvmstate']); $client['hddclass'] = $this->hddColorClass($client['gbtmp']); // Parse the giant blob of data + if (strpos($client['data'], "\r") !== false) { + $client['data'] = str_replace("\r", "\n", $client['data']); + } $hdds = array(); if (preg_match_all('/##### ([^#]+) #+$(.*?)^#####/ims', $client['data'] . '########', $out, PREG_SET_ORDER)) { foreach ($out as $section) { |