mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 18:48:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from bergware/master

Browse Source 
Add configurable display of WWN in device ID
This commit is contained in:
tom mortensen
2016-09-03 09:17:36 -07:00
committed by GitHub
parent ab2642381d cc97a81002
commit c40baf50a7
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/include/DeviceList.php
+3 -8
View File
@@ -65,16 +65,11 @@ function device_browse(&$disk) {
return "<a href='$path/Browse?dir=$dir'><img src='/webGui/images/explore.png' title='Browse $dir'></a>";
}
}
function device_id($id) {
$len = strlen($id);
$wwn = substr($id,-18);
return (substr($wwn,0,2)!='_3' || preg_match('/.[_-]/',$wwn)) ? $id : substr($id,0,$len-18);
}
function device_desc(&$disk) {
global $var;
$size = my_scale($disk['size']*1024,$unit);
$log = $var['fsState']=='Started' ? "<a href=\"#\" title=\"Disk Log Information\" onclick=\"openBox('/webGui/scripts/disk_log&arg1={$disk['device']}','Disk Log Information',600,900,false);return false\"><i class=\"fa fa-hdd-o icon\"></i></a>" : "";
return $log.device_id($disk['id'])." - $size $unit ({$disk['device']})";
return $log.my_id($disk['id'])." - $size $unit ({$disk['device']})";
}
function assignment(&$disk) {
global $var, $devs;
@@ -82,11 +77,11 @@ function assignment(&$disk) {
$out .= "<select class=\"slot\" name=\"slotId.{$disk['idx']}\" onChange=\"{$disk['name']}Form.submit()\">";
$empty = ($disk['idSb']!='' ? 'no device' : 'unassigned');
if ($disk['id']!='') {
$out .= "<option value=\"".device_id($disk['id'])."\" selected>".device_desc($disk)."</option>";
$out .= "<option value=\"".my_id($disk['id'])."\" selected>".device_desc($disk)."</option>";
$out .= "<option value=''>$empty</option>";
} else
$out .= "<option value='' selected>$empty</option>";
foreach ($devs as $dev) {$out .= "<option value=\"".device_id($dev['id'])."\">".device_desc($dev)."</option>";}
foreach ($devs as $dev) {$out .= "<option value=\"".my_id($dev['id'])."\">".device_desc($dev)."</option>";}
return "$out</select></form>";
}
function fs_info(&$disk) {
plugins/dynamix/include/Helpers.php
+6
View File
@@ -54,6 +54,12 @@ function my_disk($name) {
function my_disks($disk) {
return strpos($disk['status'],'_NP')===false;
}
function my_id($id) {
global $display;
$len = strlen($id);
$wwn = substr($id,-18);
return ($display['wwn'] || substr($wwn,0,2)!='_3' || preg_match('/.[_-]/',$wwn)) ? $id : substr($id,0,$len-18);
}
function my_word($num) {
$words = array('zero','one','two','three','four','five','six','seven','eight','nine','ten','eleven','twelve','thirteen','fourteen','fifteen','sixteen','seventeen','eighteen','nineteen','twenty');
return $num<count($words) ? $words[$num] : $num;