From 27cf32f8456031851c00652f84b951bd8af97c04 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 12:20:47 +0100
Subject: [PATCH 01/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 22 +++++++++++++++-----
 plugins/dynamix/include/DeleteLogFile.php | 25 +++++++++++++++--------
 plugins/dynamix/include/Notify.php        |  2 +-
 plugins/dynamix/scripts/notify            |  2 +-
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 285cf7250..e4d0a169a 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -24,8 +24,11 @@ $filters = mk_option(0,'',_('No filter')).mk_option(0,'alert',_('Alerts')).mk_op
 select.filter{margin:0}
 span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
 </style>
+
 <script>
 var rows = [];
+var filter = "<?=unscript($_GET['filter']??'')?>";
+
 Array.prototype.remove = function() {
   var val, a = arguments, L = a.length, ax;
   while (L && this.length) {
@@ -47,9 +50,9 @@ function resize(bind) {
   }
 }
 <?endif;?>
-function archiveList(init=false,filter='') {
+function archiveList(init) {
   timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/webGui/include/NotificationsArchive.php',{filter:"<?=unscript($_GET['filter']??'')?>"||filter},function(data) {
+  $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);
     if (data) $('#archive_list').html(data);
     if (init) {
@@ -63,11 +66,19 @@ function archiveList(init=false,filter='') {
     $('#archive_list .tablesorter-childRow td').hide();
     for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
     $('div.spinner.fixed').hide('slow');
-    setTimeout(archiveList,30000);
   });
 }
 function askConfirmation() {
-  swal({title:"_(Are you sure)_?",text:"_(This will delete all notification files)_!",type:"warning",html:true,showCancelButton:true,confirmButtonText:"_(Proceed)_",cancelButtonText:"_(Cancel)_"},function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify'},function(){archiveList();});});
+  swal({
+    title:"_(Are you sure)_?",
+    text: filter=='' ? "_(This will delete all notification files)_!" : "_(This will delete the selected notification files)_!",
+    type:"warning",
+    html:true,
+    showCancelButton:true,
+    confirmButtonText:"_(Proceed)_",
+    cancelButtonText:"_(Cancel)_"
+  },
+  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){archiveList();});});
 }
 function openClose(row) {
   var extra = '#archive_list .tablesorter-childRow.row'+row+' td';
@@ -80,7 +91,8 @@ function openClose(row) {
   }
 }
 $(function(){
-  $('span.left').append("<span class='right'><select class='filter narrow' onchange='archiveList(false,this.value)'><?=$filters?></select></span>");
+  $('span.left').append("<span class='right'><select class='filter narrow' onchange='filter=this.value;archiveList()'><?=$filters?></select></span>");
+  $('select.filter').val(filter);
   archiveList(true);
 <?if ($display['resize']):?>
   $(window).bind('resize',function(){resize(true);});
diff --git a/plugins/dynamix/include/DeleteLogFile.php b/plugins/dynamix/include/DeleteLogFile.php
index ab989c84c..01a97e2f5 100644
--- a/plugins/dynamix/include/DeleteLogFile.php
+++ b/plugins/dynamix/include/DeleteLogFile.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -15,11 +15,20 @@ $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once "$docroot/webGui/include/Wrappers.php";
 
 $dynamix = parse_plugin_cfg('dynamix',true);
-$killfiles = [];
-if (strpos($_POST['log'],'*')===false) $killfiles = [ realpath("{$dynamix['notify']['path']}/archive/{$_POST['log']}") ]; else $killfiles = glob("{$dynamix['notify']['path']}/archive/{$_POST['log']}",GLOB_NOSORT);
-foreach ($killfiles as $killfile) {
-	if (strpos($killfile, "{$dynamix['notify']['path']}/archive/") === 0) {
-		@unlink($killfile);
-	}
+$archive = $dynamix['notify']['path']."/archive";
+$log     = $_POST['log']??'';
+$filter  = $_POST['filter']??false;
+$files   = strpos($log,'*')===false ? [realpath("$archive/$log")] : glob("$archive/$log",GLOB_NOSORT);
+
+foreach ($files as $file) {
+  // check file path
+  if (strncmp($file,$archive,strlen($archive))!==0) continue;
+  if (!$filter) {
+    // delete all files
+    @unlink($file);
+  } else {
+    // delete selective files
+    if (exec("grep -om1 'importance=$filter' ".escapeshellarg($file))) @unlink($file);
+  }
 }
 ?>
diff --git a/plugins/dynamix/include/Notify.php b/plugins/dynamix/include/Notify.php
index 01646b977..75e47260d 100644
--- a/plugins/dynamix/include/Notify.php
+++ b/plugins/dynamix/include/Notify.php
@@ -48,7 +48,7 @@ case 'get':
   break;
 case 'hide':
   $file = $_POST['file']??'';
-  if (file_exists($file) && $file==realpath($file) && pathinfo($file)['extension']=='notify') chmod($file,0000);
+  if (file_exists($file) && $file==realpath($file) && pathinfo($file)['extension']=='notify') chmod($file,0400);
   break;
 case 'archive':
   $file = $_POST['file']??'';
diff --git a/plugins/dynamix/scripts/notify b/plugins/dynamix/scripts/notify
index 9d23dca30..aa3fa077a 100755
--- a/plugins/dynamix/scripts/notify
+++ b/plugins/dynamix/scripts/notify
@@ -232,7 +232,7 @@ case 'get':
     $fields = file($file,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
     $time = true;
     $output[$i]['file'] = basename($file);
-    $output[$i]['show'] = fileperms($file)==32768 ? 0 : 1;
+    $output[$i]['show'] = (fileperms($file) & 0x0FFF)==0400 ? 0 : 1;
     foreach ($fields as $field) {
       if (!$field) continue;
       [$key,$val] = array_pad(explode('=', $field),2,'');

From d4c24312ef87309059289fab89b1269539cde60e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 13:44:56 +0100
Subject: [PATCH 02/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page     | 28 +++++++++++--------
 .../dynamix/include/NotificationsArchive.php  | 18 ++++++------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index e4d0a169a..1ce2a17cd 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -28,6 +28,7 @@ span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
 <script>
 var rows = [];
 var filter = "<?=unscript($_GET['filter']??'')?>";
+var rows = 0;
 
 Array.prototype.remove = function() {
   var val, a = arguments, L = a.length, ax;
@@ -54,18 +55,23 @@ function archiveList(init) {
   timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);
-    if (data) $('#archive_list').html(data);
-    if (init) {
-<?if ($display['resize']):?>
-      resize();
-<?endif;?>
-      $('#archive_table').tablesorter({headers:{5:{sorter:false}},textAttribute:'data'});
-    } else {
-      $('#archive_table').trigger('update');
+    data = data.split('\0');
+    if (rows != data[1]) {
+      rows = data[1];
+      $('#archive_list').html(data[0]);
+      if (init) {
+  <?if ($display['resize']):?>
+        resize();
+  <?endif;?>
+        $('#archive_table').tablesorter({headers:{5:{sorter:false}},textAttribute:'data'});
+      } else {
+        $('#archive_table').trigger('update');
+      }
+      $('#archive_list .tablesorter-childRow td').hide();
+      for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
+      $('div.spinner.fixed').hide('slow');
     }
-    $('#archive_list .tablesorter-childRow td').hide();
-    for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
-    $('div.spinner.fixed').hide('slow');
+    setTimeout(archiveList,3000);
   });
 }
 function askConfirmation() {
diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index add289f75..c5abfa148 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -19,15 +19,16 @@ require_once "$docroot/webGui/include/Secure.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
 $dynamix = parse_plugin_cfg('dynamix',true);
-$filter = unscript($_GET['filter']??'');
-$files = glob("{$dynamix['notify']['path']}/archive/*.notify", GLOB_NOSORT);
+$filter  = unscript($_GET['filter']??false);
+$files   = glob("{$dynamix['notify']['path']}/archive/*.notify",GLOB_NOSORT);
+
 usort($files, function($a,$b){return filemtime($b)-filemtime($a);});
 
-$row = 1; $empty = true;
+$row = 1; $rows = 0;
 foreach ($files as $file) {
-  $fields = explode(PHP_EOL, file_get_contents($file));
+  $fields = file($file,FILE_IGNORE_NEW_LINES);
   if ($filter && $filter != substr($fields[4],11)) continue;
-  $empty = false;
+  $rows++;
   $archive = basename($file);
   if ($extra = count($fields)>6) {
     $td_ = "<td data='*' rowspan='3'><a href='#' onclick='openClose($row)'>"; $_td = "</a></td>";
@@ -48,5 +49,6 @@ foreach ($files as $file) {
     $row++;
   }
 }
-if ($empty) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'><em>"._("No notifications present")."</em></td><td></td></tr>";
+if ($rows==0) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'><em>"._("No notifications present")."</em></td><td></td></tr>";
+echo "\0$rows";
 ?>

From f14af88fa74cdcb860bd5b6058f30de443b3e570 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 13:54:02 +0100
Subject: [PATCH 03/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 1ce2a17cd..636d64f62 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -28,7 +28,7 @@ span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
 <script>
 var rows = [];
 var filter = "<?=unscript($_GET['filter']??'')?>";
-var rows = 0;
+var files = 0;
 
 Array.prototype.remove = function() {
   var val, a = arguments, L = a.length, ax;
@@ -56,8 +56,8 @@ function archiveList(init) {
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);
     data = data.split('\0');
-    if (rows != data[1]) {
-      rows = data[1];
+    if (files != data[1]) {
+      files = data[1];
       $('#archive_list').html(data[0]);
       if (init) {
   <?if ($display['resize']):?>

From 00685273138feb01ccacde874512906c575dbbf3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 14:03:03 +0100
Subject: [PATCH 04/20] Notifications: fixes and enhancements

---
 plugins/dynamix/include/NotificationsArchive.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index c5abfa148..25a03d139 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -30,7 +30,7 @@ foreach ($files as $file) {
   if ($filter && $filter != substr($fields[4],11)) continue;
   $rows++;
   $archive = basename($file);
-  if ($extra = count($fields)>6) {
+  if ($extra = count($fields)>5) {
     $td_ = "<td data='*' rowspan='3'><a href='#' onclick='openClose($row)'>"; $_td = "</a></td>";
   } else {
     $td_ = "<td data='*' style='white-space:nowrap'>"; $_td = "</td>";

From 56c2cb340e19c94d5de3b6e180181af8e56fdca1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 14:19:02 +0100
Subject: [PATCH 05/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 636d64f62..0bb9527ec 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -23,6 +23,7 @@ $filters = mk_option(0,'',_('No filter')).mk_option(0,'alert',_('Alerts')).mk_op
 <style>
 select.filter{margin:0}
 span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
+i.red-text{font-size:1.6rem}
 </style>
 
 <script>
@@ -108,7 +109,7 @@ $(function(){
 // Adjust the width of thead cells when window resizes
 </script>
 <table class="tablesorter left shift" id="archive_table">
-<thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><?if ($files):?><a href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_"><i class="fa fa-trash"></i></a><?endif;?></th></tr></thead>
+<thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><?if ($files):?><a href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_"><i class="fa fa-trash-o red-text"></i></a><?endif;?></th></tr></thead>
 <tbody id="archive_list"><tr><td colspan="6"></td></tr></tbody>
 </table>
 <input type="button" value="_(Done)_" onclick="done()">

From 7af9b92b63d1501c0b215bec9f96ace4e939a980 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 14:49:31 +0100
Subject: [PATCH 06/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 5 +++--
 plugins/dynamix/scripts/notify            | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 0bb9527ec..eb73691eb 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -57,6 +57,7 @@ function archiveList(init) {
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);
     data = data.split('\0');
+    if (data[1]>0) $('#deleteAll').show(); else $('#deleteAll').hide();
     if (files != data[1]) {
       files = data[1];
       $('#archive_list').html(data[0]);
@@ -70,8 +71,8 @@ function archiveList(init) {
       }
       $('#archive_list .tablesorter-childRow td').hide();
       for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
-      $('div.spinner.fixed').hide('slow');
     }
+    $('div.spinner.fixed').hide('slow');
     setTimeout(archiveList,3000);
   });
 }
@@ -109,7 +110,7 @@ $(function(){
 // Adjust the width of thead cells when window resizes
 </script>
 <table class="tablesorter left shift" id="archive_table">
-<thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><?if ($files):?><a href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_"><i class="fa fa-trash-o red-text"></i></a><?endif;?></th></tr></thead>
+<thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><a id="deleteAll" href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_" style="display:none"><i class="fa fa-trash-o red-text"></i></a></th></tr></thead>
 <tbody id="archive_list"><tr><td colspan="6"></td></tr></tbody>
 </table>
 <input type="button" value="_(Done)_" onclick="done()">
diff --git a/plugins/dynamix/scripts/notify b/plugins/dynamix/scripts/notify
index aa3fa077a..a2b28dd07 100755
--- a/plugins/dynamix/scripts/notify
+++ b/plugins/dynamix/scripts/notify
@@ -246,9 +246,8 @@ case 'get':
 
 case 'archive':
   if ($argc != 3) exit(usage());
-  if (strpos(realpath("$unread/{$argv[2]}"), $unread.'/') === 0) {
-    @unlink("$unread/{$argv[2]}");
-  }
+  $file = $argv[2];
+  if (strpos(realpath("$unread/$file"),$unread.'/')===0) @unlink("$unread/$file");
   break;
 }
 

From 08a33bbb7b332337590ddb8946a6183358339317 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 15:35:15 +0100
Subject: [PATCH 07/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page        |  9 +++------
 plugins/dynamix/include/DeleteLogFile.php        | 10 ++++++++--
 plugins/dynamix/include/NotificationsArchive.php |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index eb73691eb..5bd8bf2d5 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -29,7 +29,7 @@ i.red-text{font-size:1.6rem}
 <script>
 var rows = [];
 var filter = "<?=unscript($_GET['filter']??'')?>";
-var files = 0;
+var files = -1	;
 
 Array.prototype.remove = function() {
   var val, a = arguments, L = a.length, ax;
@@ -53,9 +53,7 @@ function resize(bind) {
 }
 <?endif;?>
 function archiveList(init) {
-  timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
-    clearTimeout(timers.archive);
     data = data.split('\0');
     if (data[1]>0) $('#deleteAll').show(); else $('#deleteAll').hide();
     if (files != data[1]) {
@@ -70,9 +68,8 @@ function archiveList(init) {
         $('#archive_table').trigger('update');
       }
       $('#archive_list .tablesorter-childRow td').hide();
-      for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
+      for (var i=0; i<rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
     }
-    $('div.spinner.fixed').hide('slow');
     setTimeout(archiveList,3000);
   });
 }
@@ -111,6 +108,6 @@ $(function(){
 </script>
 <table class="tablesorter left shift" id="archive_table">
 <thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><a id="deleteAll" href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_" style="display:none"><i class="fa fa-trash-o red-text"></i></a></th></tr></thead>
-<tbody id="archive_list"><tr><td colspan="6"></td></tr></tbody>
+<tbody id="archive_list"><tr><td colspan="6" style="padding-top:12px"><center>_(Wait)_</center></td></tr></tbody>
 </table>
 <input type="button" value="_(Done)_" onclick="done()">
diff --git a/plugins/dynamix/include/DeleteLogFile.php b/plugins/dynamix/include/DeleteLogFile.php
index 01a97e2f5..99c2d0dd7 100644
--- a/plugins/dynamix/include/DeleteLogFile.php
+++ b/plugins/dynamix/include/DeleteLogFile.php
@@ -15,20 +15,26 @@ $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once "$docroot/webGui/include/Wrappers.php";
 
 $dynamix = parse_plugin_cfg('dynamix',true);
+$unread  = $dynamix['notify']['path']."/unread/";
 $archive = $dynamix['notify']['path']."/archive";
 $log     = $_POST['log']??'';
 $filter  = $_POST['filter']??false;
 $files   = strpos($log,'*')===false ? [realpath("$archive/$log")] : glob("$archive/$log",GLOB_NOSORT);
 
+function delete_file(...$file) {
+  array_map('unlink',array_filter($file,'file_exists'));
+}
+
 foreach ($files as $file) {
   // check file path
   if (strncmp($file,$archive,strlen($archive))!==0) continue;
+  $list = $unread.basename($file);
   if (!$filter) {
     // delete all files
-    @unlink($file);
+    delete_file($file,$list);
   } else {
     // delete selective files
-    if (exec("grep -om1 'importance=$filter' ".escapeshellarg($file))) @unlink($file);
+    if (exec("grep -om1 'importance=$filter' ".escapeshellarg($file))) delete_file($file,$list);
   }
 }
 ?>
diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index 25a03d139..3437f0d1f 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -49,6 +49,6 @@ foreach ($files as $file) {
     $row++;
   }
 }
-if ($rows==0) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'><em>"._("No notifications present")."</em></td><td></td></tr>";
+if ($rows==0) echo "<tr><td colspan='6' style='padding-top:12px'><center><em>"._("No notifications present")."</em></center></td></tr>";
 echo "\0$rows";
 ?>

From 282355b403a4db9d389e137b51724bc856c95649 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 16:42:33 +0100
Subject: [PATCH 08/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page        | 10 +++++++---
 plugins/dynamix/include/NotificationsArchive.php |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 5bd8bf2d5..8c8f4a4a7 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -70,9 +70,13 @@ function archiveList(init) {
       $('#archive_list .tablesorter-childRow td').hide();
       for (var i=0; i<rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
     }
-    setTimeout(archiveList,3000);
+    timers.archivelist = setTimeout(archiveList,3000);
   });
 }
+function reloadList() {
+  clearTimeout(timers.archivelist);
+  archiveList();
+}
 function askConfirmation() {
   swal({
     title:"_(Are you sure)_?",
@@ -83,7 +87,7 @@ function askConfirmation() {
     confirmButtonText:"_(Proceed)_",
     cancelButtonText:"_(Cancel)_"
   },
-  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){archiveList();});});
+  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){reloadList();});});
 }
 function openClose(row) {
   var extra = '#archive_list .tablesorter-childRow.row'+row+' td';
@@ -96,7 +100,7 @@ function openClose(row) {
   }
 }
 $(function(){
-  $('span.left').append("<span class='right'><select class='filter narrow' onchange='filter=this.value;archiveList()'><?=$filters?></select></span>");
+  $('span.left').append("<span class='right'><select class='filter narrow' onchange='filter=this.value;reloadList()'><?=$filters?></select></span>");
   $('select.filter').val(filter);
   archiveList(true);
 <?if ($display['resize']):?>
diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index 3437f0d1f..51b1cabd6 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -42,7 +42,7 @@ foreach ($files as $file) {
     $tag = ($c<4) ? "" : " data='".str_replace(['alert','warning','normal'],['0','1','2'],$text)."'";
     echo (!$c++) ? "<tr>".str_replace('*',$text,$td_).date($dynamix['notify']['date'].' '.$dynamix['notify']['time'],$text)."$_td" : "<td$tag>"._($text)."</td>";
   }
-  echo "<td><a href='#' onclick='$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){archiveList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
+  echo "<td><a href='#' onclick='$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){reloadList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
   if ($extra) {
     $text = explode('=',$field,2)[1];
     echo "<tr class='tablesorter-childRow row$row'><td colspan='4'>$text</td><td></td></tr><tr class='tablesorter-childRow row$row'><td colspan='5'></td></tr>";

From 5c55043daab76da3afa04083ebe3ef27cee1c584 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 16:47:49 +0100
Subject: [PATCH 09/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 8c8f4a4a7..5e2067f6f 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -53,7 +53,9 @@ function resize(bind) {
 }
 <?endif;?>
 function archiveList(init) {
+  timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
+    clearTimeout(timers.archive);
     data = data.split('\0');
     if (data[1]>0) $('#deleteAll').show(); else $('#deleteAll').hide();
     if (files != data[1]) {
@@ -70,6 +72,7 @@ function archiveList(init) {
       $('#archive_list .tablesorter-childRow td').hide();
       for (var i=0; i<rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
     }
+    $('div.spinner.fixed').hide('slow');
     timers.archivelist = setTimeout(archiveList,3000);
   });
 }
@@ -112,6 +115,6 @@ $(function(){
 </script>
 <table class="tablesorter left shift" id="archive_table">
 <thead><tr><th>_(Time)_</th><th>_(Event)_</th><th>_(Subject)_</th><th>_(Description)_</th><th>_(Importance)_</th><th><a id="deleteAll" href="#" onclick="askConfirmation();return false" title="_(Delete all notifications)_" style="display:none"><i class="fa fa-trash-o red-text"></i></a></th></tr></thead>
-<tbody id="archive_list"><tr><td colspan="6" style="padding-top:12px"><center>_(Wait)_</center></td></tr></tbody>
+<tbody id="archive_list"><tr><td colspan="6"></td></tr></tbody>
 </table>
 <input type="button" value="_(Done)_" onclick="done()">

From be2dbed1caf35b8cf463c27813274d90bd1fff6f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:06:19 +0100
Subject: [PATCH 10/20] Notifications: fixes and enhancements

---
 plugins/dynamix/include/NotificationsArchive.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index 51b1cabd6..eb15a6343 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -42,7 +42,7 @@ foreach ($files as $file) {
     $tag = ($c<4) ? "" : " data='".str_replace(['alert','warning','normal'],['0','1','2'],$text)."'";
     echo (!$c++) ? "<tr>".str_replace('*',$text,$td_).date($dynamix['notify']['date'].' '.$dynamix['notify']['time'],$text)."$_td" : "<td$tag>"._($text)."</td>";
   }
-  echo "<td><a href='#' onclick='$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){reloadList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
+  echo "<td><a href='#' onclick='$(this).hide();$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){reloadList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
   if ($extra) {
     $text = explode('=',$field,2)[1];
     echo "<tr class='tablesorter-childRow row$row'><td colspan='4'>$text</td><td></td></tr><tr class='tablesorter-childRow row$row'><td colspan='5'></td></tr>";

From e39d0c57c840525de743018c151c751f2bdfcf83 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:13:03 +0100
Subject: [PATCH 11/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 5e2067f6f..e19dc710b 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -90,7 +90,7 @@ function askConfirmation() {
     confirmButtonText:"_(Proceed)_",
     cancelButtonText:"_(Cancel)_"
   },
-  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){reloadList();});});
+  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){$('#deleteAll').hide();reloadList();});});
 }
 function openClose(row) {
   var extra = '#archive_list .tablesorter-childRow.row'+row+' td';

From a129fcab6caaf04b9abe6045fc02365d350d903f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:18:02 +0100
Subject: [PATCH 12/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index e19dc710b..bd6644bad 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -29,7 +29,7 @@ i.red-text{font-size:1.6rem}
 <script>
 var rows = [];
 var filter = "<?=unscript($_GET['filter']??'')?>";
-var files = -1	;
+var files = -1;
 
 Array.prototype.remove = function() {
   var val, a = arguments, L = a.length, ax;

From 1144a655d4de1a348655061649649b9d58cf8ec9 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:21:05 +0100
Subject: [PATCH 13/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page        | 9 +++------
 plugins/dynamix/include/NotificationsArchive.php | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index bd6644bad..90384b432 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -53,6 +53,7 @@ function resize(bind) {
 }
 <?endif;?>
 function archiveList(init) {
+  if (!init) clearTimeout(timers.archivelist);
   timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);
@@ -76,10 +77,6 @@ function archiveList(init) {
     timers.archivelist = setTimeout(archiveList,3000);
   });
 }
-function reloadList() {
-  clearTimeout(timers.archivelist);
-  archiveList();
-}
 function askConfirmation() {
   swal({
     title:"_(Are you sure)_?",
@@ -90,7 +87,7 @@ function askConfirmation() {
     confirmButtonText:"_(Proceed)_",
     cancelButtonText:"_(Cancel)_"
   },
-  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){$('#deleteAll').hide();reloadList();});});
+  function(){$.post('/webGui/include/DeleteLogFile.php',{log:'*.notify',filter:filter},function(){$('#deleteAll').hide();archiveList();});});
 }
 function openClose(row) {
   var extra = '#archive_list .tablesorter-childRow.row'+row+' td';
@@ -103,7 +100,7 @@ function openClose(row) {
   }
 }
 $(function(){
-  $('span.left').append("<span class='right'><select class='filter narrow' onchange='filter=this.value;reloadList()'><?=$filters?></select></span>");
+  $('span.left').append("<span class='right'><select class='filter narrow' onchange='filter=this.value;archiveList()'><?=$filters?></select></span>");
   $('select.filter').val(filter);
   archiveList(true);
 <?if ($display['resize']):?>
diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php
index eb15a6343..f77a345fb 100644
--- a/plugins/dynamix/include/NotificationsArchive.php
+++ b/plugins/dynamix/include/NotificationsArchive.php
@@ -42,7 +42,7 @@ foreach ($files as $file) {
     $tag = ($c<4) ? "" : " data='".str_replace(['alert','warning','normal'],['0','1','2'],$text)."'";
     echo (!$c++) ? "<tr>".str_replace('*',$text,$td_).date($dynamix['notify']['date'].' '.$dynamix['notify']['time'],$text)."$_td" : "<td$tag>"._($text)."</td>";
   }
-  echo "<td><a href='#' onclick='$(this).hide();$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){reloadList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
+  echo "<td><a href='#' onclick='$(this).hide();$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){archiveList();});return false' title=\""._('Delete notification')."\"><i class='fa fa-trash-o'></i></a></td></tr>";
   if ($extra) {
     $text = explode('=',$field,2)[1];
     echo "<tr class='tablesorter-childRow row$row'><td colspan='4'>$text</td><td></td></tr><tr class='tablesorter-childRow row$row'><td colspan='5'></td></tr>";

From 6eab88423ec5ac689a8d7dc3bb58033258e12903 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 17:22:33 +0100
Subject: [PATCH 14/20] Notifications: fixes and enhancements

---
 plugins/dynamix/NotificationsArchive.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page
index 90384b432..f7227fac8 100644
--- a/plugins/dynamix/NotificationsArchive.page
+++ b/plugins/dynamix/NotificationsArchive.page
@@ -53,7 +53,7 @@ function resize(bind) {
 }
 <?endif;?>
 function archiveList(init) {
-  if (!init) clearTimeout(timers.archivelist);
+  clearTimeout(timers.archivelist);
   timers.archive = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/webGui/include/NotificationsArchive.php',{filter:filter},function(data) {
     clearTimeout(timers.archive);

From 9ae8d2daa567f07f99c84b64b346436e299393b6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 18:22:20 +0100
Subject: [PATCH 15/20] Dashboard: fix styling

---
 plugins/dynamix/include/DefaultPageLayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 4cf381564..7b2e4c4df 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -89,7 +89,7 @@ if ($themes2) {
 }
 $notes = '/var/tmp/unRAIDServer.txt';
 if (!file_exists($notes)) file_put_contents($notes,shell_exec("$docroot/plugins/dynamix.plugin.manager/scripts/plugin changes $docroot/plugins/unRAIDServer/unRAIDServer.plg"));
-$notes = "&nbsp;<span class='fa fa-info-circle fa-fw big blue-text' title='"._('View Release Notes')."' onclick=\"openChanges('showchanges $notes','"._('Release Notes')."')\"></span>";
+$notes = "&nbsp;<span class='big blue-text fa fa-info-circle fa-fw' title='"._('View Release Notes')."' onclick=\"openChanges('showchanges $notes','"._('Release Notes')."')\"></span>";
 ?>
 </style>
 

From 3f7316c60999c6b25abd742d3127a8ba73616f5b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 18 Feb 2023 20:30:50 +0100
Subject: [PATCH 16/20] PHP8 support

---
 plugins/dynamix/include/SmartInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/SmartInfo.php b/plugins/dynamix/include/SmartInfo.php
index 6ad409735..cdb735832 100644
--- a/plugins/dynamix/include/SmartInfo.php
+++ b/plugins/dynamix/include/SmartInfo.php
@@ -206,7 +206,7 @@ case "identify":
     echo "<tr><td>"._('Manufacturing date').":</td><td><input type='date' class='narrow' value='".($info['date']??'')."' onchange='disklog(\"$disk\",\"date\",this.value)'></td></tr>";
     echo "<tr><td>"._('Date of purchase').":</td><td><input type='date' class='narrow' value='".($info['purchase']??'')."' onchange='disklog(\"$disk\",\"purchase\",this.value)'></td></tr>";
     echo "<tr><td>"._('Warranty period').":</td><td><select class='noframe' onchange='disklog(\"$disk\",\"warranty\",this.value)'><option value=''>"._('unknown')."</option>";
-    foreach ($periods as $period) echo "<option value='$period'".($info['warranty']??''==$period?" selected":"").">$period "._('months')."</option>";
+    foreach ($periods as $period) echo "<option value='$period'".(($info['warranty']??'')==$period?" selected":"").">$period "._('months')."</option>";
     echo "</select></td></tr>";
   }
   break;

From 88f1b3986c01987a90666b08b61e152e7a060a04 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 19 Feb 2023 11:14:41 +0100
Subject: [PATCH 17/20] Dashboard: minor code optimization

---
 plugins/dynamix/DashStats.page | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 9bf0eed22..779e375a2 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -827,9 +827,9 @@ function loadlist(init) {
   }
   $.post('/webGui/include/DashboardApps.php',{display:'<?=$display['dashapps']?>',docker:'<?=$dockerd?>',vms:'<?=$libvirtd?>'},function(d) {
     var data = d.split('\0');
-    $('#docker_view').find('tr.updated').remove();
+    $('#docker_view tr.updated').remove();
     $('#docker_view').append(data[0]);
-    $('#vm_view').find('tr.updated').remove();
+    $('#vm_view tr.updated').remove();
     $('#vm_view').append(data[1]);
     if ($.cookie('my_apps')!=null) $('span.apps.stopped').hide(0,noApps());
     if ($.cookie('my_vms')!=null) $('span.vms.stopped').hide(0,noVMs());
@@ -1068,12 +1068,12 @@ function addProperties() {
   });
 }
 function showContent() {
-  var count = {'db-box1':$('table#db-box1').find('tbody').length, 'db-box2':$('table#db-box2').find('tbody').length, 'db-box3':$('table#db-box3').find('tbody').length}
+  var count = {'db-box1':$('table#db-box1 tbody').length, 'db-box2':$('table#db-box2 tbody').length, 'db-box3':$('table#db-box3 tbody').length}
   var inactive = $.cookie('inactive_content');
   if (inactive) {
     inactive = inactive.split(';');
     for (var n=0,x; x=inactive[n]; n++) {
-      var tbody = $('table.dashboard').find('tbody[sort="'+x+'"]');
+      var tbody = $('table.dashboard tbody[sort="'+x+'"]');
       var id = tbody.parent().prop('id');
       count[id]--;
       tbody.hide();
@@ -1150,10 +1150,10 @@ function LockButton() {
   if ($.cookie('lockbutton') == null) {
     $.cookie('lockbutton','lockbutton');
 <?if ($themes1):?>
-    $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
+    $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_");
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
 <?endif;?>
-    $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_");
+    $('div.nav-item.LockButton span').text("_(Lock sortable items)_");
     $('#db-box1,#db-box2,#db-box3').sortable({connectWith:'#db-box1,#db-box2,#db-box3'});
     $('table.dashboard').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
     receive:function(e,ui){
@@ -1171,10 +1171,10 @@ function LockButton() {
   } else {
     $.removeCookie('lockbutton');
 <?if ($themes1):?>
-    $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
+    $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_");
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
 <?endif;?>
-    $('div.nav-item.LockButton').find('span').text("_(Unlock sortable items)_");
+    $('div.nav-item.LockButton span').text("_(Unlock sortable items)_");
     $('table.dashboard').sortable('destroy');
   }
 }
@@ -1220,7 +1220,7 @@ dashboard.on('message',function(msg,meta) {
     var data = part[0].split('\0');
     var info = moreInfo(data,"_(Array)_");
     // array devices
-    $('#array_list').find('tr.updated').remove();
+    $('#array_list tr.updated').remove();
     $('#array_list').append(data[0]);
     $('#array_info').parent().css('display',info?'':'none');
     $('#array_info').html(info);
@@ -1230,7 +1230,7 @@ dashboard.on('message',function(msg,meta) {
     for (var i=0,t; t=text[i]; i++) {
       var data = t.split('\0');
       var info = moreInfo(data,"_(Cache)_");
-      $('#pool_list'+i).find('tr.updated').remove();
+      $('#pool_list'+i+' tr.updated').remove();
       $('#pool_list'+i).append(t);
       $('#pool_info'+i).parent().css('display',info?'':'none');
       $('#pool_info'+i).html(info);
@@ -1240,7 +1240,7 @@ dashboard.on('message',function(msg,meta) {
     // unassigned devices
     var data = part[2].split('\0');
     var info = moreInfo(data,"_(Unassigned)_");
-    $('#devs_list').find('tr.updated').remove();
+    $('#devs_list tr.updated').remove();
     $('#devs_list').append(data[0]);
     $('#devs_info').parent().css('display',info?'':'none');
     $('#devs_info').html(info);

From 04098b6395c6e3ea7b988519cf08587a0f8797a6 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 19 Feb 2023 16:22:46 +0100
Subject: [PATCH 18/20] Dashboard: fix styling

---
 plugins/dynamix/DashStats.page | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 779e375a2..26fc8bdcf 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -208,6 +208,7 @@ i.vpn{font-size:1.4rem!important;cursor:pointer}
 i.indent{display:inline-block;width:18px}
 i.f32{font-size:32px!important}
 i.f14{font-size:1.4rem!important}
+i.fa.orb{margin-left:0}
 i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
 i[class^="icon-u-"]{font-size:inherit}
 i#mycase[class^="case-"]{font-size:128px}

From 8e6ba07f3be725485740cf5e89d7c5e02ddee6da Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 19 Feb 2023 20:06:21 +0100
Subject: [PATCH 19/20] SMB: check both netBIOS and WSD

---
 plugins/dynamix/SMBWorkGroup.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/SMBWorkGroup.page b/plugins/dynamix/SMBWorkGroup.page
index 4d2feabd1..6e2a0e2ed 100644
--- a/plugins/dynamix/SMBWorkGroup.page
+++ b/plugins/dynamix/SMBWorkGroup.page
@@ -4,8 +4,8 @@ Tag="sitemap"
 Cond="($var['shareSMBEnabled']=='yes')"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, 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,
@@ -21,7 +21,7 @@ _(Workgroup)_:
 
 :smb_workgroup_help:
 
-<?if ($var['USE_NETBIOS']=="yes"):?>
+<?if ($var['USE_NETBIOS']=="yes" or $var['USE_WSD']=="yes"):?>
 _(Local master)_:
 : <select name="localMaster" <?if ($var['fsState']=="Started"):?>disabled<?endif;?>>
   <?=mk_option($var['localMaster'], "no", _('No'))?>

From 5d080d883698cc3b9006978c85ee98a004ee424a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 20 Feb 2023 00:40:52 +0100
Subject: [PATCH 20/20] Revert "SMB: check both netBIOS and WSD"

This reverts commit 8e6ba07f3be725485740cf5e89d7c5e02ddee6da.
---
 plugins/dynamix/SMBWorkGroup.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/SMBWorkGroup.page b/plugins/dynamix/SMBWorkGroup.page
index 6e2a0e2ed..4d2feabd1 100644
--- a/plugins/dynamix/SMBWorkGroup.page
+++ b/plugins/dynamix/SMBWorkGroup.page
@@ -4,8 +4,8 @@ Tag="sitemap"
 Cond="($var['shareSMBEnabled']=='yes')"
 ---
 <?PHP
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2020, Lime Technology
+ * Copyright 2012-2020, 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,
@@ -21,7 +21,7 @@ _(Workgroup)_:
 
 :smb_workgroup_help:
 
-<?if ($var['USE_NETBIOS']=="yes" or $var['USE_WSD']=="yes"):?>
+<?if ($var['USE_NETBIOS']=="yes"):?>
 _(Local master)_:
 : <select name="localMaster" <?if ($var['fsState']=="Started"):?>disabled<?endif;?>>
   <?=mk_option($var['localMaster'], "no", _('No'))?>