diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index dd4effb36..c3cdade05 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -369,35 +369,35 @@ function formatWarning(val) {
| |
if ($var['sbSyncExit']!=0):?>
=sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0))?>
- =sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?>
- _(Error code)_: =my_error($var['sbSyncExit'])?> |
+
_(Error code)_: =my_error($var['sbSyncExit'])?>
+
=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?>
elseif ($var['sbSynced']==0):
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();?>
if ($status==0):?>
=sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0))?>
- =sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
- _(Duration)_: =my_check($duration,$speed)?> |
+
_(Duration)_: =my_check($duration,$speed)?>
+
=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
else:?>
=sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0))?>
- =sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
- _(Error code)_: =my_error($status)?> |
+
_(Error code)_: =my_error($status)?>
+
=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
endif;
elseif ($var['sbSynced2']==0):
[$date,$duration,$speed,$status,$error,$action] = my_explode('|', read_parity_log($var['sbSynced']),6);
if ($status==0):?>
=sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0))?>
- =sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
- _(Duration)_: =my_check($duration,$speed)?> |
+
_(Duration)_: =my_check($duration,$speed)?>
+
=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
else:?>
=sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0))?>
- =sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
- _(Error code)_: =my_error($status)?> |
+
_(Error code)_: =my_error($status)?>
+
=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
endif;
else:
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();?>
=sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0))?>
- =sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?>
- _(Duration)_: =my_check($duration,$speed)?> |
+
_(Duration)_: =my_check($duration,$speed)?>
+
=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?>
endif;
endif;
else:
diff --git a/plugins/dynamix/nchan/update_2 b/plugins/dynamix/nchan/update_2
index 4626c2f00..4f525886d 100755
--- a/plugins/dynamix/nchan/update_2
+++ b/plugins/dynamix/nchan/update_2
@@ -354,44 +354,44 @@ while (true) {
$idle = $var['mdResync']==0;
if ($var['sbSyncExit']!=0) {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "
"._('Error code').": ".my_error($var['sbSyncExit']);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
} elseif ($var['sbSynced']==0) {
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();
if (!$date) {
$echo[4] = _('Parity has not been checked yet');
} elseif ($status==0) {
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "
"._('Duration').": ".my_check($duration,$speed);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "
"._('Error code').": ".my_error($status);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
}
} elseif ($var['sbSynced2']==0) {
if ($idle) {
[$date,$duration,$speed,$status,$error,$action] = my_explode('|', read_parity_log($var['sbSynced'],!$idle),6);
if ($status==0) {
$echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "
"._('Duration').": ".my_check($duration,$speed);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "
"._('Error code').": ".my_error($status);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
}
} else {
$echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "
"._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2);
$echo[4].= "
"._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
}
} else {
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();
$echo[4] = sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0));
- $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "
"._('Duration').': '.my_check($duration,$speed);
+ $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
}
if ($idle) {
[$m,$h] = explode(' ', $parity['hour']);