mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-13 14:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bergware
2020-01-15 10:37:47 +01:00
parent 3d7dcf54c9 53fd96aa07
commit 8622727b5c
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/dynamix/include/DefaultPageLayout.php
View File

@@ -299,8 +299,7 @@ function notifier() {
var tub1 = 0, tub2 = 0, tub3 = 0;
$.post('/webGui/include/Notify.php',{cmd:'get'},function(json) {
var data = $.parseJSON(json);
$.each(data, function(i, object) {
var notify = $.parseJSON(object);
$.each(data, function(i, notify) {
<?if ($notify['display']):?>
switch (notify.importance) {
case 'alert' : tub1++; break;
@@ -336,8 +335,7 @@ function digits(number) {
function openNotifier(filter) {
$.post('/webGui/include/Notify.php',{cmd:'get'},function(json) {
var data = $.parseJSON(json);
$.each(data, function(i, object) {
var notify = $.parseJSON(object);
$.each(data, function(i, notify) {
if (notify.importance == filter) {
$.jGrowl(notify.subject+'<br>'+notify.description, {
group: notify.importance,
@@ -354,8 +352,7 @@ function closeNotifier(filter) {
clearTimeout(timers.notifier);
$.post('/webGui/include/Notify.php',{cmd:'get'},function(json) {
var data = $.parseJSON(json);
$.each(data, function(i, object) {
var notify = $.parseJSON(object);
$.each(data, function(i, notify) {
if (notify.importance == filter) $.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file});
});
$('div.jGrowl').find('.'+filter).find('div.jGrowl-close').trigger('click');

7
plugins/dynamix/scripts/notify
View File

@@ -218,13 +218,12 @@ case 'get':
if (!$field) continue;
list($key,$val) = explode('=', $field);
if ($time) {$val = date($notify['date'].' '.$notify['time'], $val); $time = false;}
$output[$i][] = '\"'.trim($key).'\":\"'.trim($val).'\"';
$output[$i][trim($key)] = trim($val);
}
$output[$i++][] = '\"file\":\"'.basename($file).'\"';
$output[$i++]["file"] = basename($file);
chmod($file,0000);
}
for ($n=0; $n<$i; $n++) $json[] = '"{'.implode(',', $output[$n]).'}"';
echo '['.implode(',', $json).']';
echo json_encode($output, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
break;
case 'archive':