some more work on forum notifications

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')
 				]
 			];
 		}