From df3e1d92023e45ddb234ca052576dc6ce9ac49bb Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 17 Jan 2019 07:08:22 +0100 Subject: [PATCH 1/4] Dashboard: Suppress PHP warnings --- plugins/dynamix/include/DashUpdate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index aff049af4..d2c8a4b99 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -240,8 +240,8 @@ function extra_group(&$disks) { } switch ($_POST['cmd']) { case 'array': - $var = parse_ini_file('state/var.ini'); - $disks = array_filter(parse_ini_file('state/disks.ini',true),'active_disks'); + $var = parse_ini_file('state/var.ini') ?: []; + $disks = array_filter(parse_ini_file('state/disks.ini',true),'active_disks') ?: []; $saved = @parse_ini_file('state/monitor.ini',true) ?: []; require_once "$docroot/webGui/include/CustomMerge.php"; require_once "$docroot/webGui/include/Preselect.php"; From b4a1472a2f6b1eafab0021a7682eee4bcaa752ef Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 17 Jan 2019 10:24:32 +0100 Subject: [PATCH 2/4] Docker: suppress PHP warning --- plugins/dynamix.docker.manager/include/DockerClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index eb0c7d2f8..a7ceb275a 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -277,7 +277,7 @@ class DockerTemplates { if ($ct['Running']) { $port = &$ct['Ports'][0]; $ip = ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : $port['IP']); - $tmp['url'] = strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip); + $tmp['url'] = strpos($tmp['url'] ?: '',$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip); $tmp['shell'] = $tmp['shell'] ?? $this->getTemplateValue($image, 'Shell'); } $tmp['registry'] = $tmp['registry'] ?? $this->getTemplateValue($image, 'Registry'); From 42685629293c7b8907fedf1b636f92d913d63ffa Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 17 Jan 2019 10:31:10 +0100 Subject: [PATCH 3/4] Docker: suppress PHP warning --- plugins/dynamix.docker.manager/include/DockerClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index a7ceb275a..c66855a72 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -277,7 +277,7 @@ class DockerTemplates { if ($ct['Running']) { $port = &$ct['Ports'][0]; $ip = ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : $port['IP']); - $tmp['url'] = strpos($tmp['url'] ?: '',$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip); + $tmp['url'] = $ip ? (strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip)) : $tmp['url']; $tmp['shell'] = $tmp['shell'] ?? $this->getTemplateValue($image, 'Shell'); } $tmp['registry'] = $tmp['registry'] ?? $this->getTemplateValue($image, 'Registry'); From 757472f87ef74f852f748b0e5cdb1443be203285 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 17 Jan 2019 14:06:33 +0100 Subject: [PATCH 4/4] Dashboard: suppress utilization messages if threshold not set --- plugins/dynamix/include/DashUpdate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index d2c8a4b99..c92ac5583 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -198,8 +198,8 @@ function device_usage(&$disk, $array, &$full, &$high) { $load = substr($used,0,-1); $critical = $disk['critical'] ?? $_POST['critical']; $warning = $disk['warning'] ?? $_POST['warning']; - if ($load >= $critical) {$class = 'redbar'; $full++;} - elseif ($load >= $warning) {$class = 'orangebar'; $high++;} + if ($critical > 0 && $load >= $critical) {$class = 'redbar'; $full++;} + elseif ($warning > 0 && $load >= $warning) {$class = 'orangebar'; $high++;} else $class = 'greenbar'; } else $class = false; } else $used = false;