From 772b50f46de57cf5e5aecdd917405b393d4f4f66 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 27 Jan 2019 10:36:52 +0100
Subject: [PATCH] Supress PHP warnings

---
 plugins/dynamix/include/DashUpdate.php | 18 +++++++++---------
 plugins/dynamix/include/DeviceList.php | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php
index 1b33a180d..49cd26115 100644
--- a/plugins/dynamix/include/DashUpdate.php
+++ b/plugins/dynamix/include/DashUpdate.php
@@ -239,9 +239,9 @@ function extra_group() {
 }
 switch ($_POST['cmd']) {
 case 'array':
-  $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) ?: [];
+  $var = (array)parse_ini_file('state/var.ini');
+  $disks = (array)array_filter(parse_ini_file('state/disks.ini',true),'active_disks');
+  $saved = @(array)parse_ini_file('state/monitor.ini',true);
   require_once "$docroot/webGui/include/CustomMerge.php";
   require_once "$docroot/webGui/include/Preselect.php";
   $error = $warning = $red = $orange = $fail = $smart = $full = $high = 0;
@@ -250,9 +250,9 @@ case 'array':
   echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
   break;
 case 'cache':
-  $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) ?: [];
+  $var = (array)parse_ini_file('state/var.ini');
+  $disks = (array)array_filter(parse_ini_file('state/disks.ini',true),'active_disks');
+  $saved = @(array)parse_ini_file('state/monitor.ini',true);
   require_once "$docroot/webGui/include/CustomMerge.php";
   require_once "$docroot/webGui/include/Preselect.php";
   $error = $warning = $red = $orange = $fail = $smart = $full = $high = 0;
@@ -260,9 +260,9 @@ case 'cache':
   echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
   break;
 case 'extra':
-  $var = @parse_ini_file('state/var.ini') ?: [];
-  $disks = @parse_ini_file('state/devs.ini',true) ?: [];
-  $saved = @parse_ini_file('state/monitor.ini',true) ?: [];
+  $var = (array)parse_ini_file('state/var.ini');
+  $disks = (array)parse_ini_file('state/devs.ini',true);
+  $saved = @(array)parse_ini_file('state/monitor.ini',true);
   $smartALL = '/boot/config/smart-all.cfg';
   if (file_exists($smartALL)) $var = array_merge($var, parse_ini_file($smartALL));
   require_once "$docroot/webGui/include/Preselect.php";
diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index 80726ff57..fd25d3694 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -15,11 +15,11 @@ $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once "$docroot/webGui/include/Helpers.php";
 
 $path  = $_POST['path'];
-$var   = parse_ini_file('state/var.ini');
-$devs  = parse_ini_file('state/devs.ini',true);
-$disks = parse_ini_file('state/disks.ini',true);
-$sec   = parse_ini_file('state/sec.ini',true);
-$diskio= @parse_ini_file('state/diskload.ini');
+$var   = (array)parse_ini_file('state/var.ini');
+$devs  = (array)parse_ini_file('state/devs.ini',true);
+$disks = (array)parse_ini_file('state/disks.ini',true);
+$sec   = (array)parse_ini_file('state/sec.ini',true);
+$diskio= @(array)parse_ini_file('state/diskload.ini');
 $sum   = ['count'=>0, 'temp'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0];
 extract(parse_plugin_cfg('dynamix',true));