Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 9075bd28a708421bb27356bf987b5a2012596ba4..57728d32949ef64aab036fbd6f8ffd10531366f3 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -2,6 +2,7 @@
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
 require_once('include/forums.php');
+require_once('include/group.php');
 require_once("mod/proxy.php");
 
 function ping_init(&$a) {
@@ -34,7 +35,7 @@ function ping_init(&$a) {
 
                $home = 0;
                $network = 0;
-               $network_group = array();
+               $groups_unseen = array();
                $forums_unseen = array();
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
@@ -43,8 +44,9 @@ function ping_init(&$a) {
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
                                WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
+                               AND `item`.`contact-id` != %d
                                ORDER BY `item`.`created` DESC",
-                       intval(local_user())
+                       intval(local_user()), intval(local_user())
                );
 
                if(count($r)) {
@@ -87,20 +89,11 @@ function ping_init(&$a) {
                        }
                }
 
-               if ( $network )
-               {
-                       # Find out how unseen network posts are spread across groups
-                       $sql = "SELECT g.id, g.name, count(i.id) count " .
-                               "FROM `group` g, group_member gm, item i " .
-                               "WHERE g.uid = %d " .
-                               "AND i.uid = %d " .
-                               "AND i.unseen AND i.visible " .
-                               "AND NOT i.deleted " .
-                               "AND i.`contact-id` = gm.`contact-id` " .
-                               "AND gm.gid = g.id GROUP BY g.id";
-                       #echo '<SQL id="' . intval(local_user()) . '">' . $sql . '</SQL>';
-                       $network_group = q($sql, intval(local_user()), intval(local_user()));
-                       #echo '<COUNT R="' . count($network_group) . '"/>';
+               if($network) {
+                       if(intval(feature_enabled(local_user(),'groups'))) {
+                               // Find out how unseen network posts are spread across groups
+                               $groups_unseen = groups_count_unseen();
+                       }
 
                        if(intval(feature_enabled(local_user(),'forumlist_widget'))) {
                                $forums_unseen = forums_count_unseen();
@@ -226,9 +219,9 @@ function ping_init(&$a) {
                                <home>$home</home>\r\n";
                if ($register!=0) echo "<register>$register</register>";
 
-               if ( count($network_group) ) {
+               if ( count($groups_unseen) ) {
                        echo '<groups>';
-                       foreach ($network_group as $it) {
+                       foreach ($groups_unseen as $it) {
                                echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
                        }
                        echo "</groups>";