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

Minor code changes

Browse Source
This commit is contained in:
bergware
2018-04-27 08:11:10 +02:00
parent e1bbfc7f90
commit 0160c8c01c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/include/DashUpdate.php
+7 -7
View File
@@ -123,24 +123,24 @@ function stage($i) {
}
} else {
$d = $i ? ($now ? $D : today($i)) : today(last_day()-6);
$x = $i ?: last_day()-6;
$D = mkdate($d, $x);
$s = $i ?: last_day()-6;
$D = mkdate($d, $s);
$t = mktime($h,$m,0,$M,$D,$Y)-$time; // first day
if ($t < 0) {
$D = mkdate(next_day($d), $x);
$D = mkdate(next_day($d), $s);
$t = mktime($h,$m,0,$M,$D,$Y)-$time; // next day
}
if ($t < 0) {
$M = find_month($M+1);
$x = $i ?: last_day()-6;
$D = mkdate(today($x), $x);
$s = $i ?: last_day()-6;
$D = mkdate(today($s), $s);
$t = mktime($h,$m,0,$M,$D,$Y)-$time; // next month
}
if ($t < 0) {
$Y++;
$M = find_month(1);
$x = $i ?: last_day()-6;
$D = mkdate(today($x), $x);
$s = $i ?: last_day()-6;
$D = mkdate(today($s), $s);
$t = mktime($h,$m,0,$M,$D,$Y)-$time; // next year
}
}
plugins/dynamix/include/DeviceList.php
+4 -4
View File
@@ -1,6 +1,6 @@
<?PHP
/* Copyright 2005-2017, Lime Technology
* Copyright 2012-2017, Bergware International.
/* Copyright 2005-2018, Lime Technology
* Copyright 2012-2018, Bergware International.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -381,7 +381,7 @@ case 'cache':
case 'open':
foreach ($devs as $disk) {
$dev = $disk['device'];
$data = explode(' ',$diskio[$dev] ?? '0 0');
$data = explode(' ',$diskio[$dev] ?? '0 0 0 0');
$disk['name'] = $dev;
$disk['type'] = 'New';
$disk['color'] = read_disk($dev,'color');
@@ -406,7 +406,7 @@ case 'parity':
if ($var['mdResync']>0) {
$data[] = my_scale($var['mdResync']*1024,$unit,-1)." $unit";
$data[] = my_clock(floor((time()-$var['sbUpdated'])/60));
$data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,substr($display['number'],0,1),'')." %)";
$data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,$display['number'][0],'')." %)";
$data[] = my_scale($var['mdResyncDb']*1024/$var['mdResyncDt'],$unit, 1)." $unit/sec";
$data[] = my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0));
$data[] = $var['sbSyncErrs'];