From ca34b9d327f9fa329deb6658bb5197a86ea045d5 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 4 Dec 2022 13:00:12 +0100 Subject: [PATCH] PHP 8.1 support (round 1) --- plugins/dynamix/nchan/device_list | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix/nchan/device_list b/plugins/dynamix/nchan/device_list index 28fd1a1f5..e651fe3b6 100755 --- a/plugins/dynamix/nchan/device_list +++ b/plugins/dynamix/nchan/device_list @@ -139,7 +139,7 @@ function fs_info(&$disk) { if (empty($disk['fsStatus']) || $disk['fsStatus']=='-') { return ($disk['type']=='Cache' && !in_array($disk['name'],$pools)) ? ""._('Device is part of a pool')."" : ""; } elseif ($disk['fsStatus']=='Mounted') { - $echo[] = "".vfs_type($disk['fsType']).""; + $echo[] = "".vfs_type($disk['fsType']??'').""; $echo[] = "".my_scale(($disk['fsSize']??0)*1024,$unit,-1)." $unit"; if ($display['text']%10==0) { $echo[] = "".my_scale($disk['fsUsed']*1024,$unit)." $unit"; @@ -155,7 +155,7 @@ function fs_info(&$disk) { } $echo[] = "".device_browse($disk).""; } else { - $echo[] = "".vfs_type($disk['fsType']).""._($disk['fsStatus']).""; + $echo[] = "".vfs_type($disk['fsType']??'').""._($disk['fsStatus']).""; } return implode($echo); } @@ -389,7 +389,7 @@ while (true) { $echo[0] = "array_devices\n"; $parity = parity_filter($disks); $data = data_filter($disks); - foreach ($data as $disk) $crypto |= $disk['luksState']!=0 || vfs_luks($disk['fsType']); + foreach ($data as $disk) $crypto |= $disk['luksState']!=0 || vfs_luks($disk['fsType']??''); if ($var['fsState']=='Stopped') { foreach ($parity as $disk) $echo[0] .= array_offline($disk); $echo[0] .= ""; @@ -421,7 +421,7 @@ while (true) { $cache = cache_filter($disks); $n = 2; foreach ($pools as $pool) { $echo[$n] = "pool_device".($n-2)."\n"; - foreach ($cache as $disk) if (prefix($disk['name'])==$pool) $crypto |= $disk['luksState']!=0 || vfs_luks($disk['fsType']); + foreach ($cache as $disk) if (prefix($disk['name'])==$pool) $crypto |= $disk['luksState']!=0 || vfs_luks($disk['fsType']??''); if ($var['fsState']=='Stopped') { $log = file_exists($pool_log) ? parse_ini_file($pool_log) : []; $off = false;