diff --git a/plugins/dynamix/include/ParityHistory.php b/plugins/dynamix/include/ParityHistory.php
index 95d08a8c5..8624a4c0e 100644
--- a/plugins/dynamix/include/ParityHistory.php
+++ b/plugins/dynamix/include/ParityHistory.php
@@ -1,6 +1,6 @@
'-01-',' Feb '=>'-02-',' Mar '=>'-03-',' Apr '=>'-04-',' May '=>'-05-',' Jun '=>'-06-',' Jul '=>'-07-',' Aug '=>'-08-',' Sep '=>'-09-',' Oct '=>'-10-',' Nov '=>'-11-',' Dec '=>'-12-'];
-function plus($val, $word, $last) {
+function his_plus($val, $word, $last) {
return $val>0 ? (($val||$last)?($val.' '.$word.($last?'':', ')):'') : '';
}
-function my_duration($time) {
+function his_duration($time) {
if (!$time) return 'Unavailable';
$days = floor($time/86400);
$hmss = $time-$days*86400;
$hour = floor($hmss/3600);
$mins = $hmss/60%60;
$secs = $hmss%60;
- return plus($days,'day',($hour|$mins|$secs)==0).plus($hour,'hr',($mins|$secs)==0).plus($mins,'min',$secs==0).plus($secs,'sec',true);
+ return his_plus($days,'day',($hour|$mins|$secs)==0).his_plus($hour,'hr',($mins|$secs)==0).his_plus($mins,'min',$secs==0).his_plus($secs,'sec',true);
}
?>
@@ -45,7 +45,7 @@ if (file_exists($log)) {
list($date,$duration,$speed,$status,$error) = explode('|',$line);
if ($speed==0) $speed = 'Unavailable';
$date = str_replace(' ',', ',strtr(str_replace(' ',' 0',$date),$month));
- if ($duration>0||$status<>0) $list[] = "| $date | ".my_duration($duration)." | $speed | ".($status==0?'OK':($status==-4?'Canceled':$status))." | $error |
";
+ if ($duration>0||$status<>0) $list[] = "| $date | ".his_duration($duration)." | $speed | ".($status==0?'OK':($status==-4?'Canceled':$status))." | $error |
";
}
fclose($handle);
}