From 0160c8c01ce8dbfaf7ab5bcee9430b638bb6d735 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Fri, 27 Apr 2018 08:11:10 +0200
Subject: [PATCH] Minor code changes

---
 plugins/dynamix/include/DashUpdate.php | 14 +++++++-------
 plugins/dynamix/include/DeviceList.php |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php
index 2475776eb..fd801c707 100644
--- a/plugins/dynamix/include/DashUpdate.php
+++ b/plugins/dynamix/include/DashUpdate.php
@@ -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
     }
   }
diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index c97dcc4c1..3cb8f24d2 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -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'];