diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 3aea52977..b1123cc76 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -119,7 +119,7 @@ function assignment(&$disk) { function vfs_luks($fs) { return str_starts_with($fs,'luks:'); } -function vfs_type(&$disk) { +function vfs_type(&$disk,$online = false) { global $disks, $pools, $crypto; $fsType = _var($disk,'fsType',''); $luks = ''; @@ -148,13 +148,13 @@ function vfs_type(&$disk) { } return $luks.str_replace('luks:','',$fsType); } -function fs_info(&$disk) { +function fs_info(&$disk,$online = false) { global $display; $echo = []; if (empty(_var($disk,'fsStatus',''))) return ""; if (_var($disk,'fsStatus')=='Mounted') { - $echo[] = "".vfs_type($disk).""; + $echo[] = "".vfs_type($disk,$online).""; $echo[] = "".my_scale(_var($disk,'fsSize',0)*1024,$unit,-1)." $unit"; if ($display['text']%10==0) { $echo[] = "".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit"; @@ -169,7 +169,7 @@ function fs_info(&$disk) { $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; } } else { - $echo[] = "".vfs_type($disk).""._(_var($disk,'fsStatus')).""; + $echo[] = "".vfs_type($disk,$online).""._(_var($disk,'fsStatus')).""; } return implode($echo); } @@ -211,14 +211,14 @@ function array_offline(&$disk, $pool='') { $echo[] = "".device_info($disk,false)."
"._('Missing').""; $echo[] = "".assignment($disk)."{$disk['idSb']} - ".my_scale(_var($disk,'sizeSb',0)*1024,$unit)." $unit"; $echo[] = ""; - $echo[] = "".vfs_type($disk).""; + $echo[] = "".vfs_type($disk,false).""; $echo[] = ""; break; case 'DISK_NP_DSBL': $echo[] = "".device_info($disk,false).""; $echo[] = "".assignment($disk).""; $echo[] = ""; - $echo[] = "".vfs_type($disk).""; + $echo[] = "".vfs_type($disk,false).""; $echo[] = ""; break; case 'DISK_OK': @@ -233,7 +233,7 @@ function array_offline(&$disk, $pool='') { $echo[] = "$warning"; } else { $echo[] = ""; - $echo[] = "".vfs_type($disk).""; + $echo[] = "".vfs_type($disk,false).""; $echo[] = ""; } break; @@ -245,7 +245,7 @@ function array_offline(&$disk, $pool='') { $echo[] = "$warning"; } else { $echo[] = ""; - $echo[] = "".vfs_type($disk).""; + $echo[] = "".vfs_type($disk,false).""; $echo[] = ""; } break; @@ -268,7 +268,7 @@ function array_online(&$disk, $fstype='') { $sum['count']++; $sum['temp'] += $disk['temp']; } - $sum['power'] += intval(_var($disk,'power',0)); + $sum['power'] += floatval(_var($disk,'power',0)); $sum['numReads'] += _var($disk,'numReads',0); $sum['numWrites'] += _var($disk,'numWrites',0); $sum['numErrors'] += _var($disk,'numErrors',0); @@ -284,14 +284,14 @@ function array_online(&$disk, $fstype='') { $echo[] = "".device_info($disk,true).""; $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; $echo[] = ""; - $echo[] = fs_info($disk); + $echo[] = fs_info($disk,true); } break; case 'DISK_NP_DSBL': $echo[] = "".device_info($disk,true).""; $echo[] = ""._('Not installed').""; $echo[] = ""; - $echo[] = fs_info($disk); + $echo[] = fs_info($disk,true); break; case 'DISK_DSBL': default: @@ -301,7 +301,7 @@ function array_online(&$disk, $fstype='') { $echo[] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; $echo[] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; $echo[] = "".my_number(_var($disk,'numErrors',0)).""; - $echo[] = fs_info($disk); + $echo[] = fs_info($disk,true); break; } $echo[] = ""; @@ -479,7 +479,7 @@ while (true) { $echo[$a][] = "".my_diskio($data[0])."".my_number(_var($Flash,'numReads',0)).""; $echo[$a][] = "".my_diskio($data[1])."".my_number(_var($Flash,'numWrites',0)).""; $echo[$a][] = "".my_number(_var($Flash,'numErrors',0)).""; - $echo[$a][] = fs_info($Flash); + $echo[$a][] = fs_info($Flash,true); $echo[$a][] = ""; $echo[$a] = implode($echo[$a]);