From b2e0b6f11d82aa10ef844fc99a6e1946071edd18 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 4 May 2014 17:28:43 +0200 Subject: system notifications mark seen link --- mod/notifications.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod') diff --git a/mod/notifications.php b/mod/notifications.php index f327c2fe2..1a4a2b6a9 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -95,6 +95,7 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl,array( '$notif_header' => t('System Notifications'), + '$notif_link_mark_seen' => t('Mark all system notifications seen'), '$notif_content' => $notif_content, )); -- cgit v1.2.3 From f7c77c7821fd11afda7c19b5d21a4d6677fc1aa4 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 4 May 2014 18:17:11 +0200 Subject: Add link to system notifications page to mark notifications seen --- mod/notifications.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mod') diff --git a/mod/notifications.php b/mod/notifications.php index 1a4a2b6a9..09f89e88a 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -81,6 +81,7 @@ function notifications_content(&$a) { ); if (count($r) > 0) { + $notifications_available =1; foreach ($r as $it) { $notif_content .= replace_macros($not_tpl,array( '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], @@ -97,6 +98,7 @@ function notifications_content(&$a) { '$notif_header' => t('System Notifications'), '$notif_link_mark_seen' => t('Mark all system notifications seen'), '$notif_content' => $notif_content, + '$notifications_available' => $notifications_available, )); return $o; -- cgit v1.2.3 From b472cc0fd3353eb965ed758d3f7e8ba5641c18c1 Mon Sep 17 00:00:00 2001 From: sasiflo Date: Sun, 4 May 2014 20:42:05 +0200 Subject: ifpending repaired again. Hope it works as intended now. --- mod/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/connections.php b/mod/connections.php index b9605da01..3c3a704b2 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -213,7 +213,7 @@ function connections_content(&$a) { nav_set_selected('intros'); break; case 'ifpending': - $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) and not (xchan_flags & %d )", + $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))", intval(local_user()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), -- cgit v1.2.3