diff --git a/plugins/dynamix/nchan/device_list b/plugins/dynamix/nchan/device_list
index 6d0d28a99..42061f64c 100755
--- a/plugins/dynamix/nchan/device_list
+++ b/plugins/dynamix/nchan/device_list
@@ -24,7 +24,7 @@ extract(parse_plugin_cfg('dynamix',true));
// add translations
$_SERVER['REQUEST_URI'] = 'main';
-$login_locale = $display['locale'];
+$login_locale = _var($display,'locale');
require_once "$docroot/webGui/include/Translations.php";
// remember current language
diff --git a/plugins/dynamix/nchan/parity_list b/plugins/dynamix/nchan/parity_list
index a80f935d4..78da3956b 100755
--- a/plugins/dynamix/nchan/parity_list
+++ b/plugins/dynamix/nchan/parity_list
@@ -72,7 +72,7 @@ while (true) {
$var = @parse_ini_file("$varroot/var.ini") ?: [];
// check for language changes
extract(parse_plugin_cfg('dynamix',true));
- if (_var($display,'locale')!=$locale_init) {
+ if (_var($display,'locale') != $locale_init) {
$locale_init = _var($display,'locale');
update_translation($locale_init);
}
diff --git a/plugins/dynamix/nchan/update_2 b/plugins/dynamix/nchan/update_2
index 068de94ea..51508db86 100755
--- a/plugins/dynamix/nchan/update_2
+++ b/plugins/dynamix/nchan/update_2
@@ -159,8 +159,8 @@ function device_temp(&$disk, &$red, &$orange) {
global $display;
$spin = strpos(_var($disk,'color'),'blink')===false;
$temp = _var($disk,'temp','*');
- $hot = $disk['hotTemp'] ?? $display['hot'] ?? 0;
- $max = $disk['maxTemp'] ?? $display['max'] ?? 0;
+ $max = ($disk['maxTemp'] ?? $display['max'] ?? 0) ?: 0;
+ $hot = ($disk['hotTemp'] ?? $display['hot'] ?? 0) ?: 0;
$top = $display['top'] ?? 120;
$heat = false; $color = 'green';
if (exceed($temp,$max,$top)) {
@@ -168,7 +168,7 @@ function device_temp(&$disk, &$red, &$orange) {
} elseif (exceed($temp,$hot,$top)) {
$heat = 'fire'; $color = 'orange'; $orange++;
}
- return ($spin && $temp>0) ? "".my_unit($temp,_var($display,'unit'))."".($heat ? "" : "") : "*";
+ return ($spin && $temp>0) ? "".my_unit($temp,_var($display,'unit','C'))."".($heat ? "" : "") : "*";
}
function device_smart(&$disk, &$fail, &$smart) {
global $numbers,$saved;
@@ -289,7 +289,7 @@ while (true) {
require "$docroot/webGui/include/Preselect.php";
// check for language changes
extract(parse_plugin_cfg('dynamix',true));
- if (_var($display,'locale')!=$locale_init) {
+ if (_var($display,'locale') != $locale_init) {
$locale_init = _var($display,'locale');
update_translation($locale_init);
}
@@ -456,7 +456,7 @@ while (true) {
}
$echo[4] .= "\0";
if ($check) {
- $frmt = $display['date'].($display['date']!='%c' ? ", {$display['time']}" : "");
+ $frmt = _var($display,'date').(_var($display,'date')!='%c' ? ", "._var($display,'time') : "");
$echo[4] .= sprintf(_('Next check scheduled on **%s**'),_(my_date($frmt,$time+$t),0));
$echo[4] .= "
"._('Due in').": "._(my_clock(floor($t/60)),2);
} else {
diff --git a/plugins/dynamix/nchan/update_3 b/plugins/dynamix/nchan/update_3
index 2c93ffe82..c0bddc07e 100755
--- a/plugins/dynamix/nchan/update_3
+++ b/plugins/dynamix/nchan/update_3
@@ -1,7 +1,7 @@
#!/usr/bin/php -q