From 23231ac4b4923e20e182f8f5f6b5532fffc2f31e Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 2 Apr 2017 23:38:59 +0200
Subject: [PATCH 1/2] Fixed regression error in erroneous display of disk table
 on Dashboard page

---
 plugins/dynamix/include/DashUpdate.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php
index e977fbada..746190b2d 100644
--- a/plugins/dynamix/include/DashUpdate.php
+++ b/plugins/dynamix/include/DashUpdate.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2012-2016, Bergware International.
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2012-2017, 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,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?? '/usr/local/emhttp';
 
 function normalize($type,$count) {
   $words = explode('_',$type);
@@ -24,9 +24,9 @@ function my_insert(&$source,$string) {
 function my_smart(&$source,$name,$page) {
   global $var,$disks,$path,$failed,$numbers,$saved;
   $disk   = &$disks[$name];
-  $select = isset($disk['smSelect']) ? $disk['smSelect'] : -1; if ($select==-1) $select = isset($var['smSelect']) ? $var['smSelect'] : 0;
-  $level  = isset($disk['smLevel']) ? $disk['smLevel'] : -1; if ($level==-1) $level = isset($var['smLevel']) ? $var['smLevel'] : 1;
-  $events = isset($disk['smEvents']) ? explode('|',$disk['smEvents']) : (isset($var['smEvents']) ? explode('|',$var['smEvents']) : $numbers);
+  $select = $disk['smSelect'] ?? -1; if ($select==-1) $select = $var['smSelect'] ?? 0;
+  $level  = $disk['smLevel'] ?? -1; if ($level==-1) $level = $var['smLevel'] ?? 1;
+  $events = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
   $title  = '';
   $thumb  = 'good';
   $file   = "state/smart/$name";

From c3a3233e951a749db2ee1a4f4cb86c26b23e28c2 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 3 Apr 2017 01:21:37 +0200
Subject: [PATCH 2/2] Fixed: regression errors

---
 plugins/dynamix/include/DashUpdate.php |  2 +-
 plugins/dynamix/include/SmartInfo.php  |  2 +-
 plugins/dynamix/scripts/monitor        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php
index 746190b2d..0e0695cd5 100644
--- a/plugins/dynamix/include/DashUpdate.php
+++ b/plugins/dynamix/include/DashUpdate.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?? '/usr/local/emhttp';
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 function normalize($type,$count) {
   $words = explode('_',$type);
diff --git a/plugins/dynamix/include/SmartInfo.php b/plugins/dynamix/include/SmartInfo.php
index d3c7ba8f4..ea6ce12b5 100644
--- a/plugins/dynamix/include/SmartInfo.php
+++ b/plugins/dynamix/include/SmartInfo.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?? '/usr/local/emhttp';
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 function normalize($text, $glue='_') {
   $words = explode($glue,$text);
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index ff8b74a7d..4e1ac4849 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2012-2016, Bergware International.
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2012-2017, 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,
@@ -111,10 +111,10 @@ function check_temp($name,$temp,$text,$info) {
 function check_smart($name,$port,$text,$info) {
   global $var,$disks,$notify,$saved,$server,$numbers;
   $disk = &$disks[$name];
-  $select = isset($disk['smSelect']) ? $disk['smSelect'] : -1; if ($select==-1) $select = isset($all['smSelect']) ? $var['smSelect'] : 0;
-  $level = isset($disk['smLevel']) ? $disk['smLevel'] : -1; if ($level==-1) $level = isset($var['smLevel']) ? $var['smLevel'] : 1;
-  $events = isset($disk['smEvents']) ? explode('|',$disk['smEvents']) : (isset($var['smEvents']) ? explode('|',$var['smEvents']) : $numbers);
-  $type = isset($disk['smType']) ? $disk['smType'] : -1; if ($type==-1) $type = isset($var['smType']) ? $var['smType'] : '';
+  $select = $disk['smSelect'] ?? -1; if ($select==-1) $select = $var['smSelect'] ?? 0;
+  $level  = $disk['smLevel'] ?? -1; if ($level==-1) $level = $var['smLevel'] ?? 1;
+  $events = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
+  $type = $disk['smType'] ?? -1; if ($type==-1) $type = $var['smType'] ?? '';
   if ($type) {
     $ports = [];
     if (!empty($disk['smDevice'])) $port = $disk['smDevice'];