Merge pull request #2132 from rabuzarus/0112_vier_css

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 0b5e1c4c99573b62974250bbc16df1ae1bf731de..967555881c0c1f5f535163fb1657b8ea9349a642 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,7 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
+require_once('include/forums.php');
 require_once("mod/proxy.php");
 
 function ping_init(&$a) {
@@ -34,6 +35,7 @@ function ping_init(&$a) {
                $home = 0;
                $network = 0;
                $network_group = array();
+               $forums_unseen = array();
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
                                `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
@@ -41,8 +43,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)) {
@@ -99,6 +102,10 @@ function ping_init(&$a) {
                        #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(intval(feature_enabled(local_user(),'forumlist_widget'))) {
+                               $forums_unseen = forums_count_unseen();
+                       }
                }
 
                $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
@@ -203,8 +210,8 @@ function ping_init(&$a) {
                        if ($a->is_friendica_app() OR !$regularnotifications)
                                $n['message'] = str_replace("{0}", $n['name'], $n['message']);
 
-                       $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); 
-                               
+                       $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,
@@ -219,12 +226,21 @@ function ping_init(&$a) {
                                <net>$network</net>
                                <home>$home</home>\r\n";
                if ($register!=0) echo "<register>$register</register>";
+
                if ( count($network_group) ) {
-                       echo '<group_posts>';
+                       echo '<groups>';
                        foreach ($network_group as $it) {
                                echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
                        }
-                       echo "</group_posts>";
+                       echo "</groups>";
+               }
+
+               if ( count($forums_unseen) ) {
+                       echo '<forums>';
+                       foreach ($forums_unseen as $it) {
+                               echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
+                       }
+                       echo "</forums>";
                }
 
                echo "<all-events>$all_events</all-events>
@@ -250,41 +266,41 @@ function ping_init(&$a) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
                                        'name' => $i['name'],
-                                       'url' => $i['url'], 
+                                       'url' => $i['url'],
                                        'photo' => $i['photo'],
                                        'date' => $i['datetime'],
                                        'seen' => false,
-                                       'message' => t("{0} wants to be your friend"),                          
+                                       'message' => t("{0} wants to be your friend"),
                                );
                                $notifs[] = $n;
                        }
                }
-               
+
                if ($mail>0){
                        foreach ($mails as $i) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/message/'.$i['id'],
                                        'name' => $i['from-name'],
-                                       'url' => $i['from-url'], 
+                                       'url' => $i['from-url'],
                                        'photo' => $i['from-photo'],
                                        'date' => $i['created'],
                                        'seen' => false,
-                                       'message' => t("{0} sent you a message"),                               
+                                       'message' => t("{0} sent you a message"),
                                );
                                $notifs[] = $n;
                        }
                }
-               
+
                if ($register>0){
                        foreach ($regs as $i) {
                                $n = array(
                                        'href' => $a->get_baseurl().'/admin/users/',
                                        'name' => $i['name'],
-                                       'url' => $i['url'], 
+                                       'url' => $i['url'],
                                        'photo' => $i['micro'],
                                        'date' => $i['created'],
                                        'seen' => false,
-                                       'message' => t("{0} requested registration"),                           
+                                       'message' => t("{0} requested registration"),
                                );
                                $notifs[] = $n;
                        }
@@ -363,7 +379,7 @@ function ping_get_notifications($uid) {
                        $quit = true;
                else
                        $offset += 50;
-                       
+
 
                foreach ($r AS $notification) {
                        if (is_null($notification["visible"]))
@@ -386,7 +402,7 @@ function ping_get_notifications($uid) {
                                $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
 
                        $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
-                               
+
                        if ($notification["visible"] AND !$notification["spam"] AND
                                !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
                                $result[$notification["parent"]] = $notification;
@@ -395,6 +411,6 @@ function ping_get_notifications($uid) {
 
        } while ((count($result) < 50) AND !$quit);
 
-       
+
        return($result);
 }