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

Merge pull request #1295 from bergware/master

Browse Source 
Minor updates
This commit is contained in:
tom mortensen
2023-03-30 09:39:02 -07:00
committed by GitHub
parent 8a0546ad7c 5ab39d1f8b
commit 09a6842577
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/dynamix.docker.manager/scripts/container_size
View File

@@ -69,12 +69,12 @@ foreach ($container as $ct) {
$sum = ['total' => 0, 'writable' => 0, 'log' => 0];
array_multisort(array_column($list,'total'),SORT_DESC,$list); // sort on container size
$i = 0;
write(align(_('Name'),50).align(_('Container')).align(_('Writable'))._('Log')."\n");
write(align(_('Name'),48).align(_('Container')).align(_('Writable'))._('Log')."\n");
foreach ($list as $ct) {
write(($i++==0 ? '<hr>':'').align($ct['name'],50).align(autoscale($ct['total'])).align(autoscale($ct['writable'])).autoscale($ct['log'])."\n");
write(($i++==0 ? '<hr>':'').align($ct['name'],48).align(autoscale($ct['total'])).align(autoscale($ct['writable'])).autoscale($ct['log'])."\n");
$sum['total'] += $ct['total'];
$sum['writable'] += $ct['writable'];
$sum['log'] += $ct['log'];
}
write("<hr>".align(_('Total size'),50).align(autoscale($sum['total'])).align(autoscale($sum['writable'])).autoscale($sum['log'])."\n",'_DONE_','');
write("<hr>".align(_('Total size'),48).align(autoscale($sum['total'])).align(autoscale($sum['writable'])).autoscale($sum['log'])."\n",'_DONE_','');
?>

6
plugins/dynamix/DashStats.page
View File

@@ -53,8 +53,10 @@ function customTiles($column) {
$fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
exec("sed -ri 's/^\.logLine\{color:#......;/.logLine{color:$fgcolor;/' $docroot/plugins/dynamix.docker.manager/log.htm >/dev/null &");
$dockerd = pgrep('dockerd');
$libvirtd = pgrep('libvirtd');
exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$dockerd);
exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
$dockerd = $dockerd==0;
$libvirtd = $libvirtd==0;
$apcupsd = file_exists('/var/run/apcupsd.pid');
$conf = glob('/etc/wireguard/wg*.conf');
$wireguard = is_executable('/usr/bin/wg') && count($conf);

4
plugins/dynamix/include/Wrappers.php
View File

@@ -72,7 +72,7 @@ function exceed($value, $limit, $top=100) {
}
function ipaddr($ethX='eth0', $prot=4) {
global $$ethX;
switch ($$ethX['PROTOCOL:0']) {
switch (_var($$ethX,'PROTOCOL:0')) {
case 'ipv4':
return $$ethX['IPADDR:0'];
case 'ipv6':
@@ -83,7 +83,7 @@ function ipaddr($ethX='eth0', $prot=4) {
case 6: return $$ethX['IPADDR6:0'];
default:return [$$ethX['IPADDR:0'],$$ethX['IPADDR6:0']];}
default:
return $$ethX['IPADDR:0'];
return _var($$ethX,'IPADDR:0');
}
}
// convert strftime to date format