mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-06 00:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Got rid of var['currTime'] so get the current time from php time() function.

Browse Source
This commit is contained in:
Tom Mortensen
2017-07-06 20:41:15 -07:00
parent 2b87e51534
commit 65fc2b4198
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dynamix/DateTime.page
View File

@@ -18,7 +18,7 @@ Icon="date-time.png"
<form markdown="1" name="datetime_settings" method="POST" action="/update.htm" target="progressFrame">
Current date and time:
: <?=my_time($var['currTime'])?>
: <?=my_time(time())?>
Time zone:
: <select name="timeZone" size="1"><?
@@ -55,7 +55,7 @@ NTP server 3:
> This is the alternate NTP Server to use if NTP Servers 1 and 2 are both down.
New date and time:
: <input type="text" name="newDateTime" maxlength="40" value="<?=my_time($var['currTime'], "%F %T")?>">
: <input type="text" name="newDateTime" maxlength="40" value="<?=my_time(time(), "%F %T")?>">
> Enter the current time-of-day. Use format YYYY-MM-DD HH:MM:SS. Greyed out when using NTP.

2
plugins/dynamix/include/DashUpdate.php
View File

@@ -208,7 +208,7 @@ case 'parity':
$mode = 'Parity-Check';
}
echo "<span class='orange p0'><strong>".$mode." in progress... Completed: ".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),0)." %.</strong></span>";
echo "<br><em>Elapsed time: ".my_clock(floor(($var['currTime']-$var['sbUpdated'])/60)).". Estimated finish: ".my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0))."</em>";
echo "<br><em>Elapsed time: ".my_clock(floor((time()-$var['sbUpdated'])/60)).". Estimated finish: ".my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0))."</em>";
break;
case 'shares':
$names = explode(',',$_POST['names']);

2
plugins/dynamix/include/DeviceList.php
View File

@@ -338,7 +338,7 @@ case 'parity':
$data = [];
if ($var['mdResync']>0) {
$data[] = my_scale($var['mdResync']*1024,$unit)." $unit";
$data[] = my_clock(floor(($var['currTime']-$var['sbUpdated'])/60));
$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['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));