From e45054e3f2f2fd02713a357020dc975490f87d1b Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 17 Sep 2025 15:07:55 +1000 Subject: [PATCH 1/4] Feat: Add disk utilization column to webUI --- emhttp/plugins/dynamix/nchan/device_list | 649 +++++++++++++---------- emhttp/plugins/dynamix/nchan/disk_load | 16 +- 2 files changed, 371 insertions(+), 294 deletions(-) diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 6302f04fb4..97663fafaa 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -21,427 +21,490 @@ $md5_old = $fs_old = -1; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/webGui/include/publish.php"; -extract(parse_plugin_cfg('dynamix',true)); +extract(parse_plugin_cfg('dynamix', true)); // add translations $_SERVER['REQUEST_URI'] = 'main'; -$login_locale = _var($display,'locale'); +$login_locale = _var($display, 'locale'); require_once "$docroot/webGui/include/Translations.php"; // remember current language $locale_init = $locale; -function initSum() { - return ['count'=>0, 'temp'=>0, 'power'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0]; +function initSum() +{ + return ['count' => 0, 'temp' => 0, 'power' => 0, 'fsSize' => 0, 'fsUsed' => 0, 'fsFree' => 0, 'ioReads' => 0, 'ioWrites' => 0, 'numReads' => 0, 'numWrites' => 0, 'numErrors' => 0]; } -function get_model($id) { - return substr($id,0,strrpos($id,'_')); +function get_model($id) +{ + return substr($id, 0, strrpos($id, '_')); } -function my_power($power) { +function my_power($power) +{ global $display; - $number = _var($display,'number','.,'); - return _var($display,'power') && $power ? number_format($power,$power<10?2:1,$number[0]).' '._('W').' / ' : ''; + $number = _var($display, 'number', '.,'); + return _var($display, 'power') && $power ? number_format($power, $power < 10 ? 2 : 1, $number[0]) . ' ' . _('W') . ' / ' : ''; } -function device_info(&$disk,$online) { +function device_info(&$disk, $online) +{ global $pools, $var; - if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) { + if (!$online || _var($disk, 'fsStatus') != 'Mounted' || (in_array(_var($disk, 'type'), ['Parity', 'Cache']) && (!in_array(_var($disk, 'name'), $pools) || isSubpool(_var($disk, 'name'))))) { $view = ""; } else { - $dir = _var($disk,'name')=='flash' ? "/boot" : "/mnt/"._var($disk,'name'); - $view = ""; + $dir = _var($disk, 'name') == 'flash' ? "/boot" : "/mnt/" . _var($disk, 'name'); + $view = ""; } - $name = _var($disk,'name'); + $name = _var($disk, 'name'); $named = no_tilde($name); - $fancy = _(my_disk(native($name,1)),3); - $type = _var($disk,'type'); - $source = $type=='Flash' ? $type : 'Device'; - $parity = $type=='Parity'; - $data = $type=='Data'; - $pool = $type=='Cache'; - $action = str_contains(_var($disk,'color'),'blink') ? 'up' : 'down'; - switch (_var($disk,'color')) { - case 'green-on': $orb = 'circle'; $color = 'green'; $help = _('Normal operation, device is active'); break; - case 'green-blink': $orb = 'circle'; $color = 'grey'; $help = _('Device is in standby mode (spun-down)'); break; - case 'blue-on': $orb = 'square'; $color = 'blue'; $help = _('New device'); break; - case 'blue-blink': $orb = 'square'; $color = 'grey'; $help = _('New device, in standby mode (spun-down)'); break; - case 'yellow-on': $orb = 'warning'; $color = 'yellow'; $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); break; - case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); break; + $fancy = _(my_disk(native($name, 1)), 3); + $type = _var($disk, 'type'); + $source = $type == 'Flash' ? $type : 'Device'; + $parity = $type == 'Parity'; + $data = $type == 'Data'; + $pool = $type == 'Cache'; + $action = str_contains(_var($disk, 'color'), 'blink') ? 'up' : 'down'; + switch (_var($disk, 'color')) { + case 'green-on': + $orb = 'circle'; + $color = 'green'; + $help = _('Normal operation, device is active'); + break; + case 'green-blink': + $orb = 'circle'; + $color = 'grey'; + $help = _('Device is in standby mode (spun-down)'); + break; + case 'blue-on': + $orb = 'square'; + $color = 'blue'; + $help = _('New device'); + break; + case 'blue-blink': + $orb = 'square'; + $color = 'grey'; + $help = _('New device, in standby mode (spun-down)'); + break; + case 'yellow-on': + $orb = 'warning'; + $color = 'yellow'; + $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); + break; + case 'yellow-blink': + $orb = 'warning'; + $color = 'grey'; + $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); + break; case 'red-on': - case 'red-blink': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); break; - case 'red-off': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); break; - case 'grey-off': $orb = 'square'; $color = 'grey'; $help = _('Device not present'); break; + case 'red-blink': + $orb = 'times'; + $color = 'red'; + $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); + break; + case 'red-off': + $orb = 'times'; + $color = 'red'; + $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); + break; + case 'grey-off': + $orb = 'square'; + $color = 'grey'; + $help = _('Device not present'); + break; } $ctrl = ''; - $disk_status = _var($disk,'status'); - if (_var($var,'fsState')=='Started' && $source!='Flash' && !str_contains($disk_status,'_NP')) { + $disk_status = _var($disk, 'status'); + if (_var($var, 'fsState') == 'Started' && $source != 'Flash' && !str_contains($disk_status, '_NP')) { $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$source','$name','$action')\""; - $help .= "
"._("Click to spin $action device"); + $help .= "
" . _("Click to spin $action device"); } - $status = "$help"; + $status = "$help"; - $link = ($parity && $disk_status!='DISK_NP_DSBL') || (($data || $pool) && $disk_status!='DISK_NP') || $name=='flash' || in_array($name,$pools) || $type=='New' - ? "$fancy" - : $fancy; - return $view.$status.$link; + $link = ($parity && $disk_status != 'DISK_NP_DSBL') || (($data || $pool) && $disk_status != 'DISK_NP') || $name == 'flash' || in_array($name, $pools) || $type == 'New' + ? "$fancy" + : $fancy; + return $view . $status . $link; } -function device_desc(&$disk) { +function device_desc(&$disk) +{ global $var; - $size = my_scale(_var($disk,'sectors',0)*_var($disk,'sector_size',0),$unit,-1); - if (_var($var,'fsState')=='Started') { - switch (_var($disk,'type')) { - case 'Flash': $type = 'usb'; break; - case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break; + $size = my_scale(_var($disk, 'sectors', 0) * _var($disk, 'sector_size', 0), $unit, -1); + if (_var($var, 'fsState') == 'Started') { + switch (_var($disk, 'type')) { + case 'Flash': + $type = 'usb'; + break; + case 'Parity': + $type = _var($disk, 'rotational') ? 'disk' : 'nvme'; + break; case 'Data': - case 'Cache': $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break; - default: $type = 'disk'; break; + case 'Cache': + $type = _var($disk, 'rotational') ? (_var($disk, 'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; + break; + default: + $type = 'disk'; + break; } - $log = ""._('Disk Log Information').""; - return $log."".my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + $log = "" . _('Disk Log Information') . ""; + return $log . "" . my_id(_var($disk, 'id')) . " - $size $unit (" . _var($disk, 'device') . ")"; } else { - return my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + return my_id(_var($disk, 'id')) . " - $size $unit (" . _var($disk, 'device') . ")"; } } -function assignment(&$disk) { +function assignment(&$disk) +{ global $var, $devs; $echo = []; $echo[] = "
"; $echo[] = ""; - $echo[] = ""; - $echo[] = ""; + $echo[] = "
"; return implode($echo); } -function vfs_luks($fs) { - return str_starts_with($fs,'luks:'); +function vfs_luks($fs) +{ + return str_starts_with($fs, 'luks:'); } -function vfs_type(&$disk,$online = false) { +function vfs_type(&$disk, $online = false) +{ global $disks, $pools, $crypto; - $fsType = _var($disk,'fsType',''); + $fsType = _var($disk, 'fsType', ''); $luks = ''; if (empty($fsType)) return; - if (vfs_luks($fsType) && $crypto) switch (_var($disk,'luksState',0)) { + if (vfs_luks($fsType) && $crypto) switch (_var($disk, 'luksState', 0)) { case 0: - $luks = ""._('Device to be encrypted').""; + $luks = "" . _('Device to be encrypted') . ""; break; case 1: if ($online) { - $luks = ""._('Device encrypted and unlocked').""; + $luks = "" . _('Device encrypted and unlocked') . ""; break; } /* fall thru */ case 2: - $luks = ""._('Device encrypted').""; + $luks = "" . _('Device encrypted') . ""; break; case 3: - $luks = ""._('Device locked: wrong encryption key').""; + $luks = "" . _('Device locked: wrong encryption key') . ""; break; - default: - $luks = ""._('Device locked: unknown error').""; + default: + $luks = "" . _('Device locked: unknown error') . ""; break; } - return $luks.str_replace('luks:','',$fsType); + return $luks . str_replace('luks:', '', $fsType); } -function fs_info(&$disk,$online = false) { +function fs_info(&$disk, $online = false) +{ global $display; $echo = []; - if (empty(_var($disk,'fsStatus',''))) + if (empty(_var($disk, 'fsStatus', ''))) return ""; - if (_var($disk,'fsStatus')=='Mounted') { - $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"; + if (_var($disk, 'fsStatus') == 'Mounted') { + $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"; } else { - $used = _var($disk,'fsSize',0)>0 ? 100-round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; - $echo[] = "
".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit
"; + $used = _var($disk, 'fsSize', 0) > 0 ? 100 - round(100 * _var($disk, 'fsFree', 0) / $disk['fsSize']) : 0; + $echo[] = "
" . my_scale(_var($disk, 'fsUsed', 0) * 1024, $unit) . " $unit
"; } - if (_var($display,'text',0)<10 ? _var($display,'text',0)%10==0 : _var($display,'text',0)%10!=0) { - $echo[] = "".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit"; + if (_var($display, 'text', 0) < 10 ? _var($display, 'text', 0) % 10 == 0 : _var($display, 'text', 0) % 10 != 0) { + $echo[] = "" . my_scale(_var($disk, 'fsFree', 0) * 1024, $unit) . " $unit"; } else { - $free = _var($disk,'fsSize',0)>0 ? round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; - $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; + $free = _var($disk, 'fsSize', 0) > 0 ? round(100 * _var($disk, 'fsFree', 0) / $disk['fsSize']) : 0; + $echo[] = "
" . my_scale(_var($disk, 'fsFree', 0) * 1024, $unit) . " $unit
"; } } else { - $echo[] = "".vfs_type($disk,$online).""._(_var($disk,'fsStatus')).""; + $echo[] = "" . vfs_type($disk, $online) . "" . _(_var($disk, 'fsStatus')) . ""; } return implode($echo); } -function my_diskio($data) { - return my_scale($data,$unit,1)." $unit/s"; +function my_diskio($data) +{ + return my_scale($data, $unit, 1) . " $unit/s"; } -function array_offline(&$disk, $pool='') { +function array_offline(&$disk, $pool = '') +{ global $var, $disks, $display; - $disk['power'] ??= (_var($display,'power') && _var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); - $echo = []; $warning = ''; - $status = ['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG']; - $text = ""._('All existing data on this device will be OVERWRITTEN when array is Started').""; - if (_var($disk,'type')=='Cache') { - if (!str_contains(_var($disks[$pool],'state'),'ERROR:')) { + $disk['power'] ??= (_var($display, 'power') && _var($disk, 'transport') == 'nvme' ? get_nvme_info(_var($disk, 'device'), 'power') : 0); + $echo = []; + $warning = ''; + $status = ['DISK_INVALID', 'DISK_DSBL_NEW', 'DISK_WRONG']; + $text = "" . _('All existing data on this device will be OVERWRITTEN when array is Started') . ""; + if (_var($disk, 'type') == 'Cache') { + if (!str_contains(_var($disks[$pool], 'state'), 'ERROR:')) { $_pool = (strpos($pool, '~') !== false) ? substr($pool, 0, strpos($pool, '~')) : $pool; - if (!empty(_var($disks[$_pool],'uuid'))) { - if (in_array(_var($disk,'status'),$status) || _var($disk['status'])=='DISK_NEW') $warning = $text; + if (!empty(_var($disks[$_pool], 'uuid'))) { + if (in_array(_var($disk, 'status'), $status) || _var($disk['status']) == 'DISK_NEW') $warning = $text; } } } else { - if (!str_contains(_var($var,'mdState'),'ERROR:')) { - if (_var($var,'mdState')=='NEW_ARRAY') { - if (_var($disk,'type')=='Parity') $warning = $text; - } elseif (_var($var,'mdState')=='RECON_DISK') { - if (in_array(_var($disk,'status'),$status)) $warning = $text; - } elseif (_var($disk['status'])=='DISK_NEW' && _var($var,'mdResyncAction')=='clear') { + if (!str_contains(_var($var, 'mdState'), 'ERROR:')) { + if (_var($var, 'mdState') == 'NEW_ARRAY') { + if (_var($disk, 'type') == 'Parity') $warning = $text; + } elseif (_var($var, 'mdState') == 'RECON_DISK') { + if (in_array(_var($disk, 'status'), $status)) $warning = $text; + } elseif (_var($disk['status']) == 'DISK_NEW' && _var($var, 'mdResyncAction') == 'clear') { $warning = $text; } } } $echo[] = ""; - switch (_var($disk,'status')) { - case 'DISK_NP': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = ""; - break; - case 'DISK_NP_MISSING': - $echo[] = "".device_info($disk,false)."
"._('Missing').""; - $echo[] = "".assignment($disk)."{$disk['idSb']}"; - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - break; - case 'DISK_NP_DSBL': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - break; - case 'DISK_OK': - case 'DISK_DSBL': - case 'DISK_INVALID': - case 'DISK_DSBL_NEW': - case 'DISK_NEW': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; - if ($warning) { - $echo[] = "$warning"; - } else { - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - } - break; - case 'DISK_WRONG': - $echo[] = "".device_info($disk,false)."
"._('Wrong').""; - $echo[] = "".assignment($disk)."{$disk['idSb']}"; - $echo[] = "".my_temp(_var($disk,'temp','*')).""; - if ($warning) { - $echo[] = "$warning"; - } else { + switch (_var($disk, 'status')) { + case 'DISK_NP': + $echo[] = "" . device_info($disk, false) . ""; + $echo[] = "" . assignment($disk) . ""; + $echo[] = ""; + break; + case 'DISK_NP_MISSING': + $echo[] = "" . device_info($disk, false) . "
" . _('Missing') . ""; + $echo[] = "" . assignment($disk) . "{$disk['idSb']}"; + $echo[] = ""; + $echo[] = "" . vfs_type($disk, false) . ""; $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; + break; + case 'DISK_NP_DSBL': + $echo[] = "" . device_info($disk, false) . ""; + $echo[] = "" . assignment($disk) . ""; + $echo[] = ""; + $echo[] = "" . vfs_type($disk, false) . ""; $echo[] = ""; - } - break; + break; + case 'DISK_OK': + case 'DISK_DSBL': + case 'DISK_INVALID': + case 'DISK_DSBL_NEW': + case 'DISK_NEW': + $echo[] = "" . device_info($disk, false) . ""; + $echo[] = "" . assignment($disk) . ""; + $echo[] = "" . my_power($disk['power']) . my_temp(_var($disk, 'temp', '*')) . ""; + if ($warning) { + $echo[] = "$warning"; + } else { + $echo[] = ""; + $echo[] = "" . vfs_type($disk, false) . ""; + $echo[] = ""; + } + break; + case 'DISK_WRONG': + $echo[] = "" . device_info($disk, false) . "
" . _('Wrong') . ""; + $echo[] = "" . assignment($disk) . "{$disk['idSb']}"; + $echo[] = "" . my_temp(_var($disk, 'temp', '*')) . ""; + if ($warning) { + $echo[] = "$warning"; + } else { + $echo[] = ""; + $echo[] = "" . vfs_type($disk, false) . ""; + $echo[] = ""; + } + break; } $echo[] = ""; return implode($echo); } -function array_online(&$disk, $fstype='') { +function array_online(&$disk, $fstype = '') +{ global $pools, $sum, $diskio; - $disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); + $disk['power'] ??= (_var($disk, 'transport') == 'nvme' ? get_nvme_info(_var($disk, 'device'), 'power') : 0); $echo = []; - $data = [0,0]; - if (_var($disk,'device')) { + $data = [0, 0, 0]; + if (_var($disk, 'device')) { $dev = $disk['device']; - $data = explode(' ',$diskio[$dev] ?? '0 0'); + $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); $sum['ioReads'] += $data[0]; $sum['ioWrites'] += $data[1]; } - if (is_numeric(_var($disk,'temp','*'))) { + if (is_numeric(_var($disk, 'temp', '*'))) { $sum['count']++; $sum['temp'] += $disk['temp']; } - $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); + $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); if (isset($disk['fsFree'])) { - $sum['fsSize'] += _var($disk,'fsSize',0); - $sum['fsUsed'] += _var($disk,'fsUsed',0); - $sum['fsFree'] += _var($disk,'fsFree',0); + $sum['fsSize'] += _var($disk, 'fsSize', 0); + $sum['fsUsed'] += _var($disk, 'fsUsed', 0); + $sum['fsFree'] += _var($disk, 'fsFree', 0); } $echo[] = ""; - switch (_var($disk,'status')) { - case 'DISK_NP': - if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') { - $echo[] = "".device_info($disk,true).""; - $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; + switch (_var($disk, 'status')) { + case 'DISK_NP': + if (in_array(_var($disk, 'name'), $pools) || $fstype == 'zfs') { + $echo[] = "" . device_info($disk, true) . ""; + $echo[] = "" . ($fstype == 'zfs' ? _('Not present') : _('Not installed')) . ""; + $echo[] = ""; + $echo[] = fs_info($disk, true); + } + break; + case 'DISK_NP_DSBL': + $echo[] = "" . device_info($disk, true) . ""; + $echo[] = "" . _('Not installed') . ""; $echo[] = ""; - $echo[] = fs_info($disk,true); - } - break; - case 'DISK_NP_DSBL': - $echo[] = "".device_info($disk,true).""; - $echo[] = ""._('Not installed').""; - $echo[] = ""; - $echo[] = fs_info($disk,true); - break; - case 'DISK_DSBL': - default: - $echo[] = "".device_info($disk,true).""; - $echo[] = "".device_desc($disk).""; - $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; - $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,true); - break; + $echo[] = fs_info($disk, true); + break; + case 'DISK_DSBL': + default: + $echo[] = "" . device_info($disk, true) . ""; + $echo[] = "" . device_desc($disk) . ""; + $echo[] = "" . my_power($disk['power']) . my_temp(_var($disk, 'temp', '*')) . ""; + $echo[] = "" . my_diskio($data[0]) . "" . my_number(_var($disk, 'numReads', 0)) . ""; + $echo[] = "" . my_diskio($data[1]) . "" . my_number(_var($disk, 'numWrites', 0)) . ""; + $echo[] = "" . (_var($data, 4, 0)) . " %"; + $echo[] = "" . my_number(_var($disk, 'numErrors', 0)) . ""; + $echo[] = fs_info($disk, true); + break; } $echo[] = ""; return implode($echo); } -function show_totals($text,$array,$name) { +function show_totals($text, $array, $name) +{ global $var, $display, $sum, $locale; - $number = _var($display,'number','.,'); + $number = _var($display, 'number', '.,'); $ctrl1 = "onclick=\"toggle_state('Device','$name','down')\""; $ctrl2 = "onclick=\"toggle_state('Device','$name','up')\""; - $help1 = _('Spin Down').' '._(ucfirst(substr($name,0,-1))); - $help2 = _('Spin Up').' '._(ucfirst(substr($name,0,-1))); + $help1 = _('Spin Down') . ' ' . _(ucfirst(substr($name, 0, -1))); + $help2 = _('Spin Up') . ' ' . _(ucfirst(substr($name, 0, -1))); $echo = []; $echo[] = ""; $echo[] = "$help1$help2"; $echo[] = "$text"; - $echo[] = "".my_power($sum['power']).($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'])) : '*').""; - $echo[] = "".my_diskio($sum['ioReads'])."".my_number($sum['numReads']).""; - $echo[] = "".my_diskio($sum['ioWrites'])."".my_number($sum['numWrites']).""; - $echo[] = "".my_number($sum['numErrors']).""; + $echo[] = "" . my_power($sum['power']) . ($sum['count'] > 0 ? my_temp(round($sum['temp'] / $sum['count'])) : '*') . ""; + $echo[] = "" . my_diskio($sum['ioReads']) . "" . my_number($sum['numReads']) . ""; + $echo[] = "" . my_diskio($sum['ioWrites']) . "" . my_number($sum['numWrites']) . ""; + $echo[] = "-"; + $echo[] = "" . my_number($sum['numErrors']) . ""; $echo[] = ""; - if ($array && _var($var,'startMode')=='Normal') { - $echo[] = "".my_scale($sum['fsSize']*1024,$unit,-1)." $unit"; - if ($display['text']%10==0) { - $echo[] = "".my_scale($sum['fsUsed']*1024,$unit)." $unit"; + if ($array && _var($var, 'startMode') == 'Normal') { + $echo[] = "" . my_scale($sum['fsSize'] * 1024, $unit, -1) . " $unit"; + if ($display['text'] % 10 == 0) { + $echo[] = "" . my_scale($sum['fsUsed'] * 1024, $unit) . " $unit"; } else { - $used = $sum['fsSize'] ? 100-round(100*$sum['fsFree']/$sum['fsSize']) : 0; - $echo[] = "
".my_scale($sum['fsUsed']*1024,$unit)." $unit
"; + $used = $sum['fsSize'] ? 100 - round(100 * $sum['fsFree'] / $sum['fsSize']) : 0; + $echo[] = "
" . my_scale($sum['fsUsed'] * 1024, $unit) . " $unit
"; } - if ($display['text']<10 ? $display['text']%10==0 : $display['text']%10!=0) { - $echo[] = "".my_scale($sum['fsFree']*1024,$unit)." $unit"; + if ($display['text'] < 10 ? $display['text'] % 10 == 0 : $display['text'] % 10 != 0) { + $echo[] = "" . my_scale($sum['fsFree'] * 1024, $unit) . " $unit"; } else { - $free = $sum['fsSize'] ? round(100*$sum['fsFree']/$sum['fsSize']) : 0; - $echo[] = "
".my_scale($sum['fsFree']*1024,$unit)." $unit
"; + $free = $sum['fsSize'] ? round(100 * $sum['fsFree'] / $sum['fsSize']) : 0; + $echo[] = "
" . my_scale($sum['fsFree'] * 1024, $unit) . " $unit
"; } } else { - $echo[] = ""; + $echo[] = ""; } $echo[] = ""; return implode($echo); } -function array_slots() { +function array_slots() +{ global $var; - $min = max(_var($var,'sbNumDisks',0),3); - $max = _var($var,'MAX_ARRAYSZ'); + $min = max(_var($var, 'sbNumDisks', 0), 3); + $max = _var($var, 'MAX_ARRAYSZ'); $echo = []; $echo[] = "
"; - $echo[] = ""; + $echo[] = ""; $echo[] = ""; $echo[] = "
"; return implode($echo); } -function cache_slots($off,$pool,$min,$slots) { +function cache_slots($off, $pool, $min, $slots) +{ global $var, $disks; $off = $off && $min ? ' disabled' : ''; - $fsType = _var($disks[$pool],'fsType','auto'); - $max = ($fsType=='auto' || str_contains($fsType,'btrfs') || str_contains($fsType,'zfs')) ? _var($var,'MAX_CACHESZ') : 1; + $fsType = _var($disks[$pool], 'fsType', 'auto'); + $max = ($fsType == 'auto' || str_contains($fsType, 'btrfs') || str_contains($fsType, 'zfs')) ? _var($var, 'MAX_CACHESZ') : 1; $echo = []; $echo[] = "
"; - $echo[] = ""; + $echo[] = ""; $echo[] = ""; $echo[] = ""; $echo[] = "
"; return implode($echo); } -function update_translation($locale) { - global $docroot,$language; +function update_translation($locale) +{ + global $docroot, $language; $language = []; if ($locale) { $text = "$docroot/languages/$locale/translations.txt"; if (file_exists($text)) { $store = "$docroot/languages/$locale/translations.dot"; - if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); + if (!file_exists($store)) file_put_contents($store, serialize(parse_lang_file($text))); $language = unserialize(file_get_contents($store)); } $text = "$docroot/languages/$locale/main.txt"; if (file_exists($text)) { $store = "$docroot/languages/$locale/main.dot"; - if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); - $language = array_merge($language,unserialize(file_get_contents($store))); + if (!file_exists($store)) file_put_contents($store, serialize(parse_lang_file($text))); + $language = array_merge($language, unserialize(file_get_contents($store))); } } } while (true) { $var = (array)@parse_ini_file("$varroot/var.ini"); - $devs = (array)@parse_ini_file("$varroot/devs.ini",true); - $disks = (array)@parse_ini_file("$varroot/disks.ini",true); - $sec = (array)@parse_ini_file("$varroot/sec.ini",true); + $devs = (array)@parse_ini_file("$varroot/devs.ini", true); + $disks = (array)@parse_ini_file("$varroot/disks.ini", true); + $sec = (array)@parse_ini_file("$varroot/sec.ini", true); $diskio = (array)@parse_ini_file("$varroot/diskload.ini"); // check for language changes - extract(parse_plugin_cfg('dynamix',true)); - if (_var($display,'locale') != $locale_init) { - $locale_init = _var($display,'locale'); + extract(parse_plugin_cfg('dynamix', true)); + if (_var($display, 'locale') != $locale_init) { + $locale_init = _var($display, 'locale'); update_translation($locale_init); } // sort unassigned devices on disk identification - if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('get_model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs); + if (count($devs) > 1) array_multisort(array_column($devs, 'sectors'), SORT_DESC, array_map('get_model', array_column($devs, 'id')), SORT_NATURAL | SORT_FLAG_CASE, array_column($devs, 'device'), $devs); // merge device custom settings - if (file_exists($smartALL)) $var = array_merge($var,parse_ini_file($smartALL)); + if (file_exists($smartALL)) $var = array_merge($var, parse_ini_file($smartALL)); if (file_exists($smartONE)) { - $smarts = parse_ini_file($smartONE,true); + $smarts = parse_ini_file($smartONE, true); foreach ($smarts as $id => $smart) { if (isset($disks)) { foreach ($disks as $key => $disk) { - if (_var($disk,'id')==$id) $disks[$key] = array_merge($disks[$key], $smart); + if (_var($disk, 'id') == $id) $disks[$key] = array_merge($disks[$key], $smart); } } if (isset($devs)) { foreach ($devs as $key => $disk) { - if (_var($disk,'id')==$id) $devs[$key] = array_merge($devs[$key], $smart); + if (_var($disk, 'id') == $id) $devs[$key] = array_merge($devs[$key], $smart); } } } @@ -454,85 +517,94 @@ while (true) { $echo = []; foreach ($disks as $disk) { ${$disk['type']}[$disk['name']] = &$disks[$disk['name']]; - if (in_array($disk['type'],['Data','Cache'])) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType')); + if (in_array($disk['type'], ['Data', 'Cache'])) $crypto |= _var($disk, 'luksState', 0) != 0 || vfs_luks(_var($disk, 'fsType')); } $Flash = &$Flash['flash']; - $pools = array_unique(array_map('prefix',array_keys($Cache))); + $pools = array_unique(array_map('prefix', array_keys($Cache))); $a = 'array_devices'; $echo[$a] = []; - $poolsOnly = (_var($var,'SYS_ARRAY_SLOTS') == 0) ? true : false; - if (_var($var,'fsState')=='Stopped') { + $poolsOnly = (_var($var, 'SYS_ARRAY_SLOTS') == 0) ? true : false; + if (_var($var, 'fsState') == 'Stopped') { if (!$poolsOnly) { foreach ($Parity as $disk) $echo[$a][] = array_offline($disk); $echo[$a][] = ""; foreach ($Data as $disk) $echo[$a][] = array_offline($disk); } - $echo[$a][] = ""._('Slots').":".array_slots().""; + $echo[$a][] = "" . _('Slots') . ":" . array_slots() . ""; } else { if (!$poolsOnly) { - foreach ($Parity as $disk) if ($disk['status']!='DISK_NP_DSBL') $echo[$a][] = array_online($disk); + foreach ($Parity as $disk) if ($disk['status'] != 'DISK_NP_DSBL') $echo[$a][] = array_online($disk); foreach ($Data as $disk) $echo[$a][] = array_online($disk); - if (_var($display,'total') && _var($var,'mdNumDisks',0)>1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'),my_word($var['mdNumDisks'])),true,'disk*'); + if (_var($display, 'total') && _var($var, 'mdNumDisks', 0) > 1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'), my_word($var['mdNumDisks'])), true, 'disk*'); } } $echo[$a] = implode($echo[$a]); $a = 'boot_device'; $echo[$a] = []; - $data = explode(' ',$diskio[_var($Flash,'device')] ?? '0 0'); + $data = explode(' ', $diskio[_var($Flash, 'device')] ?? '0 0 0 0 0'); $flash = &$sec['flash']; - $share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public') - ? " "._('Flash device is set as public share')."
"._('Please change share SMB security')."
"._('Click on **FLASH** above this message')."" - : ""; + $share = (_var($var, 'shareSMBEnabled') == 'yes' && _var($flash, 'export') == 'e' && _var($flash, 'security') == 'public') + ? " " . _('Flash device is set as public share') . "
" . _('Please change share SMB security') . "
" . _('Click on **FLASH** above this message') . "" + : ""; $echo[$a][] = ""; - $echo[$a][] = "".device_info($Flash,true).$share.""; - $echo[$a][] = "".device_desc($Flash).""; + $echo[$a][] = "" . device_info($Flash, true) . $share . ""; + $echo[$a][] = "" . device_desc($Flash) . ""; $echo[$a][] = "*"; - $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,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][] = "" . (_var($data, 4, 0)) . " %"; + $echo[$a][] = "" . my_number(_var($Flash, 'numErrors', 0)) . ""; + $echo[$a][] = fs_info($Flash, true); $echo[$a][] = ""; $echo[$a] = implode($echo[$a]); - $sum = initSum(); $i = 0; + $sum = initSum(); + $i = 0; foreach ($pools as $pool) { - $a = 'pool_device'.$i++; + $a = 'pool_device' . $i++; $echo[$a] = []; - $root = explode($_tilde_,$pool)[0]; - $print = array_filter(array_column($Cache,'name'),function($name) use ($pools,$root,$_tilde_) {$name_root=explode($_tilde_,$name)[0]; return in_array($name,$pools) && strcmp($root,$name_root)==0;}); + $root = explode($_tilde_, $pool)[0]; + $print = array_filter(array_column($Cache, 'name'), function ($name) use ($pools, $root, $_tilde_) { + $name_root = explode($_tilde_, $name)[0]; + return in_array($name, $pools) && strcmp($root, $name_root) == 0; + }); $print = end($print); - if (_var($var,'fsState')=='Stopped') { + if (_var($var, 'fsState') == 'Stopped') { $log = @parse_ini_file($pool_log) ?: []; // used to detect slot changes $off = false; - foreach ($Cache as $disk) if (prefix(_var($disk,'name'))==$pool) { - $echo[$a][] = array_offline($disk,$pool); - $name = _var($disk,'name'); + foreach ($Cache as $disk) if (prefix(_var($disk, 'name')) == $pool) { + $echo[$a][] = array_offline($disk, $pool); + $name = _var($disk, 'name'); // tilde is not allowed in array key - replace it $named = no_tilde($name); - if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id'); + if (isset($log[$named])) $off |= ($log[$named] != _var($disk, 'id')); + elseif ($named) $log[$named] = _var($disk, 'id'); } - $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\""; - $off &= !empty(_var($Cache[$root],'uuid')); - file_put_contents($pool_log,implode("\n",$data)); - $echo[$a][] = ""._('Slots').":".cache_slots($off,$pool,_var($Cache[$pool],'devicesSb'),_var($Cache[$pool],'slots',0)).""; - $zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool); + $data = []; + foreach ($log as $key => $value) $data[] = "$key=\"$value\""; + $off &= !empty(_var($Cache[$root], 'uuid')); + file_put_contents($pool_log, implode("\n", $data)); + $echo[$a][] = "" . _('Slots') . ":" . cache_slots($off, $pool, _var($Cache[$pool], 'devicesSb'), _var($Cache[$pool], 'slots', 0)) . ""; + $zfsPool = strstr(_var($Cache[$pool], 'fsType'), 'zfs') && !isSubpool($pool); if ($zfsPool) { - $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");}); - $current_subpools_list = str_replace("{$pool}{$_tilde_}","", implode(',', $current_subpools)); - $echo[$a][] = ""; + $current_subpools = array_filter($pools, function ($element) use ($pool, $_tilde_) { + return str_contains($element, "{$pool}{$_tilde_}"); + }); + $current_subpools_list = str_replace("{$pool}{$_tilde_}", "", implode(',', $current_subpools)); + $echo[$a][] = ""; } $echo[$a][] = ""; } else { - foreach ($Cache as $disk) if (prefix($disk['name'])==$pool) { - $fstype = str_replace('luks:','',_var($disk,'fsType')); - $echo[$a][] = array_online($disk,$fstype); + foreach ($Cache as $disk) if (prefix($disk['name']) == $pool) { + $fstype = str_replace('luks:', '', _var($disk, 'fsType')); + $echo[$a][] = array_online($disk, $fstype); } - if (strcmp($root,$pool)!=0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; - if (strcmp($pool,$print)==0) { + if (strcmp($root, $pool) != 0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; + if (strcmp($pool, $print) == 0) { delete_file($pool_log); - if (_var($display,'total') && _var($Cache[$root],'devices',0)>1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'),my_word($Cache[$root]['devices'])),false,"$root*"); + if (_var($display, 'total') && _var($Cache[$root], 'devices', 0) > 1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'), my_word($Cache[$root]['devices'])), false, "$root*"); $sum = initSum(); } } @@ -542,37 +614,38 @@ while (true) { $a = 'open_devices'; $echo[$a] = []; foreach ($devs as $disk) { - $dev = _var($disk,'device'); - $data = explode(' ',$diskio[$dev] ?? '0 0 0 0'); + $dev = _var($disk, 'device'); + $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); $disk['type'] = 'New'; - $disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink'; + $disk['color'] = $disk['spundown'] == "0" ? 'blue-on' : 'blue-blink'; $echo[$a][] = ""; - $echo[$a][] = "".device_info($disk,true).""; - $echo[$a][] = "".device_desc($disk).""; - $echo[$a][] = "".my_temp($disk['temp']).""; - $echo[$a][] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; - $echo[$a][] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; - $echo[$a][] = "".my_number(_var($disk,'numErrors',0)).""; + $echo[$a][] = "" . device_info($disk, true) . ""; + $echo[$a][] = "" . device_desc($disk) . ""; + $echo[$a][] = "" . my_temp($disk['temp']) . ""; + $echo[$a][] = "" . my_diskio($data[0]) . "" . my_number(_var($disk, 'numReads', 0)) . ""; + $echo[$a][] = "" . my_diskio($data[1]) . "" . my_number(_var($disk, 'numWrites', 0)) . ""; + $echo[$a][] = "" . (_var($data, 4, 0)) . " %"; + $echo[$a][] = "" . my_number(_var($disk, 'numErrors', 0)) . ""; if (file_exists("/tmp/preclear_stat_$dev")) { $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\:g'"); - if (!str_contains($text,'Total time')) $text = _('Preclear in progress').'... '.$text; - $echo[$a][] = "$text"; + if (!str_contains($text, 'Total time')) $text = _('Preclear in progress') . '... ' . $text; + $echo[$a][] = "$text"; } else { - $echo[$a][] = ""; + $echo[$a][] = ""; } $echo[$a][] = ""; } $echo[$a] = implode($echo[$a]); - $echo['stop'] = _var($var,'fsState')=='Stopped' ? 1 : 0; + $echo['stop'] = _var($var, 'fsState') == 'Stopped' ? 1 : 0; // publish without a timeout for no listeners - publish('devices',json_encode($echo)); - $fs_new = _var($var,'fsState')=='Started' ? 1 : 0; - publish('arraymonitor',$fs_new); + publish('devices', json_encode($echo)); + $fs_new = _var($var, 'fsState') == 'Started' ? 1 : 0; + publish('arraymonitor', $fs_new); // ping the page so we can terminate if nobody is listening ping('mainPingListener'); sleep(1); } -?> +?> \ No newline at end of file diff --git a/emhttp/plugins/dynamix/nchan/disk_load b/emhttp/plugins/dynamix/nchan/disk_load index daf1e1b6bb..005fab30ff 100755 --- a/emhttp/plugins/dynamix/nchan/disk_load +++ b/emhttp/plugins/dynamix/nchan/disk_load @@ -1,30 +1,34 @@ #!/bin/bash ini=/var/local/emhttp/diskload.ini tmp=/var/local/emhttp/diskload.tmp -declare -a reads writes +declare -a reads writes use_time # t = poll interval in seconds t=2 # initialize array values upon first start -stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8}' /proc/diskstats)) +stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8,$13}' /proc/diskstats)) c=0; s=${#stats[@]} -for ((i=0;i>$tmp + util=$((((stats[i+5]-use_time[c])*100)/(t*1000))) + if [ $util -gt 100 ]; then util=100; fi + echo ${stats[i]}=$((reads[c]*512/t)) $((writes[c]*512/t)) ${stats[i+3]} ${stats[i+4]} $util >>$tmp reads[c]=${stats[i+1]} writes[c]=${stats[i+2]} + use_time[c]=${stats[i+5]} ((c++)) done mv -f $tmp $ini From 9f80d4523b4b4d8cccb6f18f14bf8fd0d1b3a5ea Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 17 Sep 2025 15:54:29 +1000 Subject: [PATCH 2/4] Refactor: Simplify and standardize code formatting in `device_list` module --- emhttp/plugins/dynamix/nchan/device_list | 1019 ++++++++++------------ 1 file changed, 475 insertions(+), 544 deletions(-) diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 97663fafaa..f304b1d135 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -21,631 +21,562 @@ $md5_old = $fs_old = -1; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/webGui/include/publish.php"; -extract(parse_plugin_cfg('dynamix', true)); +extract(parse_plugin_cfg('dynamix',true)); // add translations $_SERVER['REQUEST_URI'] = 'main'; -$login_locale = _var($display, 'locale'); +$login_locale = _var($display,'locale'); require_once "$docroot/webGui/include/Translations.php"; // remember current language $locale_init = $locale; -function initSum() -{ - return ['count' => 0, 'temp' => 0, 'power' => 0, 'fsSize' => 0, 'fsUsed' => 0, 'fsFree' => 0, 'ioReads' => 0, 'ioWrites' => 0, 'numReads' => 0, 'numWrites' => 0, 'numErrors' => 0]; +function initSum() { + return ['count'=>0, 'temp'=>0, 'power'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0]; } -function get_model($id) -{ - return substr($id, 0, strrpos($id, '_')); +function get_model($id) { + return substr($id,0,strrpos($id,'_')); } -function my_power($power) -{ - global $display; - $number = _var($display, 'number', '.,'); - return _var($display, 'power') && $power ? number_format($power, $power < 10 ? 2 : 1, $number[0]) . ' ' . _('W') . ' / ' : ''; +function my_power($power) { + global $display; + $number = _var($display,'number','.,'); + return _var($display,'power') && $power ? number_format($power,$power<10?2:1,$number[0]).' '._('W').' / ' : ''; } -function device_info(&$disk, $online) -{ - global $pools, $var; - if (!$online || _var($disk, 'fsStatus') != 'Mounted' || (in_array(_var($disk, 'type'), ['Parity', 'Cache']) && (!in_array(_var($disk, 'name'), $pools) || isSubpool(_var($disk, 'name'))))) { - $view = ""; - } else { - $dir = _var($disk, 'name') == 'flash' ? "/boot" : "/mnt/" . _var($disk, 'name'); - $view = ""; - } - $name = _var($disk, 'name'); - $named = no_tilde($name); - $fancy = _(my_disk(native($name, 1)), 3); - $type = _var($disk, 'type'); - $source = $type == 'Flash' ? $type : 'Device'; - $parity = $type == 'Parity'; - $data = $type == 'Data'; - $pool = $type == 'Cache'; - $action = str_contains(_var($disk, 'color'), 'blink') ? 'up' : 'down'; - switch (_var($disk, 'color')) { - case 'green-on': - $orb = 'circle'; - $color = 'green'; - $help = _('Normal operation, device is active'); - break; - case 'green-blink': - $orb = 'circle'; - $color = 'grey'; - $help = _('Device is in standby mode (spun-down)'); - break; - case 'blue-on': - $orb = 'square'; - $color = 'blue'; - $help = _('New device'); - break; - case 'blue-blink': - $orb = 'square'; - $color = 'grey'; - $help = _('New device, in standby mode (spun-down)'); - break; - case 'yellow-on': - $orb = 'warning'; - $color = 'yellow'; - $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); - break; - case 'yellow-blink': - $orb = 'warning'; - $color = 'grey'; - $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); - break; - case 'red-on': - case 'red-blink': - $orb = 'times'; - $color = 'red'; - $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); - break; - case 'red-off': - $orb = 'times'; - $color = 'red'; - $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); - break; - case 'grey-off': - $orb = 'square'; - $color = 'grey'; - $help = _('Device not present'); - break; - } - $ctrl = ''; - $disk_status = _var($disk, 'status'); - if (_var($var, 'fsState') == 'Started' && $source != 'Flash' && !str_contains($disk_status, '_NP')) { - $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$source','$name','$action')\""; - $help .= "
" . _("Click to spin $action device"); - } - $status = "$help"; +function device_info(&$disk,$online) { + global $pools, $var; + if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) { + $view = ""; + } else { + $dir = _var($disk,'name')=='flash' ? "/boot" : "/mnt/"._var($disk,'name'); + $view = ""; + } + $name = _var($disk,'name'); + $named = no_tilde($name); + $fancy = _(my_disk(native($name,1)),3); + $type = _var($disk,'type'); + $source = $type=='Flash' ? $type : 'Device'; + $parity = $type=='Parity'; + $data = $type=='Data'; + $pool = $type=='Cache'; + $action = str_contains(_var($disk,'color'),'blink') ? 'up' : 'down'; + switch (_var($disk,'color')) { + case 'green-on': $orb = 'circle'; $color = 'green'; $help = _('Normal operation, device is active'); break; + case 'green-blink': $orb = 'circle'; $color = 'grey'; $help = _('Device is in standby mode (spun-down)'); break; + case 'blue-on': $orb = 'square'; $color = 'blue'; $help = _('New device'); break; + case 'blue-blink': $orb = 'square'; $color = 'grey'; $help = _('New device, in standby mode (spun-down)'); break; + case 'yellow-on': $orb = 'warning'; $color = 'yellow'; $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); break; + case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); break; + case 'red-on': + case 'red-blink': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); break; + case 'red-off': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); break; + case 'grey-off': $orb = 'square'; $color = 'grey'; $help = _('Device not present'); break; + } + $ctrl = ''; + $disk_status = _var($disk,'status'); + if (_var($var,'fsState')=='Started' && $source!='Flash' && !str_contains($disk_status,'_NP')) { + $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$source','$name','$action')\""; + $help .= "
"._("Click to spin $action device"); + } + $status = "$help"; - $link = ($parity && $disk_status != 'DISK_NP_DSBL') || (($data || $pool) && $disk_status != 'DISK_NP') || $name == 'flash' || in_array($name, $pools) || $type == 'New' - ? "$fancy" - : $fancy; - return $view . $status . $link; + $link = ($parity && $disk_status!='DISK_NP_DSBL') || (($data || $pool) && $disk_status!='DISK_NP') || $name=='flash' || in_array($name,$pools) || $type=='New' + ? "$fancy" + : $fancy; + return $view.$status.$link; } -function device_desc(&$disk) -{ - global $var; - $size = my_scale(_var($disk, 'sectors', 0) * _var($disk, 'sector_size', 0), $unit, -1); - if (_var($var, 'fsState') == 'Started') { - switch (_var($disk, 'type')) { - case 'Flash': - $type = 'usb'; - break; - case 'Parity': - $type = _var($disk, 'rotational') ? 'disk' : 'nvme'; - break; - case 'Data': - case 'Cache': - $type = _var($disk, 'rotational') ? (_var($disk, 'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; - break; - default: - $type = 'disk'; - break; +function device_desc(&$disk) { + global $var; + $size = my_scale(_var($disk,'sectors',0)*_var($disk,'sector_size',0),$unit,-1); + if (_var($var,'fsState')=='Started') { + switch (_var($disk,'type')) { + case 'Flash': $type = 'usb'; break; + case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break; + case 'Data': + case 'Cache': $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break; + default: $type = 'disk'; break; + } + $log = ""._('Disk Log Information').""; + return $log."".my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + } else { + return my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; } - $log = "" . _('Disk Log Information') . ""; - return $log . "" . my_id(_var($disk, 'id')) . " - $size $unit (" . _var($disk, 'device') . ")"; - } else { - return my_id(_var($disk, 'id')) . " - $size $unit (" . _var($disk, 'device') . ")"; - } } -function assignment(&$disk) -{ - global $var, $devs; - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); +function assignment(&$disk) { + global $var, $devs; + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } -function vfs_luks($fs) -{ - return str_starts_with($fs, 'luks:'); +function vfs_luks($fs) { + return str_starts_with($fs,'luks:'); } -function vfs_type(&$disk, $online = false) -{ - global $disks, $pools, $crypto; - $fsType = _var($disk, 'fsType', ''); - $luks = ''; - if (empty($fsType)) return; - if (vfs_luks($fsType) && $crypto) switch (_var($disk, 'luksState', 0)) { - case 0: - $luks = "" . _('Device to be encrypted') . ""; - break; - case 1: - if ($online) { - $luks = "" . _('Device encrypted and unlocked') . ""; - break; - } - /* fall thru */ - case 2: - $luks = "" . _('Device encrypted') . ""; - break; - case 3: - $luks = "" . _('Device locked: wrong encryption key') . ""; - break; - default: - $luks = "" . _('Device locked: unknown error') . ""; - break; - } - return $luks . str_replace('luks:', '', $fsType); +function vfs_type(&$disk,$online = false) { + global $disks, $pools, $crypto; + $fsType = _var($disk,'fsType',''); + $luks = ''; + if (empty($fsType)) return; + if (vfs_luks($fsType) && $crypto) switch (_var($disk,'luksState',0)) { + case 0: + $luks = ""._('Device to be encrypted').""; + break; + case 1: + if ($online) { + $luks = ""._('Device encrypted and unlocked').""; + break; + } + /* fall thru */ + case 2: + $luks = ""._('Device encrypted').""; + break; + case 3: + $luks = ""._('Device locked: wrong encryption key').""; + break; + default: + $luks = ""._('Device locked: unknown error').""; + break; + } + return $luks.str_replace('luks:','',$fsType); } -function fs_info(&$disk, $online = false) -{ - global $display; - $echo = []; - if (empty(_var($disk, 'fsStatus', ''))) - return ""; - if (_var($disk, 'fsStatus') == 'Mounted') { - $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"; - } else { - $used = _var($disk, 'fsSize', 0) > 0 ? 100 - round(100 * _var($disk, 'fsFree', 0) / $disk['fsSize']) : 0; - $echo[] = "
" . my_scale(_var($disk, 'fsUsed', 0) * 1024, $unit) . " $unit
"; - } - if (_var($display, 'text', 0) < 10 ? _var($display, 'text', 0) % 10 == 0 : _var($display, 'text', 0) % 10 != 0) { - $echo[] = "" . my_scale(_var($disk, 'fsFree', 0) * 1024, $unit) . " $unit"; +function fs_info(&$disk,$online = false) { + global $display; + $echo = []; + if (empty(_var($disk,'fsStatus',''))) + return ""; + if (_var($disk,'fsStatus')=='Mounted') { + $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"; + } else { + $used = _var($disk,'fsSize',0)>0 ? 100-round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; + $echo[] = "
".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit
"; + } + if (_var($display,'text',0)<10 ? _var($display,'text',0)%10==0 : _var($display,'text',0)%10!=0) { + $echo[] = "".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit"; + } else { + $free = _var($disk,'fsSize',0)>0 ? round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; + $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; + } } else { - $free = _var($disk, 'fsSize', 0) > 0 ? round(100 * _var($disk, 'fsFree', 0) / $disk['fsSize']) : 0; - $echo[] = "
" . my_scale(_var($disk, 'fsFree', 0) * 1024, $unit) . " $unit
"; + $echo[] = "".vfs_type($disk,$online).""._(_var($disk,'fsStatus')).""; } - } else { - $echo[] = "" . vfs_type($disk, $online) . "" . _(_var($disk, 'fsStatus')) . ""; - } - return implode($echo); + return implode($echo); } -function my_diskio($data) -{ - return my_scale($data, $unit, 1) . " $unit/s"; +function my_diskio($data) { + return my_scale($data,$unit,1)." $unit/s"; } -function array_offline(&$disk, $pool = '') -{ - global $var, $disks, $display; - $disk['power'] ??= (_var($display, 'power') && _var($disk, 'transport') == 'nvme' ? get_nvme_info(_var($disk, 'device'), 'power') : 0); - $echo = []; - $warning = ''; - $status = ['DISK_INVALID', 'DISK_DSBL_NEW', 'DISK_WRONG']; - $text = "" . _('All existing data on this device will be OVERWRITTEN when array is Started') . ""; - if (_var($disk, 'type') == 'Cache') { - if (!str_contains(_var($disks[$pool], 'state'), 'ERROR:')) { - $_pool = (strpos($pool, '~') !== false) ? substr($pool, 0, strpos($pool, '~')) : $pool; - if (!empty(_var($disks[$_pool], 'uuid'))) { - if (in_array(_var($disk, 'status'), $status) || _var($disk['status']) == 'DISK_NEW') $warning = $text; - } - } - } else { - if (!str_contains(_var($var, 'mdState'), 'ERROR:')) { - if (_var($var, 'mdState') == 'NEW_ARRAY') { - if (_var($disk, 'type') == 'Parity') $warning = $text; - } elseif (_var($var, 'mdState') == 'RECON_DISK') { - if (in_array(_var($disk, 'status'), $status)) $warning = $text; - } elseif (_var($disk['status']) == 'DISK_NEW' && _var($var, 'mdResyncAction') == 'clear') { - $warning = $text; - } +function array_offline(&$disk, $pool='') { + global $var, $disks, $display; + $disk['power'] ??= (_var($display,'power') && _var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); + $echo = []; $warning = ''; + $status = ['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG']; + $text = ""._('All existing data on this device will be OVERWRITTEN when array is Started').""; + if (_var($disk,'type')=='Cache') { + if (!str_contains(_var($disks[$pool],'state'),'ERROR:')) { + $_pool = (strpos($pool, '~') !== false) ? substr($pool, 0, strpos($pool, '~')) : $pool; + if (!empty(_var($disks[$_pool],'uuid'))) { + if (in_array(_var($disk,'status'),$status) || _var($disk['status'])=='DISK_NEW') $warning = $text; + } + } + } else { + if (!str_contains(_var($var,'mdState'),'ERROR:')) { + if (_var($var,'mdState')=='NEW_ARRAY') { + if (_var($disk,'type')=='Parity') $warning = $text; + } elseif (_var($var,'mdState')=='RECON_DISK') { + if (in_array(_var($disk,'status'),$status)) $warning = $text; + } elseif (_var($disk['status'])=='DISK_NEW' && _var($var,'mdResyncAction')=='clear') { + $warning = $text; + } + } } - } - $echo[] = ""; - switch (_var($disk, 'status')) { - case 'DISK_NP': - $echo[] = "" . device_info($disk, false) . ""; - $echo[] = "" . assignment($disk) . ""; + $echo[] = ""; + switch (_var($disk,'status')) { + case 'DISK_NP': + $echo[] = "".device_info($disk,false).""; + $echo[] = "".assignment($disk).""; $echo[] = ""; - break; - case 'DISK_NP_MISSING': - $echo[] = "" . device_info($disk, false) . "
" . _('Missing') . ""; - $echo[] = "" . assignment($disk) . "{$disk['idSb']}"; + break; + case 'DISK_NP_MISSING': + $echo[] = "".device_info($disk,false)."
"._('Missing').""; + $echo[] = "".assignment($disk)."{$disk['idSb']}"; $echo[] = ""; - $echo[] = "" . vfs_type($disk, false) . ""; - $echo[] = ""; - break; - case 'DISK_NP_DSBL': - $echo[] = "" . device_info($disk, false) . ""; - $echo[] = "" . assignment($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, false) . ""; - $echo[] = ""; - break; - case 'DISK_OK': - case 'DISK_DSBL': - case 'DISK_INVALID': - case 'DISK_DSBL_NEW': - case 'DISK_NEW': - $echo[] = "" . device_info($disk, false) . ""; - $echo[] = "" . assignment($disk) . ""; - $echo[] = "" . my_power($disk['power']) . my_temp(_var($disk, 'temp', '*')) . ""; - if ($warning) { + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; + break; + case 'DISK_OK': + case 'DISK_DSBL': + case 'DISK_INVALID': + case 'DISK_DSBL_NEW': + case 'DISK_NEW': + $echo[] = "".device_info($disk,false).""; + $echo[] = "".assignment($disk).""; + $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; + if ($warning) { $echo[] = "$warning"; - } else { + } else { $echo[] = ""; - $echo[] = "" . vfs_type($disk, false) . ""; - $echo[] = ""; - } - break; - case 'DISK_WRONG': - $echo[] = "" . device_info($disk, false) . "
" . _('Wrong') . ""; - $echo[] = "" . assignment($disk) . "{$disk['idSb']}"; - $echo[] = "" . my_temp(_var($disk, 'temp', '*')) . ""; - if ($warning) { + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; + } + break; + case 'DISK_WRONG': + $echo[] = "".device_info($disk,false)."
"._('Wrong').""; + $echo[] = "".assignment($disk)."{$disk['idSb']}"; + $echo[] = "".my_temp(_var($disk,'temp','*')).""; + if ($warning) { $echo[] = "$warning"; - } else { + } else { $echo[] = ""; - $echo[] = "" . vfs_type($disk, false) . ""; - $echo[] = ""; - } - break; - } - $echo[] = ""; - return implode($echo); + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; + } + break; + } + $echo[] = ""; + return implode($echo); } -function array_online(&$disk, $fstype = '') -{ - global $pools, $sum, $diskio; - $disk['power'] ??= (_var($disk, 'transport') == 'nvme' ? get_nvme_info(_var($disk, 'device'), 'power') : 0); - $echo = []; +function array_online(&$disk, $fstype='') { + global $pools, $sum, $diskio; + $disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); + $echo = []; $data = [0, 0, 0]; - if (_var($disk, 'device')) { - $dev = $disk['device']; + if (_var($disk,'device')) { + $dev = $disk['device']; $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); - $sum['ioReads'] += $data[0]; - $sum['ioWrites'] += $data[1]; - } - if (is_numeric(_var($disk, 'temp', '*'))) { - $sum['count']++; - $sum['temp'] += $disk['temp']; - } - $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); - if (isset($disk['fsFree'])) { - $sum['fsSize'] += _var($disk, 'fsSize', 0); - $sum['fsUsed'] += _var($disk, 'fsUsed', 0); - $sum['fsFree'] += _var($disk, 'fsFree', 0); - } - $echo[] = ""; - switch (_var($disk, 'status')) { - case 'DISK_NP': - if (in_array(_var($disk, 'name'), $pools) || $fstype == 'zfs') { - $echo[] = "" . device_info($disk, true) . ""; - $echo[] = "" . ($fstype == 'zfs' ? _('Not present') : _('Not installed')) . ""; + $sum['ioReads'] += $data[0]; + $sum['ioWrites'] += $data[1]; + } + if (is_numeric(_var($disk,'temp','*'))) { + $sum['count']++; + $sum['temp'] += $disk['temp']; + } + $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); + if (isset($disk['fsFree'])) { + $sum['fsSize'] += _var($disk,'fsSize',0); + $sum['fsUsed'] += _var($disk,'fsUsed',0); + $sum['fsFree'] += _var($disk,'fsFree',0); + } + $echo[] = ""; + switch (_var($disk,'status')) { + case 'DISK_NP': + if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') { + $echo[] = "".device_info($disk,true).""; + $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; $echo[] = ""; - $echo[] = fs_info($disk, true); - } - break; - case 'DISK_NP_DSBL': - $echo[] = "" . device_info($disk, true) . ""; - $echo[] = "" . _('Not installed') . ""; - $echo[] = ""; - $echo[] = fs_info($disk, true); - break; - case 'DISK_DSBL': - default: - $echo[] = "" . device_info($disk, true) . ""; - $echo[] = "" . device_desc($disk) . ""; - $echo[] = "" . my_power($disk['power']) . my_temp(_var($disk, 'temp', '*')) . ""; - $echo[] = "" . my_diskio($data[0]) . "" . my_number(_var($disk, 'numReads', 0)) . ""; - $echo[] = "" . my_diskio($data[1]) . "" . my_number(_var($disk, 'numWrites', 0)) . ""; + $echo[] = fs_info($disk,true); + } + break; + case 'DISK_NP_DSBL': + $echo[] = "".device_info($disk,true).""; + $echo[] = ""._('Not installed').""; + $echo[] = ""; + $echo[] = fs_info($disk,true); + break; + case 'DISK_DSBL': + default: + $echo[] = "".device_info($disk,true).""; + $echo[] = "".device_desc($disk).""; + $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; + $echo[] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; + $echo[] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; $echo[] = "" . (_var($data, 4, 0)) . " %"; - $echo[] = "" . my_number(_var($disk, 'numErrors', 0)) . ""; - $echo[] = fs_info($disk, true); - break; - } - $echo[] = ""; - return implode($echo); + $echo[] = "".my_number(_var($disk,'numErrors',0)).""; + $echo[] = fs_info($disk,true); + break; + } + $echo[] = ""; + return implode($echo); } -function show_totals($text, $array, $name) -{ - global $var, $display, $sum, $locale; - $number = _var($display, 'number', '.,'); - $ctrl1 = "onclick=\"toggle_state('Device','$name','down')\""; - $ctrl2 = "onclick=\"toggle_state('Device','$name','up')\""; - $help1 = _('Spin Down') . ' ' . _(ucfirst(substr($name, 0, -1))); - $help2 = _('Spin Up') . ' ' . _(ucfirst(substr($name, 0, -1))); - $echo = []; - $echo[] = ""; - $echo[] = "$help1$help2"; - $echo[] = "$text"; - $echo[] = "" . my_power($sum['power']) . ($sum['count'] > 0 ? my_temp(round($sum['temp'] / $sum['count'])) : '*') . ""; - $echo[] = "" . my_diskio($sum['ioReads']) . "" . my_number($sum['numReads']) . ""; - $echo[] = "" . my_diskio($sum['ioWrites']) . "" . my_number($sum['numWrites']) . ""; +function show_totals($text,$array,$name) { + global $var, $display, $sum, $locale; + $number = _var($display,'number','.,'); + $ctrl1 = "onclick=\"toggle_state('Device','$name','down')\""; + $ctrl2 = "onclick=\"toggle_state('Device','$name','up')\""; + $help1 = _('Spin Down').' '._(ucfirst(substr($name,0,-1))); + $help2 = _('Spin Up').' '._(ucfirst(substr($name,0,-1))); + $echo = []; + $echo[] = ""; + $echo[] = "$help1$help2"; + $echo[] = "$text"; + $echo[] = "".my_power($sum['power']).($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'])) : '*').""; + $echo[] = "".my_diskio($sum['ioReads'])."".my_number($sum['numReads']).""; + $echo[] = "".my_diskio($sum['ioWrites'])."".my_number($sum['numWrites']).""; $echo[] = "-"; - $echo[] = "" . my_number($sum['numErrors']) . ""; - $echo[] = ""; - if ($array && _var($var, 'startMode') == 'Normal') { - $echo[] = "" . my_scale($sum['fsSize'] * 1024, $unit, -1) . " $unit"; - if ($display['text'] % 10 == 0) { - $echo[] = "" . my_scale($sum['fsUsed'] * 1024, $unit) . " $unit"; - } else { - $used = $sum['fsSize'] ? 100 - round(100 * $sum['fsFree'] / $sum['fsSize']) : 0; - $echo[] = "
" . my_scale($sum['fsUsed'] * 1024, $unit) . " $unit
"; - } - if ($display['text'] < 10 ? $display['text'] % 10 == 0 : $display['text'] % 10 != 0) { - $echo[] = "" . my_scale($sum['fsFree'] * 1024, $unit) . " $unit"; + $echo[] = "".my_number($sum['numErrors']).""; + $echo[] = ""; + if ($array && _var($var,'startMode')=='Normal') { + $echo[] = "".my_scale($sum['fsSize']*1024,$unit,-1)." $unit"; + if ($display['text']%10==0) { + $echo[] = "".my_scale($sum['fsUsed']*1024,$unit)." $unit"; + } else { + $used = $sum['fsSize'] ? 100-round(100*$sum['fsFree']/$sum['fsSize']) : 0; + $echo[] = "
".my_scale($sum['fsUsed']*1024,$unit)." $unit
"; + } + if ($display['text']<10 ? $display['text']%10==0 : $display['text']%10!=0) { + $echo[] = "".my_scale($sum['fsFree']*1024,$unit)." $unit"; + } else { + $free = $sum['fsSize'] ? round(100*$sum['fsFree']/$sum['fsSize']) : 0; + $echo[] = "
".my_scale($sum['fsFree']*1024,$unit)." $unit
"; + } } else { - $free = $sum['fsSize'] ? round(100 * $sum['fsFree'] / $sum['fsSize']) : 0; - $echo[] = "
" . my_scale($sum['fsFree'] * 1024, $unit) . " $unit
"; - } - } else { $echo[] = ""; - } - $echo[] = ""; - return implode($echo); + } + $echo[] = ""; + return implode($echo); } -function array_slots() -{ - global $var; - $min = max(_var($var, 'sbNumDisks', 0), 3); - $max = _var($var, 'MAX_ARRAYSZ'); - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); +function array_slots() { + global $var; + $min = max(_var($var,'sbNumDisks',0),3); + $max = _var($var,'MAX_ARRAYSZ'); + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } -function cache_slots($off, $pool, $min, $slots) -{ - global $var, $disks; - $off = $off && $min ? ' disabled' : ''; - $fsType = _var($disks[$pool], 'fsType', 'auto'); - $max = ($fsType == 'auto' || str_contains($fsType, 'btrfs') || str_contains($fsType, 'zfs')) ? _var($var, 'MAX_CACHESZ') : 1; - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); +function cache_slots($off,$pool,$min,$slots) { + global $var, $disks; + $off = $off && $min ? ' disabled' : ''; + $fsType = _var($disks[$pool],'fsType','auto'); + $max = ($fsType=='auto' || str_contains($fsType,'btrfs') || str_contains($fsType,'zfs')) ? _var($var,'MAX_CACHESZ') : 1; + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } -function update_translation($locale) -{ - global $docroot, $language; - $language = []; - if ($locale) { - $text = "$docroot/languages/$locale/translations.txt"; - if (file_exists($text)) { - $store = "$docroot/languages/$locale/translations.dot"; - if (!file_exists($store)) file_put_contents($store, serialize(parse_lang_file($text))); - $language = unserialize(file_get_contents($store)); - } - $text = "$docroot/languages/$locale/main.txt"; - if (file_exists($text)) { - $store = "$docroot/languages/$locale/main.dot"; - if (!file_exists($store)) file_put_contents($store, serialize(parse_lang_file($text))); - $language = array_merge($language, unserialize(file_get_contents($store))); +function update_translation($locale) { + global $docroot,$language; + $language = []; + if ($locale) { + $text = "$docroot/languages/$locale/translations.txt"; + if (file_exists($text)) { + $store = "$docroot/languages/$locale/translations.dot"; + if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); + $language = unserialize(file_get_contents($store)); + } + $text = "$docroot/languages/$locale/main.txt"; + if (file_exists($text)) { + $store = "$docroot/languages/$locale/main.dot"; + if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); + $language = array_merge($language,unserialize(file_get_contents($store))); + } } - } } while (true) { - $var = (array)@parse_ini_file("$varroot/var.ini"); - $devs = (array)@parse_ini_file("$varroot/devs.ini", true); - $disks = (array)@parse_ini_file("$varroot/disks.ini", true); - $sec = (array)@parse_ini_file("$varroot/sec.ini", true); - $diskio = (array)@parse_ini_file("$varroot/diskload.ini"); - // check for language changes - extract(parse_plugin_cfg('dynamix', true)); - if (_var($display, 'locale') != $locale_init) { - $locale_init = _var($display, 'locale'); - update_translation($locale_init); - } - // sort unassigned devices on disk identification - if (count($devs) > 1) array_multisort(array_column($devs, 'sectors'), SORT_DESC, array_map('get_model', array_column($devs, 'id')), SORT_NATURAL | SORT_FLAG_CASE, array_column($devs, 'device'), $devs); + $var = (array)@parse_ini_file("$varroot/var.ini"); + $devs = (array)@parse_ini_file("$varroot/devs.ini",true); + $disks = (array)@parse_ini_file("$varroot/disks.ini",true); + $sec = (array)@parse_ini_file("$varroot/sec.ini",true); + $diskio = (array)@parse_ini_file("$varroot/diskload.ini"); + // check for language changes + extract(parse_plugin_cfg('dynamix',true)); + if (_var($display,'locale') != $locale_init) { + $locale_init = _var($display,'locale'); + update_translation($locale_init); + } + // sort unassigned devices on disk identification + if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('get_model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs); - // merge device custom settings - if (file_exists($smartALL)) $var = array_merge($var, parse_ini_file($smartALL)); - if (file_exists($smartONE)) { - $smarts = parse_ini_file($smartONE, true); - foreach ($smarts as $id => $smart) { - if (isset($disks)) { - foreach ($disks as $key => $disk) { - if (_var($disk, 'id') == $id) $disks[$key] = array_merge($disks[$key], $smart); - } - } - if (isset($devs)) { - foreach ($devs as $key => $disk) { - if (_var($disk, 'id') == $id) $devs[$key] = array_merge($devs[$key], $smart); + // merge device custom settings + if (file_exists($smartALL)) $var = array_merge($var,parse_ini_file($smartALL)); + if (file_exists($smartONE)) { + $smarts = parse_ini_file($smartONE,true); + foreach ($smarts as $id => $smart) { + if (isset($disks)) { + foreach ($disks as $key => $disk) { + if (_var($disk,'id')==$id) $disks[$key] = array_merge($disks[$key], $smart); + } + } + if (isset($devs)) { + foreach ($devs as $key => $disk) { + if (_var($disk,'id')==$id) $devs[$key] = array_merge($devs[$key], $smart); + } + } } - } } - } - - // initialize stuff - $sum = initSum(); - $Parity = $Data = $Cache = $Flash = []; - $crypto = false; - $echo = []; - foreach ($disks as $disk) { - ${$disk['type']}[$disk['name']] = &$disks[$disk['name']]; - if (in_array($disk['type'], ['Data', 'Cache'])) $crypto |= _var($disk, 'luksState', 0) != 0 || vfs_luks(_var($disk, 'fsType')); - } - $Flash = &$Flash['flash']; - $pools = array_unique(array_map('prefix', array_keys($Cache))); - $a = 'array_devices'; - $echo[$a] = []; - $poolsOnly = (_var($var, 'SYS_ARRAY_SLOTS') == 0) ? true : false; - if (_var($var, 'fsState') == 'Stopped') { - if (!$poolsOnly) { - foreach ($Parity as $disk) $echo[$a][] = array_offline($disk); - $echo[$a][] = ""; - foreach ($Data as $disk) $echo[$a][] = array_offline($disk); + // initialize stuff + $sum = initSum(); + $Parity = $Data = $Cache = $Flash = []; + $crypto = false; + $echo = []; + foreach ($disks as $disk) { + ${$disk['type']}[$disk['name']] = &$disks[$disk['name']]; + if (in_array($disk['type'],['Data','Cache'])) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType')); } + $Flash = &$Flash['flash']; + $pools = array_unique(array_map('prefix',array_keys($Cache))); + + $a = 'array_devices'; + $echo[$a] = []; + $poolsOnly = (_var($var,'SYS_ARRAY_SLOTS') == 0) ? true : false; + if (_var($var,'fsState')=='Stopped') { + if (!$poolsOnly) { + foreach ($Parity as $disk) $echo[$a][] = array_offline($disk); + $echo[$a][] = ""; + foreach ($Data as $disk) $echo[$a][] = array_offline($disk); + } $echo[$a][] = "" . _('Slots') . ":" . array_slots() . ""; - } else { - if (!$poolsOnly) { - foreach ($Parity as $disk) if ($disk['status'] != 'DISK_NP_DSBL') $echo[$a][] = array_online($disk); - foreach ($Data as $disk) $echo[$a][] = array_online($disk); - if (_var($display, 'total') && _var($var, 'mdNumDisks', 0) > 1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'), my_word($var['mdNumDisks'])), true, 'disk*'); + } else { + if (!$poolsOnly) { + foreach ($Parity as $disk) if ($disk['status']!='DISK_NP_DSBL') $echo[$a][] = array_online($disk); + foreach ($Data as $disk) $echo[$a][] = array_online($disk); + if (_var($display,'total') && _var($var,'mdNumDisks',0)>1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'),my_word($var['mdNumDisks'])),true,'disk*'); + } } - } - $echo[$a] = implode($echo[$a]); + $echo[$a] = implode($echo[$a]); - $a = 'boot_device'; - $echo[$a] = []; + $a = 'boot_device'; + $echo[$a] = []; $data = explode(' ', $diskio[_var($Flash, 'device')] ?? '0 0 0 0 0'); - $flash = &$sec['flash']; - $share = (_var($var, 'shareSMBEnabled') == 'yes' && _var($flash, 'export') == 'e' && _var($flash, 'security') == 'public') - ? " " . _('Flash device is set as public share') . "
" . _('Please change share SMB security') . "
" . _('Click on **FLASH** above this message') . "" - : ""; - $echo[$a][] = ""; - $echo[$a][] = "" . device_info($Flash, true) . $share . ""; - $echo[$a][] = "" . device_desc($Flash) . ""; - $echo[$a][] = "*"; - $echo[$a][] = "" . my_diskio($data[0]) . "" . my_number(_var($Flash, 'numReads', 0)) . ""; - $echo[$a][] = "" . my_diskio($data[1]) . "" . my_number(_var($Flash, 'numWrites', 0)) . ""; + $flash = &$sec['flash']; + $share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public') + ? " "._('Flash device is set as public share')."
"._('Please change share SMB security')."
"._('Click on **FLASH** above this message')."" + : ""; + $echo[$a][] = ""; + $echo[$a][] = "".device_info($Flash,true).$share.""; + $echo[$a][] = "".device_desc($Flash).""; + $echo[$a][] = "*"; + $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][] = "" . (_var($data, 4, 0)) . " %"; - $echo[$a][] = "" . my_number(_var($Flash, 'numErrors', 0)) . ""; - $echo[$a][] = fs_info($Flash, true); - $echo[$a][] = ""; - $echo[$a] = implode($echo[$a]); + $echo[$a][] = "".my_number(_var($Flash,'numErrors',0)).""; + $echo[$a][] = fs_info($Flash,true); + $echo[$a][] = ""; + $echo[$a] = implode($echo[$a]); - $sum = initSum(); - $i = 0; - foreach ($pools as $pool) { - $a = 'pool_device' . $i++; - $echo[$a] = []; - $root = explode($_tilde_, $pool)[0]; - $print = array_filter(array_column($Cache, 'name'), function ($name) use ($pools, $root, $_tilde_) { - $name_root = explode($_tilde_, $name)[0]; - return in_array($name, $pools) && strcmp($root, $name_root) == 0; - }); - $print = end($print); - if (_var($var, 'fsState') == 'Stopped') { - $log = @parse_ini_file($pool_log) ?: []; // used to detect slot changes - $off = false; - foreach ($Cache as $disk) if (prefix(_var($disk, 'name')) == $pool) { - $echo[$a][] = array_offline($disk, $pool); - $name = _var($disk, 'name'); - // tilde is not allowed in array key - replace it - $named = no_tilde($name); - if (isset($log[$named])) $off |= ($log[$named] != _var($disk, 'id')); - elseif ($named) $log[$named] = _var($disk, 'id'); - } - $data = []; - foreach ($log as $key => $value) $data[] = "$key=\"$value\""; - $off &= !empty(_var($Cache[$root], 'uuid')); - file_put_contents($pool_log, implode("\n", $data)); + $sum = initSum(); $i = 0; + foreach ($pools as $pool) { + $a = 'pool_device'.$i++; + $echo[$a] = []; + $root = explode($_tilde_,$pool)[0]; + $print = array_filter(array_column($Cache,'name'),function($name) use ($pools,$root,$_tilde_) {$name_root=explode($_tilde_,$name)[0]; return in_array($name,$pools) && strcmp($root,$name_root)==0;}); + $print = end($print); + if (_var($var,'fsState')=='Stopped') { + $log = @parse_ini_file($pool_log) ?: []; // used to detect slot changes + $off = false; + foreach ($Cache as $disk) if (prefix(_var($disk,'name'))==$pool) { + $echo[$a][] = array_offline($disk,$pool); + $name = _var($disk,'name'); + // tilde is not allowed in array key - replace it + $named = no_tilde($name); + if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id'); + } + $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\""; + $off &= !empty(_var($Cache[$root],'uuid')); + file_put_contents($pool_log,implode("\n",$data)); $echo[$a][] = "" . _('Slots') . ":" . cache_slots($off, $pool, _var($Cache[$pool], 'devicesSb'), _var($Cache[$pool], 'slots', 0)) . ""; - $zfsPool = strstr(_var($Cache[$pool], 'fsType'), 'zfs') && !isSubpool($pool); - if ($zfsPool) { - $current_subpools = array_filter($pools, function ($element) use ($pool, $_tilde_) { - return str_contains($element, "{$pool}{$_tilde_}"); - }); - $current_subpools_list = str_replace("{$pool}{$_tilde_}", "", implode(',', $current_subpools)); - $echo[$a][] = ""; - } - $echo[$a][] = ""; - } else { - foreach ($Cache as $disk) if (prefix($disk['name']) == $pool) { - $fstype = str_replace('luks:', '', _var($disk, 'fsType')); - $echo[$a][] = array_online($disk, $fstype); - } - if (strcmp($root, $pool) != 0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; - if (strcmp($pool, $print) == 0) { - delete_file($pool_log); - if (_var($display, 'total') && _var($Cache[$root], 'devices', 0) > 1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'), my_word($Cache[$root]['devices'])), false, "$root*"); - $sum = initSum(); - } + $zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool); + if ($zfsPool) { + $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");}); + $current_subpools_list = str_replace("{$pool}{$_tilde_}","", implode(',', $current_subpools)); + $echo[$a][] = ""; + } + $echo[$a][] = ""; + } else { + foreach ($Cache as $disk) if (prefix($disk['name'])==$pool) { + $fstype = str_replace('luks:','',_var($disk,'fsType')); + $echo[$a][] = array_online($disk,$fstype); + } + if (strcmp($root,$pool)!=0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; + if (strcmp($pool,$print)==0) { + delete_file($pool_log); + if (_var($display,'total') && _var($Cache[$root],'devices',0)>1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'),my_word($Cache[$root]['devices'])),false,"$root*"); + $sum = initSum(); + } + } + $echo[$a] = implode($echo[$a]); } - $echo[$a] = implode($echo[$a]); - } - $a = 'open_devices'; - $echo[$a] = []; - foreach ($devs as $disk) { - $dev = _var($disk, 'device'); + $a = 'open_devices'; + $echo[$a] = []; + foreach ($devs as $disk) { + $dev = _var($disk,'device'); $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); - $disk['type'] = 'New'; - $disk['color'] = $disk['spundown'] == "0" ? 'blue-on' : 'blue-blink'; - $echo[$a][] = ""; - $echo[$a][] = "" . device_info($disk, true) . ""; - $echo[$a][] = "" . device_desc($disk) . ""; - $echo[$a][] = "" . my_temp($disk['temp']) . ""; - $echo[$a][] = "" . my_diskio($data[0]) . "" . my_number(_var($disk, 'numReads', 0)) . ""; - $echo[$a][] = "" . my_diskio($data[1]) . "" . my_number(_var($disk, 'numWrites', 0)) . ""; + $disk['type'] = 'New'; + $disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink'; + $echo[$a][] = ""; + $echo[$a][] = "".device_info($disk,true).""; + $echo[$a][] = "".device_desc($disk).""; + $echo[$a][] = "".my_temp($disk['temp']).""; + $echo[$a][] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; + $echo[$a][] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; $echo[$a][] = "" . (_var($data, 4, 0)) . " %"; - $echo[$a][] = "" . my_number(_var($disk, 'numErrors', 0)) . ""; - if (file_exists("/tmp/preclear_stat_$dev")) { - $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\:g'"); - if (!str_contains($text, 'Total time')) $text = _('Preclear in progress') . '... ' . $text; + $echo[$a][] = "".my_number(_var($disk,'numErrors',0)).""; + if (file_exists("/tmp/preclear_stat_$dev")) { + $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\:g'"); + if (!str_contains($text,'Total time')) $text = _('Preclear in progress').'... '.$text; $echo[$a][] = "$text"; - } else { + } else { $echo[$a][] = ""; + } + $echo[$a][] = ""; } - $echo[$a][] = ""; - } - $echo[$a] = implode($echo[$a]); + $echo[$a] = implode($echo[$a]); - $echo['stop'] = _var($var, 'fsState') == 'Stopped' ? 1 : 0; + $echo['stop'] = _var($var,'fsState')=='Stopped' ? 1 : 0; - // publish without a timeout for no listeners - publish('devices', json_encode($echo)); - $fs_new = _var($var, 'fsState') == 'Started' ? 1 : 0; - publish('arraymonitor', $fs_new); + // publish without a timeout for no listeners + publish('devices',json_encode($echo)); + $fs_new = _var($var,'fsState')=='Started' ? 1 : 0; + publish('arraymonitor',$fs_new); - // ping the page so we can terminate if nobody is listening - ping('mainPingListener'); - sleep(1); + // ping the page so we can terminate if nobody is listening + ping('mainPingListener'); + sleep(1); } -?> \ No newline at end of file +?> From 746547f36c182d4f456d4e9758e4dddc7d356197 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 17 Sep 2025 16:19:08 +1000 Subject: [PATCH 3/4] Refactor: Simplify and standardize code formatting in `device_list` module --- emhttp/plugins/dynamix/nchan/device_list | 928 +++++++++++------------ 1 file changed, 464 insertions(+), 464 deletions(-) diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index f304b1d135..886b27392f 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -32,551 +32,551 @@ require_once "$docroot/webGui/include/Translations.php"; $locale_init = $locale; function initSum() { - return ['count'=>0, 'temp'=>0, 'power'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0]; + return ['count'=>0, 'temp'=>0, 'power'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0]; } function get_model($id) { - return substr($id,0,strrpos($id,'_')); + return substr($id,0,strrpos($id,'_')); } function my_power($power) { - global $display; - $number = _var($display,'number','.,'); - return _var($display,'power') && $power ? number_format($power,$power<10?2:1,$number[0]).' '._('W').' / ' : ''; + global $display; + $number = _var($display,'number','.,'); + return _var($display,'power') && $power ? number_format($power,$power<10?2:1,$number[0]).' '._('W').' / ' : ''; } function device_info(&$disk,$online) { - global $pools, $var; - if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) { - $view = ""; - } else { - $dir = _var($disk,'name')=='flash' ? "/boot" : "/mnt/"._var($disk,'name'); - $view = ""; - } - $name = _var($disk,'name'); - $named = no_tilde($name); - $fancy = _(my_disk(native($name,1)),3); - $type = _var($disk,'type'); - $source = $type=='Flash' ? $type : 'Device'; - $parity = $type=='Parity'; - $data = $type=='Data'; - $pool = $type=='Cache'; - $action = str_contains(_var($disk,'color'),'blink') ? 'up' : 'down'; - switch (_var($disk,'color')) { - case 'green-on': $orb = 'circle'; $color = 'green'; $help = _('Normal operation, device is active'); break; - case 'green-blink': $orb = 'circle'; $color = 'grey'; $help = _('Device is in standby mode (spun-down)'); break; - case 'blue-on': $orb = 'square'; $color = 'blue'; $help = _('New device'); break; - case 'blue-blink': $orb = 'square'; $color = 'grey'; $help = _('New device, in standby mode (spun-down)'); break; - case 'yellow-on': $orb = 'warning'; $color = 'yellow'; $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); break; - case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); break; - case 'red-on': - case 'red-blink': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); break; - case 'red-off': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); break; - case 'grey-off': $orb = 'square'; $color = 'grey'; $help = _('Device not present'); break; - } - $ctrl = ''; - $disk_status = _var($disk,'status'); - if (_var($var,'fsState')=='Started' && $source!='Flash' && !str_contains($disk_status,'_NP')) { - $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$source','$name','$action')\""; - $help .= "
"._("Click to spin $action device"); - } - $status = "$help"; + global $pools, $var; + if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) { + $view = ""; + } else { + $dir = _var($disk,'name')=='flash' ? "/boot" : "/mnt/"._var($disk,'name'); + $view = ""; + } + $name = _var($disk,'name'); + $named = no_tilde($name); + $fancy = _(my_disk(native($name,1)),3); + $type = _var($disk,'type'); + $source = $type=='Flash' ? $type : 'Device'; + $parity = $type=='Parity'; + $data = $type=='Data'; + $pool = $type=='Cache'; + $action = str_contains(_var($disk,'color'),'blink') ? 'up' : 'down'; + switch (_var($disk,'color')) { + case 'green-on': $orb = 'circle'; $color = 'green'; $help = _('Normal operation, device is active'); break; + case 'green-blink': $orb = 'circle'; $color = 'grey'; $help = _('Device is in standby mode (spun-down)'); break; + case 'blue-on': $orb = 'square'; $color = 'blue'; $help = _('New device'); break; + case 'blue-blink': $orb = 'square'; $color = 'grey'; $help = _('New device, in standby mode (spun-down)'); break; + case 'yellow-on': $orb = 'warning'; $color = 'yellow'; $help = $pool ? _('Device contents invalid') : ($parity ? _('Parity is invalid') : _('Device contents emulated')); break; + case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $pool ? _('Device contents invalid, in standby mode (spun-down)') : ($parity ? _('Parity is invalid, in standby mode (spun-down)') : _('Device contents emulated, in standby mode (spun-down)')); break; + case 'red-on': + case 'red-blink': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is disabled') : ($parity ? _('Parity device is disabled') : _('Device is disabled, contents emulated')); break; + case 'red-off': $orb = 'times'; $color = 'red'; $help = $pool ? _('Device is missing (disabled)') : ($parity ? _('Parity device is missing') : _('Device is missing (disabled), contents emulated')); break; + case 'grey-off': $orb = 'square'; $color = 'grey'; $help = _('Device not present'); break; + } + $ctrl = ''; + $disk_status = _var($disk,'status'); + if (_var($var,'fsState')=='Started' && $source!='Flash' && !str_contains($disk_status,'_NP')) { + $ctrl = " style='cursor:pointer' onclick=\"toggle_state('$source','$name','$action')\""; + $help .= "
"._("Click to spin $action device"); + } + $status = "$help"; - $link = ($parity && $disk_status!='DISK_NP_DSBL') || (($data || $pool) && $disk_status!='DISK_NP') || $name=='flash' || in_array($name,$pools) || $type=='New' - ? "$fancy" - : $fancy; - return $view.$status.$link; + $link = ($parity && $disk_status!='DISK_NP_DSBL') || (($data || $pool) && $disk_status!='DISK_NP') || $name=='flash' || in_array($name,$pools) || $type=='New' + ? "$fancy" + : $fancy; + return $view.$status.$link; } function device_desc(&$disk) { - global $var; - $size = my_scale(_var($disk,'sectors',0)*_var($disk,'sector_size',0),$unit,-1); - if (_var($var,'fsState')=='Started') { - switch (_var($disk,'type')) { - case 'Flash': $type = 'usb'; break; - case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break; - case 'Data': - case 'Cache': $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break; - default: $type = 'disk'; break; - } - $log = ""._('Disk Log Information').""; - return $log."".my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; - } else { - return my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + global $var; + $size = my_scale(_var($disk,'sectors',0)*_var($disk,'sector_size',0),$unit,-1); + if (_var($var,'fsState')=='Started') { + switch (_var($disk,'type')) { + case 'Flash': $type = 'usb'; break; + case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break; + case 'Data': + case 'Cache': $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break; + default: $type = 'disk'; break; } + $log = ""._('Disk Log Information').""; + return $log."".my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + } else { + return my_id(_var($disk,'id'))." - $size $unit ("._var($disk,'device').")"; + } } function assignment(&$disk) { - global $var, $devs; - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); + global $var, $devs; + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } function vfs_luks($fs) { - return str_starts_with($fs,'luks:'); + return str_starts_with($fs,'luks:'); } function vfs_type(&$disk,$online = false) { - global $disks, $pools, $crypto; - $fsType = _var($disk,'fsType',''); - $luks = ''; - if (empty($fsType)) return; - if (vfs_luks($fsType) && $crypto) switch (_var($disk,'luksState',0)) { - case 0: - $luks = ""._('Device to be encrypted').""; - break; - case 1: - if ($online) { - $luks = ""._('Device encrypted and unlocked').""; - break; - } - /* fall thru */ - case 2: - $luks = ""._('Device encrypted').""; - break; - case 3: - $luks = ""._('Device locked: wrong encryption key').""; - break; - default: - $luks = ""._('Device locked: unknown error').""; - break; - } - return $luks.str_replace('luks:','',$fsType); + global $disks, $pools, $crypto; + $fsType = _var($disk,'fsType',''); + $luks = ''; + if (empty($fsType)) return; + if (vfs_luks($fsType) && $crypto) switch (_var($disk,'luksState',0)) { + case 0: + $luks = ""._('Device to be encrypted').""; + break; + case 1: + if ($online) { + $luks = ""._('Device encrypted and unlocked').""; + break; + } + /* fall thru */ + case 2: + $luks = ""._('Device encrypted').""; + break; + case 3: + $luks = ""._('Device locked: wrong encryption key').""; + break; + default: + $luks = ""._('Device locked: unknown error').""; + break; + } + return $luks.str_replace('luks:','',$fsType); } function fs_info(&$disk,$online = false) { - global $display; - $echo = []; - if (empty(_var($disk,'fsStatus',''))) - return ""; - if (_var($disk,'fsStatus')=='Mounted') { - $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"; - } else { - $used = _var($disk,'fsSize',0)>0 ? 100-round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; - $echo[] = "
".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit
"; - } - if (_var($display,'text',0)<10 ? _var($display,'text',0)%10==0 : _var($display,'text',0)%10!=0) { - $echo[] = "".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit"; - } else { - $free = _var($disk,'fsSize',0)>0 ? round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; - $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; - } + global $display; + $echo = []; + if (empty(_var($disk,'fsStatus',''))) + return ""; + if (_var($disk,'fsStatus')=='Mounted') { + $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"; } else { - $echo[] = "".vfs_type($disk,$online).""._(_var($disk,'fsStatus')).""; + $used = _var($disk,'fsSize',0)>0 ? 100-round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; + $echo[] = "
".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit
"; } - return implode($echo); + if (_var($display,'text',0)<10 ? _var($display,'text',0)%10==0 : _var($display,'text',0)%10!=0) { + $echo[] = "".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit"; + } else { + $free = _var($disk,'fsSize',0)>0 ? round(100*_var($disk,'fsFree',0)/$disk['fsSize']) : 0; + $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; + } + } else { + $echo[] = "".vfs_type($disk,$online).""._(_var($disk,'fsStatus')).""; + } + return implode($echo); } function my_diskio($data) { - return my_scale($data,$unit,1)." $unit/s"; + return my_scale($data,$unit,1)." $unit/s"; } function array_offline(&$disk, $pool='') { - global $var, $disks, $display; - $disk['power'] ??= (_var($display,'power') && _var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); - $echo = []; $warning = ''; - $status = ['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG']; - $text = ""._('All existing data on this device will be OVERWRITTEN when array is Started').""; - if (_var($disk,'type')=='Cache') { - if (!str_contains(_var($disks[$pool],'state'),'ERROR:')) { - $_pool = (strpos($pool, '~') !== false) ? substr($pool, 0, strpos($pool, '~')) : $pool; - if (!empty(_var($disks[$_pool],'uuid'))) { - if (in_array(_var($disk,'status'),$status) || _var($disk['status'])=='DISK_NEW') $warning = $text; - } - } + global $var, $disks, $display; + $disk['power'] ??= (_var($display,'power') && _var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); + $echo = []; $warning = ''; + $status = ['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG']; + $text = ""._('All existing data on this device will be OVERWRITTEN when array is Started').""; + if (_var($disk,'type')=='Cache') { + if (!str_contains(_var($disks[$pool],'state'),'ERROR:')) { + $_pool = (strpos($pool, '~') !== false) ? substr($pool, 0, strpos($pool, '~')) : $pool; + if (!empty(_var($disks[$_pool],'uuid'))) { + if (in_array(_var($disk,'status'),$status) || _var($disk['status'])=='DISK_NEW') $warning = $text; + } + } + } else { + if (!str_contains(_var($var,'mdState'),'ERROR:')) { + if (_var($var,'mdState')=='NEW_ARRAY') { + if (_var($disk,'type')=='Parity') $warning = $text; + } elseif (_var($var,'mdState')=='RECON_DISK') { + if (in_array(_var($disk,'status'),$status)) $warning = $text; + } elseif (_var($disk['status'])=='DISK_NEW' && _var($var,'mdResyncAction')=='clear') { + $warning = $text; + } + } + } + $echo[] = ""; + switch (_var($disk,'status')) { + case 'DISK_NP': + $echo[] = "".device_info($disk,false).""; + $echo[] = "".assignment($disk).""; + $echo[] = ""; + break; + case 'DISK_NP_MISSING': + $echo[] = "".device_info($disk,false)."
"._('Missing').""; + $echo[] = "".assignment($disk)."{$disk['idSb']}"; + $echo[] = ""; + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; + break; + case 'DISK_NP_DSBL': + $echo[] = "".device_info($disk,false).""; + $echo[] = "".assignment($disk).""; + $echo[] = ""; + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; + break; + case 'DISK_OK': + case 'DISK_DSBL': + case 'DISK_INVALID': + case 'DISK_DSBL_NEW': + case 'DISK_NEW': + $echo[] = "".device_info($disk,false).""; + $echo[] = "".assignment($disk).""; + $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; + if ($warning) { + $echo[] = "$warning"; } else { - if (!str_contains(_var($var,'mdState'),'ERROR:')) { - if (_var($var,'mdState')=='NEW_ARRAY') { - if (_var($disk,'type')=='Parity') $warning = $text; - } elseif (_var($var,'mdState')=='RECON_DISK') { - if (in_array(_var($disk,'status'),$status)) $warning = $text; - } elseif (_var($disk['status'])=='DISK_NEW' && _var($var,'mdResyncAction')=='clear') { - $warning = $text; - } - } + $echo[] = ""; + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; } - $echo[] = ""; - switch (_var($disk,'status')) { - case 'DISK_NP': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = ""; - break; - case 'DISK_NP_MISSING': - $echo[] = "".device_info($disk,false)."
"._('Missing').""; - $echo[] = "".assignment($disk)."{$disk['idSb']}"; - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - break; - case 'DISK_NP_DSBL': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - break; - case 'DISK_OK': - case 'DISK_DSBL': - case 'DISK_INVALID': - case 'DISK_DSBL_NEW': - case 'DISK_NEW': - $echo[] = "".device_info($disk,false).""; - $echo[] = "".assignment($disk).""; - $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; - if ($warning) { - $echo[] = "$warning"; - } else { - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - } - break; - case 'DISK_WRONG': - $echo[] = "".device_info($disk,false)."
"._('Wrong').""; - $echo[] = "".assignment($disk)."{$disk['idSb']}"; - $echo[] = "".my_temp(_var($disk,'temp','*')).""; - if ($warning) { - $echo[] = "$warning"; - } else { - $echo[] = ""; - $echo[] = "".vfs_type($disk,false).""; - $echo[] = ""; - } - break; + break; + case 'DISK_WRONG': + $echo[] = "".device_info($disk,false)."
"._('Wrong').""; + $echo[] = "".assignment($disk)."{$disk['idSb']}"; + $echo[] = "".my_temp(_var($disk,'temp','*')).""; + if ($warning) { + $echo[] = "$warning"; + } else { + $echo[] = ""; + $echo[] = "".vfs_type($disk,false).""; + $echo[] = ""; } - $echo[] = ""; - return implode($echo); + break; + } + $echo[] = ""; + return implode($echo); } function array_online(&$disk, $fstype='') { - global $pools, $sum, $diskio; - $disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); - $echo = []; + global $pools, $sum, $diskio; + $disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); + $echo = []; $data = [0, 0, 0]; - if (_var($disk,'device')) { - $dev = $disk['device']; + if (_var($disk,'device')) { + $dev = $disk['device']; $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); - $sum['ioReads'] += $data[0]; - $sum['ioWrites'] += $data[1]; - } - if (is_numeric(_var($disk,'temp','*'))) { - $sum['count']++; - $sum['temp'] += $disk['temp']; - } - $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); - if (isset($disk['fsFree'])) { - $sum['fsSize'] += _var($disk,'fsSize',0); - $sum['fsUsed'] += _var($disk,'fsUsed',0); - $sum['fsFree'] += _var($disk,'fsFree',0); - } - $echo[] = ""; - switch (_var($disk,'status')) { - case 'DISK_NP': - if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') { - $echo[] = "".device_info($disk,true).""; - $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; - $echo[] = ""; - $echo[] = fs_info($disk,true); - } - break; - case 'DISK_NP_DSBL': - $echo[] = "".device_info($disk,true).""; - $echo[] = ""._('Not installed').""; - $echo[] = ""; - $echo[] = fs_info($disk,true); - break; - case 'DISK_DSBL': - default: - $echo[] = "".device_info($disk,true).""; - $echo[] = "".device_desc($disk).""; - $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; - $echo[] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; - $echo[] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; - $echo[] = "" . (_var($data, 4, 0)) . " %"; - $echo[] = "".my_number(_var($disk,'numErrors',0)).""; - $echo[] = fs_info($disk,true); - break; + $sum['ioReads'] += $data[0]; + $sum['ioWrites'] += $data[1]; + } + if (is_numeric(_var($disk,'temp','*'))) { + $sum['count']++; + $sum['temp'] += $disk['temp']; + } + $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); + if (isset($disk['fsFree'])) { + $sum['fsSize'] += _var($disk,'fsSize',0); + $sum['fsUsed'] += _var($disk,'fsUsed',0); + $sum['fsFree'] += _var($disk,'fsFree',0); + } + $echo[] = ""; + switch (_var($disk,'status')) { + case 'DISK_NP': + if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') { + $echo[] = "".device_info($disk,true).""; + $echo[] = "".($fstype=='zfs' ? _('Not present') : _('Not installed')).""; + $echo[] = ""; + $echo[] = fs_info($disk,true); } - $echo[] = ""; - return implode($echo); + break; + case 'DISK_NP_DSBL': + $echo[] = "".device_info($disk,true).""; + $echo[] = ""._('Not installed').""; + $echo[] = ""; + $echo[] = fs_info($disk,true); + break; + case 'DISK_DSBL': + default: + $echo[] = "".device_info($disk,true).""; + $echo[] = "".device_desc($disk).""; + $echo[] = "".my_power($disk['power']).my_temp(_var($disk,'temp','*')).""; + $echo[] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; + $echo[] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; + $echo[] = "" . (_var($data, 4, 0)) . " %"; + $echo[] = "".my_number(_var($disk,'numErrors',0)).""; + $echo[] = fs_info($disk,true); + break; + } + $echo[] = ""; + return implode($echo); } function show_totals($text,$array,$name) { - global $var, $display, $sum, $locale; - $number = _var($display,'number','.,'); - $ctrl1 = "onclick=\"toggle_state('Device','$name','down')\""; - $ctrl2 = "onclick=\"toggle_state('Device','$name','up')\""; - $help1 = _('Spin Down').' '._(ucfirst(substr($name,0,-1))); - $help2 = _('Spin Up').' '._(ucfirst(substr($name,0,-1))); - $echo = []; - $echo[] = ""; - $echo[] = "$help1$help2"; - $echo[] = "$text"; - $echo[] = "".my_power($sum['power']).($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'])) : '*').""; - $echo[] = "".my_diskio($sum['ioReads'])."".my_number($sum['numReads']).""; - $echo[] = "".my_diskio($sum['ioWrites'])."".my_number($sum['numWrites']).""; + global $var, $display, $sum, $locale; + $number = _var($display,'number','.,'); + $ctrl1 = "onclick=\"toggle_state('Device','$name','down')\""; + $ctrl2 = "onclick=\"toggle_state('Device','$name','up')\""; + $help1 = _('Spin Down').' '._(ucfirst(substr($name,0,-1))); + $help2 = _('Spin Up').' '._(ucfirst(substr($name,0,-1))); + $echo = []; + $echo[] = ""; + $echo[] = "$help1$help2"; + $echo[] = "$text"; + $echo[] = "".my_power($sum['power']).($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'])) : '*').""; + $echo[] = "".my_diskio($sum['ioReads'])."".my_number($sum['numReads']).""; + $echo[] = "".my_diskio($sum['ioWrites'])."".my_number($sum['numWrites']).""; $echo[] = "-"; - $echo[] = "".my_number($sum['numErrors']).""; - $echo[] = ""; - if ($array && _var($var,'startMode')=='Normal') { - $echo[] = "".my_scale($sum['fsSize']*1024,$unit,-1)." $unit"; - if ($display['text']%10==0) { - $echo[] = "".my_scale($sum['fsUsed']*1024,$unit)." $unit"; - } else { - $used = $sum['fsSize'] ? 100-round(100*$sum['fsFree']/$sum['fsSize']) : 0; - $echo[] = "
".my_scale($sum['fsUsed']*1024,$unit)." $unit
"; - } - if ($display['text']<10 ? $display['text']%10==0 : $display['text']%10!=0) { - $echo[] = "".my_scale($sum['fsFree']*1024,$unit)." $unit"; - } else { - $free = $sum['fsSize'] ? round(100*$sum['fsFree']/$sum['fsSize']) : 0; - $echo[] = "
".my_scale($sum['fsFree']*1024,$unit)." $unit
"; - } + $echo[] = "".my_number($sum['numErrors']).""; + $echo[] = ""; + if ($array && _var($var,'startMode')=='Normal') { + $echo[] = "".my_scale($sum['fsSize']*1024,$unit,-1)." $unit"; + if ($display['text']%10==0) { + $echo[] = "".my_scale($sum['fsUsed']*1024,$unit)." $unit"; } else { - $echo[] = ""; + $used = $sum['fsSize'] ? 100-round(100*$sum['fsFree']/$sum['fsSize']) : 0; + $echo[] = "
".my_scale($sum['fsUsed']*1024,$unit)." $unit
"; + } + if ($display['text']<10 ? $display['text']%10==0 : $display['text']%10!=0) { + $echo[] = "".my_scale($sum['fsFree']*1024,$unit)." $unit"; + } else { + $free = $sum['fsSize'] ? round(100*$sum['fsFree']/$sum['fsSize']) : 0; + $echo[] = "
".my_scale($sum['fsFree']*1024,$unit)." $unit
"; } - $echo[] = ""; - return implode($echo); + } else { + $echo[] = ""; + } + $echo[] = ""; + return implode($echo); } function array_slots() { - global $var; - $min = max(_var($var,'sbNumDisks',0),3); - $max = _var($var,'MAX_ARRAYSZ'); - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); + global $var; + $min = max(_var($var,'sbNumDisks',0),3); + $max = _var($var,'MAX_ARRAYSZ'); + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } function cache_slots($off,$pool,$min,$slots) { - global $var, $disks; - $off = $off && $min ? ' disabled' : ''; - $fsType = _var($disks[$pool],'fsType','auto'); - $max = ($fsType=='auto' || str_contains($fsType,'btrfs') || str_contains($fsType,'zfs')) ? _var($var,'MAX_CACHESZ') : 1; - $echo = []; - $echo[] = "
"; - $echo[] = ""; - $echo[] = ""; - $echo[] = ""; - $echo[] = "
"; - return implode($echo); + global $var, $disks; + $off = $off && $min ? ' disabled' : ''; + $fsType = _var($disks[$pool],'fsType','auto'); + $max = ($fsType=='auto' || str_contains($fsType,'btrfs') || str_contains($fsType,'zfs')) ? _var($var,'MAX_CACHESZ') : 1; + $echo = []; + $echo[] = "
"; + $echo[] = ""; + $echo[] = ""; + $echo[] = ""; + $echo[] = "
"; + return implode($echo); } function update_translation($locale) { - global $docroot,$language; - $language = []; - if ($locale) { - $text = "$docroot/languages/$locale/translations.txt"; - if (file_exists($text)) { - $store = "$docroot/languages/$locale/translations.dot"; - if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); - $language = unserialize(file_get_contents($store)); - } - $text = "$docroot/languages/$locale/main.txt"; - if (file_exists($text)) { - $store = "$docroot/languages/$locale/main.dot"; - if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); - $language = array_merge($language,unserialize(file_get_contents($store))); - } + global $docroot,$language; + $language = []; + if ($locale) { + $text = "$docroot/languages/$locale/translations.txt"; + if (file_exists($text)) { + $store = "$docroot/languages/$locale/translations.dot"; + if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); + $language = unserialize(file_get_contents($store)); + } + $text = "$docroot/languages/$locale/main.txt"; + if (file_exists($text)) { + $store = "$docroot/languages/$locale/main.dot"; + if (!file_exists($store)) file_put_contents($store,serialize(parse_lang_file($text))); + $language = array_merge($language,unserialize(file_get_contents($store))); } + } } while (true) { - $var = (array)@parse_ini_file("$varroot/var.ini"); - $devs = (array)@parse_ini_file("$varroot/devs.ini",true); - $disks = (array)@parse_ini_file("$varroot/disks.ini",true); - $sec = (array)@parse_ini_file("$varroot/sec.ini",true); - $diskio = (array)@parse_ini_file("$varroot/diskload.ini"); - // check for language changes - extract(parse_plugin_cfg('dynamix',true)); - if (_var($display,'locale') != $locale_init) { - $locale_init = _var($display,'locale'); - update_translation($locale_init); - } - // sort unassigned devices on disk identification - if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('get_model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs); + $var = (array)@parse_ini_file("$varroot/var.ini"); + $devs = (array)@parse_ini_file("$varroot/devs.ini",true); + $disks = (array)@parse_ini_file("$varroot/disks.ini",true); + $sec = (array)@parse_ini_file("$varroot/sec.ini",true); + $diskio = (array)@parse_ini_file("$varroot/diskload.ini"); + // check for language changes + extract(parse_plugin_cfg('dynamix',true)); + if (_var($display,'locale') != $locale_init) { + $locale_init = _var($display,'locale'); + update_translation($locale_init); + } + // sort unassigned devices on disk identification + if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('get_model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs); - // merge device custom settings - if (file_exists($smartALL)) $var = array_merge($var,parse_ini_file($smartALL)); - if (file_exists($smartONE)) { - $smarts = parse_ini_file($smartONE,true); - foreach ($smarts as $id => $smart) { - if (isset($disks)) { - foreach ($disks as $key => $disk) { - if (_var($disk,'id')==$id) $disks[$key] = array_merge($disks[$key], $smart); - } - } - if (isset($devs)) { - foreach ($devs as $key => $disk) { - if (_var($disk,'id')==$id) $devs[$key] = array_merge($devs[$key], $smart); - } - } + // merge device custom settings + if (file_exists($smartALL)) $var = array_merge($var,parse_ini_file($smartALL)); + if (file_exists($smartONE)) { + $smarts = parse_ini_file($smartONE,true); + foreach ($smarts as $id => $smart) { + if (isset($disks)) { + foreach ($disks as $key => $disk) { + if (_var($disk,'id')==$id) $disks[$key] = array_merge($disks[$key], $smart); + } + } + if (isset($devs)) { + foreach ($devs as $key => $disk) { + if (_var($disk,'id')==$id) $devs[$key] = array_merge($devs[$key], $smart); } + } } + } - // initialize stuff - $sum = initSum(); - $Parity = $Data = $Cache = $Flash = []; - $crypto = false; - $echo = []; - foreach ($disks as $disk) { - ${$disk['type']}[$disk['name']] = &$disks[$disk['name']]; - if (in_array($disk['type'],['Data','Cache'])) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType')); + // initialize stuff + $sum = initSum(); + $Parity = $Data = $Cache = $Flash = []; + $crypto = false; + $echo = []; + foreach ($disks as $disk) { + ${$disk['type']}[$disk['name']] = &$disks[$disk['name']]; + if (in_array($disk['type'],['Data','Cache'])) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType')); + } + $Flash = &$Flash['flash']; + $pools = array_unique(array_map('prefix',array_keys($Cache))); + + $a = 'array_devices'; + $echo[$a] = []; + $poolsOnly = (_var($var,'SYS_ARRAY_SLOTS') == 0) ? true : false; + if (_var($var,'fsState')=='Stopped') { + if (!$poolsOnly) { + foreach ($Parity as $disk) $echo[$a][] = array_offline($disk); + $echo[$a][] = ""; + foreach ($Data as $disk) $echo[$a][] = array_offline($disk); + } + $echo[$a][] = ""._('Slots').":".array_slots().""; + } else { + if (!$poolsOnly) { + foreach ($Parity as $disk) if ($disk['status']!='DISK_NP_DSBL') $echo[$a][] = array_online($disk); + foreach ($Data as $disk) $echo[$a][] = array_online($disk); + if (_var($display,'total') && _var($var,'mdNumDisks',0)>1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'),my_word($var['mdNumDisks'])),true,'disk*'); } - $Flash = &$Flash['flash']; - $pools = array_unique(array_map('prefix',array_keys($Cache))); + } + $echo[$a] = implode($echo[$a]); + + $a = 'boot_device'; + $echo[$a] = []; + $data = explode(' ', $diskio[_var($Flash, 'device')] ?? '0 0 0 0 0'); + $flash = &$sec['flash']; + $share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public') + ? " "._('Flash device is set as public share')."
"._('Please change share SMB security')."
"._('Click on **FLASH** above this message')."" + : ""; + $echo[$a][] = ""; + $echo[$a][] = "".device_info($Flash,true).$share.""; + $echo[$a][] = "".device_desc($Flash).""; + $echo[$a][] = "*"; + $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][] = "" . (_var($data, 4, 0)) . " %"; + $echo[$a][] = "".my_number(_var($Flash,'numErrors',0)).""; + $echo[$a][] = fs_info($Flash,true); + $echo[$a][] = ""; + $echo[$a] = implode($echo[$a]); - $a = 'array_devices'; + $sum = initSum(); $i = 0; + foreach ($pools as $pool) { + $a = 'pool_device'.$i++; $echo[$a] = []; - $poolsOnly = (_var($var,'SYS_ARRAY_SLOTS') == 0) ? true : false; + $root = explode($_tilde_,$pool)[0]; + $print = array_filter(array_column($Cache,'name'),function($name) use ($pools,$root,$_tilde_) {$name_root=explode($_tilde_,$name)[0]; return in_array($name,$pools) && strcmp($root,$name_root)==0;}); + $print = end($print); if (_var($var,'fsState')=='Stopped') { - if (!$poolsOnly) { - foreach ($Parity as $disk) $echo[$a][] = array_offline($disk); - $echo[$a][] = ""; - foreach ($Data as $disk) $echo[$a][] = array_offline($disk); - } - $echo[$a][] = "" . _('Slots') . ":" . array_slots() . ""; + $log = @parse_ini_file($pool_log) ?: []; // used to detect slot changes + $off = false; + foreach ($Cache as $disk) if (prefix(_var($disk,'name'))==$pool) { + $echo[$a][] = array_offline($disk,$pool); + $name = _var($disk,'name'); + // tilde is not allowed in array key - replace it + $named = no_tilde($name); + if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id'); + } + $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\""; + $off &= !empty(_var($Cache[$root],'uuid')); + file_put_contents($pool_log,implode("\n",$data)); + $echo[$a][] = "" . _('Slots') . ":" . cache_slots($off, $pool, _var($Cache[$pool], 'devicesSb'), _var($Cache[$pool], 'slots', 0)) . ""; + $zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool); + if ($zfsPool) { + $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");}); + $current_subpools_list = str_replace("{$pool}{$_tilde_}","", implode(',', $current_subpools)); + $echo[$a][] = ""; + } + $echo[$a][] = ""; } else { - if (!$poolsOnly) { - foreach ($Parity as $disk) if ($disk['status']!='DISK_NP_DSBL') $echo[$a][] = array_online($disk); - foreach ($Data as $disk) $echo[$a][] = array_online($disk); - if (_var($display,'total') && _var($var,'mdNumDisks',0)>1) $echo[$a][] = show_totals(sprintf(_('Array of %s devices'),my_word($var['mdNumDisks'])),true,'disk*'); - } + foreach ($Cache as $disk) if (prefix($disk['name'])==$pool) { + $fstype = str_replace('luks:','',_var($disk,'fsType')); + $echo[$a][] = array_online($disk,$fstype); + } + if (strcmp($root,$pool)!=0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; + if (strcmp($pool,$print)==0) { + delete_file($pool_log); + if (_var($display,'total') && _var($Cache[$root],'devices',0)>1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'),my_word($Cache[$root]['devices'])),false,"$root*"); + $sum = initSum(); + } } $echo[$a] = implode($echo[$a]); + } - $a = 'boot_device'; - $echo[$a] = []; - $data = explode(' ', $diskio[_var($Flash, 'device')] ?? '0 0 0 0 0'); - $flash = &$sec['flash']; - $share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public') - ? " "._('Flash device is set as public share')."
"._('Please change share SMB security')."
"._('Click on **FLASH** above this message')."" - : ""; - $echo[$a][] = ""; - $echo[$a][] = "".device_info($Flash,true).$share.""; - $echo[$a][] = "".device_desc($Flash).""; - $echo[$a][] = "*"; - $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][] = "" . (_var($data, 4, 0)) . " %"; - $echo[$a][] = "".my_number(_var($Flash,'numErrors',0)).""; - $echo[$a][] = fs_info($Flash,true); - $echo[$a][] = ""; - $echo[$a] = implode($echo[$a]); - - $sum = initSum(); $i = 0; - foreach ($pools as $pool) { - $a = 'pool_device'.$i++; - $echo[$a] = []; - $root = explode($_tilde_,$pool)[0]; - $print = array_filter(array_column($Cache,'name'),function($name) use ($pools,$root,$_tilde_) {$name_root=explode($_tilde_,$name)[0]; return in_array($name,$pools) && strcmp($root,$name_root)==0;}); - $print = end($print); - if (_var($var,'fsState')=='Stopped') { - $log = @parse_ini_file($pool_log) ?: []; // used to detect slot changes - $off = false; - foreach ($Cache as $disk) if (prefix(_var($disk,'name'))==$pool) { - $echo[$a][] = array_offline($disk,$pool); - $name = _var($disk,'name'); - // tilde is not allowed in array key - replace it - $named = no_tilde($name); - if (isset($log[$named])) $off |= ($log[$named] != _var($disk,'id')); elseif ($named) $log[$named] = _var($disk,'id'); - } - $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\""; - $off &= !empty(_var($Cache[$root],'uuid')); - file_put_contents($pool_log,implode("\n",$data)); - $echo[$a][] = "" . _('Slots') . ":" . cache_slots($off, $pool, _var($Cache[$pool], 'devicesSb'), _var($Cache[$pool], 'slots', 0)) . ""; - $zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool); - if ($zfsPool) { - $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");}); - $current_subpools_list = str_replace("{$pool}{$_tilde_}","", implode(',', $current_subpools)); - $echo[$a][] = ""; - } - $echo[$a][] = ""; - } else { - foreach ($Cache as $disk) if (prefix($disk['name'])==$pool) { - $fstype = str_replace('luks:','',_var($disk,'fsType')); - $echo[$a][] = array_online($disk,$fstype); - } - if (strcmp($root,$pool)!=0) $Cache[$root]['devices'] += $Cache[$pool]['devices']; - if (strcmp($pool,$print)==0) { - delete_file($pool_log); - if (_var($display,'total') && _var($Cache[$root],'devices',0)>1) $echo[$a][] = show_totals(sprintf(_('Pool of %s devices'),my_word($Cache[$root]['devices'])),false,"$root*"); - $sum = initSum(); - } - } - $echo[$a] = implode($echo[$a]); - } - - $a = 'open_devices'; - $echo[$a] = []; - foreach ($devs as $disk) { - $dev = _var($disk,'device'); + $a = 'open_devices'; + $echo[$a] = []; + foreach ($devs as $disk) { + $dev = _var($disk,'device'); $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); - $disk['type'] = 'New'; - $disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink'; - $echo[$a][] = ""; - $echo[$a][] = "".device_info($disk,true).""; - $echo[$a][] = "".device_desc($disk).""; - $echo[$a][] = "".my_temp($disk['temp']).""; - $echo[$a][] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; - $echo[$a][] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; + $disk['type'] = 'New'; + $disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink'; + $echo[$a][] = ""; + $echo[$a][] = "".device_info($disk,true).""; + $echo[$a][] = "".device_desc($disk).""; + $echo[$a][] = "".my_temp($disk['temp']).""; + $echo[$a][] = "".my_diskio($data[0])."".my_number(_var($disk,'numReads',0)).""; + $echo[$a][] = "".my_diskio($data[1])."".my_number(_var($disk,'numWrites',0)).""; $echo[$a][] = "" . (_var($data, 4, 0)) . " %"; - $echo[$a][] = "".my_number(_var($disk,'numErrors',0)).""; - if (file_exists("/tmp/preclear_stat_$dev")) { - $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\:g'"); - if (!str_contains($text,'Total time')) $text = _('Preclear in progress').'... '.$text; + $echo[$a][] = "".my_number(_var($disk,'numErrors',0)).""; + if (file_exists("/tmp/preclear_stat_$dev")) { + $text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\:g'"); + if (!str_contains($text,'Total time')) $text = _('Preclear in progress').'... '.$text; $echo[$a][] = "$text"; - } else { + } else { $echo[$a][] = ""; - } - $echo[$a][] = ""; } - $echo[$a] = implode($echo[$a]); + $echo[$a][] = ""; + } + $echo[$a] = implode($echo[$a]); - $echo['stop'] = _var($var,'fsState')=='Stopped' ? 1 : 0; + $echo['stop'] = _var($var,'fsState')=='Stopped' ? 1 : 0; - // publish without a timeout for no listeners - publish('devices',json_encode($echo)); - $fs_new = _var($var,'fsState')=='Started' ? 1 : 0; - publish('arraymonitor',$fs_new); + // publish without a timeout for no listeners + publish('devices',json_encode($echo)); + $fs_new = _var($var,'fsState')=='Started' ? 1 : 0; + publish('arraymonitor',$fs_new); - // ping the page so we can terminate if nobody is listening - ping('mainPingListener'); - sleep(1); + // ping the page so we can terminate if nobody is listening + ping('mainPingListener'); + sleep(1); } ?> From 190c0f657d7de90e35325c8a686afb3c4a229637 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 17 Sep 2025 16:23:46 +1000 Subject: [PATCH 4/4] Refactor: Simplify and standardize code formatting in `device_list` module --- emhttp/plugins/dynamix/nchan/device_list | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 886b27392f..e997372424 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -269,10 +269,10 @@ function array_online(&$disk, $fstype='') { global $pools, $sum, $diskio; $disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0); $echo = []; - $data = [0, 0, 0]; + $data = [0,0,0]; if (_var($disk,'device')) { $dev = $disk['device']; - $data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0'); + $data = explode(' ',$diskio[$dev] ?? '0 0 0 0 0'); $sum['ioReads'] += $data[0]; $sum['ioWrites'] += $data[1]; } @@ -482,7 +482,7 @@ while (true) { $a = 'boot_device'; $echo[$a] = []; - $data = explode(' ', $diskio[_var($Flash, 'device')] ?? '0 0 0 0 0'); + $data = explode(' ',$diskio[_var($Flash,'device')] ?? '0 0 0 0 0'); $flash = &$sec['flash']; $share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public') ? " "._('Flash device is set as public share')."
"._('Please change share SMB security')."
"._('Click on **FLASH** above this message')."" @@ -519,7 +519,7 @@ while (true) { $data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\""; $off &= !empty(_var($Cache[$root],'uuid')); file_put_contents($pool_log,implode("\n",$data)); - $echo[$a][] = "" . _('Slots') . ":" . cache_slots($off, $pool, _var($Cache[$pool], 'devicesSb'), _var($Cache[$pool], 'slots', 0)) . ""; + $echo[$a][] = ""._('Slots').":".cache_slots($off,$pool,_var($Cache[$pool],'devicesSb'),_var($Cache[$pool],'slots',0)).""; $zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool); if ($zfsPool) { $current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");});