diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index c74e6e0e9c3dcfd77636fb7c962d1ba1810e5596..b7aaed4e44a41bcc4d0ff9b882afb77103a9ceea 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -740,7 +740,8 @@ class db extends mysqli global $app; $return = array('count' => 0, 'entries' => array()); - if($_SESSION['s']['user']['typ'] == 'admin') return $return; // these information should not be displayed to admin users + //if($_SESSION['s']['user']['typ'] == 'admin') return $return; // these information should not be displayed to admin users + // removed in favor of new non intrusive datalogstatus notification header if($login == '' && isset($_SESSION['s']['user'])) { $login = $_SESSION['s']['user']['username']; diff --git a/interface/web/datalogstatus.php b/interface/web/datalogstatus.php new file mode 100644 index 0000000000000000000000000000000000000000..0263605d9765a34d382ee6485edc056c07c1bd3c --- /dev/null +++ b/interface/web/datalogstatus.php @@ -0,0 +1,43 @@ +db->datalogStatus()); +echo ($datalogstatus); +?> diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js index c20685fe06ad8ee54f6ba03cb691b78f73e73528..6db423ba238105f058d073abbd82f6a6ff51b9c7 100644 --- a/interface/web/themes/default/assets/javascripts/ispconfig.js +++ b/interface/web/themes/default/assets/javascripts/ispconfig.js @@ -346,6 +346,7 @@ var ISPConfig = { ISPConfig.loadMenus(); ISPConfig.keepalive(); + ISPConfig.datalognotification(); setTimeout(function() { try { $('form#pageForm').find('input[name="username"]').focus(); @@ -493,7 +494,34 @@ var ISPConfig = { } }); }, - + datalognotification: function() { + var notificationContent = $.ajax({ + type: "GET", + url: "datalogstatus.php", + dataType: "json", + success: function(data, textStatus, jqXHR) { + var dataLogItems = []; + $.each( data['entries'], function( key, val ) { + dataLogItems.push('
  • ' + val['text'] + ': ' + val['count'] + '
    • '); + }); + if(data['count'] > 0) { + $('.modal-body').html(dataLogItems.join("")); + $('.notification_text').text(data['count']); + $('.notification').css('display',''); + setTimeout( function() { ISPConfig.datalognotification(); }, 2000 ); + } else { + $('.notification').css('display','none'); + $('.modal-body').html(''); + setTimeout( function() { ISPConfig.datalognotification(); }, 5000 ); + } + }, + error: function() { + ISPConfig.reportError('Notification not loading, aborting.'); + $('.notification').css('display','none'); + } + }); + }, + addAdditionalTemplate: function(){ var tpl_add = $('#template_additional').val(); var addTemplate = $('#tpl_add_select').val().split('|',2); @@ -701,7 +729,6 @@ $(document).on("click", "[data-uncheck-fields] > input[type='checkbox']", functi } }); - $(document).on('ready', function () { $.fn.extend({ insertAtCaret: function(myValue){ @@ -779,3 +806,4 @@ $(document).on('ready', function () { return iCaretPos; }; }); + diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.min.js b/interface/web/themes/default/assets/javascripts/ispconfig.min.js index 0dd4a563be185f3fc2684b375d47a0453b94c13f..45cea0ec312201c4f61ff48f5fde47e5a44372bb 100644 --- a/interface/web/themes/default/assets/javascripts/ispconfig.min.js +++ b/interface/web/themes/default/assets/javascripts/ispconfig.min.js @@ -1 +1 @@ -var ISPConfig={pageFormChanged:!1,tabChangeWarningTxt:"",tabChangeDiscardTxt:"",tabChangeWarning:!1,tabChangeDiscard:!1,requestsRunning:0,indicatorCompleted:!1,registeredHooks:new Array,new_tpl_add_id:0,options:{useLoadIndicator:!1,useComboBox:!1},setOption:function(a,b){ISPConfig.options[a]=b},setOptions:function(a){$.extend(ISPConfig.options,a)},reportError:function(){},registerHook:function(a,b){ISPConfig.registeredHooks[a]||(ISPConfig.registeredHooks[a]=new Array);var c=ISPConfig.registeredHooks[a].length;ISPConfig.registeredHooks[a][c]=b},callHook:function(a,b){if(ISPConfig.registeredHooks[a])for(var c=0;c