diff --git a/plugins/dynamix/nchan/device_list b/plugins/dynamix/nchan/device_list
index 445821c23..6d121cb8e 100755
--- a/plugins/dynamix/nchan/device_list
+++ b/plugins/dynamix/nchan/device_list
@@ -47,15 +47,16 @@ function device_info(&$disk,$online) {
$type = $disk['type']=='Flash' ? $disk['type'] : 'Device';
$action = strpos($disk['color'],'blink')===false ? 'down' : 'up';
switch ($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 = $disk['type']=='Parity' ? _('Parity is invalid') : _('Device contents emulated'); break;
- case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $disk['type']=='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 = $disk['type']=='Parity' ? _('Parity device is disabled') : _('Device is disabled, contents emulated'); break;
- case 'red-off': $orb = 'times'; $color = 'red'; $help = $disk['type']=='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 '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 = $disk['type']=='Parity' ? _('Parity is invalid') : _('Device contents emulated'); break;
+ case 'yellow-blink': $orb = 'warning'; $color = 'grey'; $help = $disk['type']=='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 = $disk['type']=='Parity' ? _('Parity device is disabled') : _('Device is disabled, contents emulated'); break;
+ case 'red-off': $orb = 'times'; $color = 'red'; $help = $disk['type']=='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 = '';
if ($var['fsState']=='Started' && $type!='Flash' && strpos($disk['status'],'_NP')===false) {
@@ -63,11 +64,11 @@ function device_info(&$disk,$online) {
$help .= "
"._("Click to spin $action device");
}
$status = "$help";
- $link = ($disk['type']=='Parity' && strpos($disk['status'],'_NP')===false) ||
- ($disk['type']=='Data' && $disk['status']!='DISK_NP') ||
- ($disk['type']=='Cache' && $disk['status']!='DISK_NP') ||
- ($disk['name']=='flash') || in_array($disk['name'],$pools) ||
- $disk['type']=='New' ? "$fancyname" : $fancyname;
+ $link = ($disk['type']=='Parity' && strpos($disk['status'],'_NP')===false) ||
+ ($disk['type']=='Data' && $disk['status']!='DISK_NP') ||
+ ($disk['type']=='Cache' && $disk['status']!='DISK_NP') ||
+ ($disk['name']=='flash') || in_array($disk['name'],$pools) ||
+ $disk['type']=='New' ? "$fancyname" : $fancyname;
if ($crypto) switch ($disk['luksState']) {
case 0:
if (!vfs_luks($disk['fsType']))
@@ -101,11 +102,11 @@ function device_desc(&$disk) {
global $var;
$size = my_scale($disk['size'] ? $disk['size']*1024 : $disk['sectors']*$disk['sector_size'],$unit,-1);
switch ($disk['type']) {
- case 'Flash' : $type = 'usb'; break;
+ case 'Flash': $type = 'usb'; break;
case 'Parity': $type = $disk['rotational'] ? 'disk' : 'nvme'; break;
- case 'Data' :
- case 'Cache' : $type = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; break;
- default : $type = 'disk'; break;
+ case 'Data':
+ case 'Cache': $type = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; break;
+ default: $type = 'disk'; break;
}
$log = $var['fsState']=='Started'
? ""._('Disk Log Information').""
@@ -114,18 +115,21 @@ function device_desc(&$disk) {
}
function assignment(&$disk) {
global $var, $devs;
- $out = "