Merge pull request #2536 from annando/1605-more-frio

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 967555881c0c1f5f535163fb1657b8ea9349a642..544aa446bbb4d073e6256a44f0c286209d40e946 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,7 +1,8 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
-require_once('include/forums.php');
+require_once('include/ForumManager.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`,
@@ -88,23 +89,14 @@ 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();
+                               $forums_unseen = ForumManager::count_unseen_items();
                        }
                }
 
@@ -213,9 +205,9 @@ function ping_init(&$a) {
                        $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
 
                        call_hooks('ping_xmlize', $n);
-                       $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
-                       return sprintf ( $notsxml,
-                               xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+                       $notsxml = '<note id="%d" href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
+                       return sprintf ( $notsxml, intval($n['id']),
+                               xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
                                xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
                                xmlify($n['message'])
                        );
@@ -227,19 +219,21 @@ 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) {
-                               echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
-                       }
+                       foreach ($groups_unseen as $it)
+                               if ($it['count'] > 0)
+                                       echo '<group id="'.$it['id'].'">'.$it['count']."</group>";
+
                        echo "</groups>";
                }
 
-               if ( count($forums_unseen) ) {
+               if (count($forums_unseen)) {
                        echo '<forums>';
-                       foreach ($forums_unseen as $it) {
-                               echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
-                       }
+                       foreach ($forums_unseen as $it)
+                               if ($it['count'] > 0)
+                                       echo '<forum id="'.$it['id'].'">'.$it['count']."</forum>";
+
                        echo "</forums>";
                }
 
@@ -397,7 +391,11 @@ function ping_get_notifications($uid) {
                        // Replace the name with {0} but ensure to make that only once
                        // The {0} is used later and prints the name in bold.
 
-                       $pos = strpos($notification["message"],$notification['name']);
+                       if ($notification['name'] != "")
+                               $pos = strpos($notification["message"],$notification['name']);
+                       else
+                               $pos = false;
+
                        if ($pos !== false)
                                $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));