Notifications: revised operation

- Autoclose new notifications after 3 seconds
- Fix notifications reappearing after closure
- Show notification counters permanently

plugins/dynamix/Notifications.page

@@ -115,14 +115,6 @@ $(function(){
 <input type="hidden" name="docker_notify">
 <input type="hidden" name="language_notify">
 <input type="hidden" name="report">
-_(Notifications display)_:
-: <select class="a" name="display">
-  <?=mk_option($notify['display'], "0", _("Detailed"))?>
-  <?=mk_option($notify['display'], "1", _("Summarized"))?>
-  </select>
-
-:notifications_display_help:
-
 _(Date format)_:
 : <select name="date" class="a">
   <?=mk_option($notify['date'], "d-m-Y", _("DD-MM-YYYY"))?>

plugins/dynamix/include/DefaultPageLayout.php

@@ -523,8 +523,9 @@ function openNotifier(filter) {
           group: notify.importance,
           header: notify.event+': '+notify.timestamp,
           theme: notify.file,
+          sticky: true,
           beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);},
-          beforeClose: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});}
+          close: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});}
         });
       }
     });
@@ -555,7 +556,6 @@ $(function() {
   updateTime();
   $.jGrowl.defaults.closeTemplate = '<i class="fa fa-close"></i>';
   $.jGrowl.defaults.closerTemplate = '<?=$notify['position'][0]=='b' ? '<div class="bottom">':'<div class="top">'?>[ <?=_("close all notifications")?> ]</div>';
-  $.jGrowl.defaults.sticky = true;
   $.jGrowl.defaults.check = 100;
   $.jGrowl.defaults.position = '<?=$notify['position']?>';
   $.jGrowl.defaults.themeState = '';
@@ -635,11 +635,11 @@ foreach ($buttons as $button) {
   // create list of nchan scripts to be started
   if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
 }
-if ($notify['display']) {
-  echo "<div id='nav-tub1' class='nav-user'><b id='box-tub1' class='system graybar'>0</b></div>";
-  echo "<div id='nav-tub2' class='nav-user'><b id='box-tub2' class='system graybar'>0</b></div>";
-  echo "<div id='nav-tub3' class='nav-user'><b id='box-tub3' class='system graybar'>0</b></div>";
-}
+
+echo "<div id='nav-tub1' class='nav-user'><b id='box-tub1' class='system graybar'>0</b></div>";
+echo "<div id='nav-tub2' class='nav-user'><b id='box-tub2' class='system graybar'>0</b></div>";
+echo "<div id='nav-tub3' class='nav-user'><b id='box-tub3' class='system graybar'>0</b></div>";
+
 if ($themes2) echo "</div>";
 echo "</div></div>";
 foreach ($buttons as $button) {
@@ -824,32 +824,29 @@ defaultPage.on('message', function(msg,meta) {
     var tub1 = 0, tub2 = 0, tub3 = 0;
     var data = $.parseJSON(msg);
     $.each(data, function(i, notify) {
-<?if ($notify['display']):?>
       switch (notify.importance) {
         case 'alert'  : tub1++; break;
         case 'warning': tub2++; break;
         case 'normal' : tub3++; break;
       }
-<?else:?>
-      $.jGrowl(notify.subject+'<br>'+notify.description, {
-        group: notify.importance,
-        header: notify.event+': '+notify.timestamp,
-        theme: notify.file,
-        click: function(e,m,o) {if (notify.link) location.replace(notify.link);},
-        beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);},
-        beforeClose: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});},
-        afterOpen: function(e,m,o){if (notify.link) $(e).css("cursor","pointer");}
-      });
-<?endif;?>
+      if (notify.show) {
+        $.jGrowl(notify.subject+'<br>'+notify.description, {
+          group: notify.importance,
+          header: notify.event+': '+notify.timestamp,
+          theme: notify.file,
+          click: function(e,m,o) {if (notify.link) location.replace(notify.link);},
+          beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);},
+          afterOpen: function(e,m,o){if (notify.link) $(e).css("cursor","pointer");},
+          close: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'hide',file:"<?=$notify['path'].'/unread/'?>"+notify.file,csrf_token:csrf_token});}
+        });
+      }
     });
-<?if ($notify['display']):?>
     $('#box-tub1').text(tub1);
     $('#box-tub2').text(tub2);
     $('#box-tub3').text(tub3);
     if (tub1) $('#box-tub1').removeClass('graybar').addClass('redbar'); else $('#box-tub1').removeClass('redbar').addClass('graybar');
     if (tub2) $('#box-tub2').removeClass('graybar').addClass('orangebar'); else $('#box-tub2').removeClass('orangebar').addClass('graybar');
     if (tub3) $('#box-tub3').removeClass('graybar').addClass('greenbar'); else $('#box-tub3').removeClass('greenbar').addClass('graybar');
-<?endif;?>
     break;
   }
 });
@@ -988,7 +985,6 @@ $(function() {
   addBannerWarning("<?=_('System notifications are')?> <b><?=_('disabled')?></b>. <?=_('Click')?> <a href='/Settings/Notifications'><?=_('here')?></a> <?=_('to change notification settings')?>.",true,true);
 <?endif;?>
 <?endif;?>
-<?if ($notify['display']):?>
   var opts = [];
   context.init({preventDoubleContext:false,left:true,above:false});
   opts.push({text:"<?=_('View')?>",icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('alert');}});
@@ -1015,7 +1011,7 @@ $(function() {
   opts.push({divider:true});
   opts.push({text:"<?=_('Acknowledge')?>",icon:'fa-check-square-o',action:function(e){e.preventDefault();closeNotifier('normal');}});
   context.attach('#nav-tub3',opts);
-<?endif;?>
+
   if (location.pathname.search(/\/(AddVM|UpdateVM|AddContainer|UpdateContainer)/)==-1) {
     $('blockquote.inline_help').each(function(i) {
       $(this).attr('id','helpinfo'+i);

plugins/dynamix/include/Notify.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.
  * Copyright 2012, Andrew Hamer-Adams, http://www.pixeleyes.co.nz.
  *
  * This program is free software; you can redistribute it and/or
@@ -46,6 +46,10 @@ case 'add':
 case 'get':
   echo shell_exec("$notify get");
   break;
+case 'hide':
+  $file = $_POST['file'];
+  if (file_exists($file)) chmod($file,0000);
+  break;
 case 'archive':
   shell_exec("$notify archive ".escapeshellarg($_POST['file']));
   break;

plugins/dynamix/scripts/notify

@@ -229,19 +229,19 @@ case 'get':
   usort($files, function($a,$b){return filemtime($a)-filemtime($b);});
   $i = 0;
   foreach ($files as $file) {
-    if (!is_readable($file)) continue;
     $fields = preg_split('/\n/', file_get_contents($file));
     $time = true;
+    $output[$i]['file'] = basename($file);
+    $output[$i]['show'] = fileperms($file)==32768 ? 0 : 1;
     foreach ($fields as $field) {
       if (!$field) continue;
-      list($key,$val) = explode('=', $field);
+      [$key,$val] = array_pad(explode('=', $field),2,'');
       if ($time) {$val = date($notify['date'].' '.$notify['time'], $val); $time = false;}
       $output[$i][trim($key)] = trim($val);
     }
-    $output[$i++]["file"] = basename($file);
-    chmod($file,0000);
+    $i++;
   }
-  echo json_encode($output, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+  echo json_encode($output, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE);
   break;
 
 case 'archive':