mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-06 17:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1491 from bergware/master

Browse Source 
Code alignment
This commit is contained in:
tom mortensen
2023-11-04 18:14:22 -07:00
committed by GitHub
parent 879a350963 3a073ed4bd
commit 35d863fa4a
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emhttp/plugins/dynamix/DashStats.page
View File

@@ -570,7 +570,7 @@ if (!$group) {
<?$i=0?>
<?foreach ($pools as $pool):?>
<tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($_tilde_," $_arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
<tr><td><i class='icon-disk f32'></i><div class='section'><?=_(native($pool),3).($started ? '' : ' ('._('stopped').')')?><br>
<span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
<a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
</td></tr>

2
emhttp/plugins/dynamix/DeviceInfo.page
View File

@@ -537,7 +537,7 @@ _(Name)_:
<?else:?>
_(Name)_:
: <?=str_replace($_tilde_," $_arrow_ ",_(my_disk($name),3))?>
: <?=_(my_disk(native($name)),3)?>
<?endif;?>
<?if (diskStatus('_NP')):?>

9
emhttp/plugins/dynamix/include/Wrappers.php
View File

@@ -95,12 +95,19 @@ function ipaddr($ethX='eth0', $prot=4) {
}
}
function no_tilde($name) {
global $_tilde_,$_proxy_;
global $_tilde_ ,$_proxy_;
return str_replace($_tilde_,$_proxy_,$name);
}
function prefix($key) {
return preg_replace('/\d+$/','',$key);
}
function native($name, $full=0) {
global $_tilde_, $_arrow_;
switch ($full) {
case 0: return str_replace($_tilde_," $_arrow_ ",$name);
case 1: return strpos($name,$_tilde_)!==false ? "$_arrow_ ".explode($_tilde_,$name)[1] : $name;
}
}
function isSubpool($name) {
global $subpools, $_tilde_;
$subpool = my_explode($_tilde_,$name)[1];

7
emhttp/plugins/dynamix/nchan/device_list
View File

@@ -37,7 +37,7 @@ function model($id) {
return substr($id,0,strrpos($id,'_'));
}
function device_info(&$disk,$online) {
global $pools, $var, $crypto, $_tilde_, $_arrow_;
global $pools, $var, $crypto;
if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
$view = "<a class='view'></a>";
} else {
@@ -46,8 +46,7 @@ function device_info(&$disk,$online) {
}
$name = _var($disk,'name');
$named = no_tilde($name);
$extra = my_explode($_tilde_,$name)[1];
$fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
$fancy = compress(_(my_disk(native($name,1)),3),16,5);
$type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
$pool = _var($disk,'type')=='Cache';
$parity = _var($disk,'type')=='Parity';
@@ -75,7 +74,7 @@ function device_info(&$disk,$online) {
(_var($disk,'type')=='Data' && $disk_status!='DISK_NP') ||
(_var($disk,'type')=='Cache' && $disk_status!='DISK_NP') ||
(_var($disk,'name')=='flash') || in_array(_var($disk,'name'),$pools) ||
_var($disk,'type')=='New' ? "<a href=\"".htmlspecialchars("/Main/Settings/$type?name=$name")."\">$fancyname</a>" : $fancyname;
_var($disk,'type')=='New' ? "<a href=\"".htmlspecialchars("/Main/Settings/$type?name=$name")."\">$fancy</a>" : $fancy;
if ($crypto) switch (_var($disk,'luksState',0)) {
case 0:
if (!vfs_luks(_var($disk,'fsType')))

6
emhttp/plugins/dynamix/nchan/update_2
View File

@@ -126,7 +126,6 @@ function active_disks($disk) {
return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
}
function device_name(&$disk) {
global $_tilde_, $_arrow_;
switch (_var($disk,'type')) {
case 'Extra' :
case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
@@ -134,9 +133,8 @@ function device_name(&$disk) {
case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
}
$name = _var($disk,'name');
$extra = my_explode($_tilde_,$name)[1];
$fancyname = compress($extra ? "$_arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
$fancy = compress(_(my_disk(native($name,1)),3),16,5);
return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancy settings\">$fancy</a>";
}
function device_status(&$disk, &$error, &$warning) {
global $var;