aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-06-02 15:39:38 +0200
committerMario Vavti <mario@mariovavti.com>2018-06-02 15:39:38 +0200
commitdb0a3a753420e8722776094334759dd4ff61fc77 (patch)
treea031cb1a0972ade9addadeae6025787347bee1de /Zotlabs
parent53efd4e470f10e123209ed63b90213b20a87e011 (diff)
downloadvolse-hubzilla-db0a3a753420e8722776094334759dd4ff61fc77.tar.gz
volse-hubzilla-db0a3a753420e8722776094334759dd4ff61fc77.tar.bz2
volse-hubzilla-db0a3a753420e8722776094334759dd4ff61fc77.zip
some more work on forum notifications
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Ping.php13
-rw-r--r--Zotlabs/Widget/Notifications.php8
2 files changed, 15 insertions, 6 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index a43d9863e..941b7b286 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -673,14 +673,27 @@ class Ping extends \Zotlabs\Web\Controller {
dbesc($r1[$x]['xchan_hash'])
);
if($r[0]['unseen']) {
+ $r1[$x]['notify_link'] = z_root() . '/network/?f=&cid=' . $r1[$x]['abook_id'];
+ $r1[$x]['name'] = $r1[$x]['xchan_name'];
+ $r1[$x]['url'] = $r1[$x]['xchan_url'];
+ $r1[$x]['photo'] = $r1[$x]['xchan_photo_s'];
$r1[$x]['unseen'] = $r[0]['unseen'];
$r1['total'] = $r1['total'] + $r[0]['unseen'];
+
+ unset($r1[$x]['abook_id']);
+ unset($r1[$x]['xchan_hash']);
+ unset($r1[$x]['xchan_name']);
+ unset($r1[$x]['xchan_url']);
+ unset($r1[$x]['xchan_photo_s']);
}
else {
unset($r1[$x]);
}
}
$result['forums'] = $r1['total'];
+ unset($r1['total']);
+
+ $result['forums_sub'] = $r1;
}
$x = json_encode($result);
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 1be467ba6..a4cf4e706 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -118,12 +118,8 @@ class Notifications {
'severity' => 'secondary',
'label' => t('Forums'),
'title' => t('Forums'),
- 'viewall' => [
- //'url' => 'notifications/system',
- //'label' => t('View all notices')
- ],
- 'markall' => [
- //'label' => t('Mark all notices seen')
+ 'filter' => [
+ 'name_label' => t('Filter by name')
]
];
}