From 4b7f080c4647e5f0d6288b381169236a03791f19 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 3 Dec 2015 22:42:53 +0100 Subject: [PATCH] ping: further work --- include/group.php | 20 ++++++++++++++++---- mod/ping.php | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/group.php b/include/group.php index 7e417b0e65..64c74ba2d1 100644 --- a/include/group.php +++ b/include/group.php @@ -340,18 +340,30 @@ function groups_containing($uid,$c) { return $ret; } - +/** + * @brief count unread group items + * + * Count unread items of each groups + * + * @return array + * 'id' => contact id + * 'name' => group name + * 'count' => counted unseen group items + * + */ function groups_count_unseen() { - - $r = q("SELECT `group`.`id`, `group`.`name`, COUNT(`item`.id`) AS `count` FROM `group`, `group_member`, `item` + + $r = q("SELECT `group`.`id`, `group`.`name`, COUNT(`item`.`id`) AS `count` FROM `group`, `group_member`, `item` WHERE `group`.`uid` = %d AND `item`.`uid` = %d AND `item`.`unseen` AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`contact-id` = `group_member`.`contact-id` AND `group_member`.`gid` = `group`.`id` - GROUP BY `group.id` ", + GROUP BY `group`.`id` ", intval(local_user()), intval(local_user()) ); + + return $r; } \ No newline at end of file diff --git a/mod/ping.php b/mod/ping.php index f8faadff85..57728d3294 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -2,7 +2,7 @@ require_once("include/datetime.php"); require_once('include/bbcode.php'); require_once('include/forums.php'); -require_once('include/groupo.php'); +require_once('include/group.php'); require_once("mod/proxy.php"); function ping_init(&$a) {