X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fping.php;h=544aa446bbb4d073e6256a44f0c286209d40e946;hb=09931b71247c2261371a5a40b38a2127f79f344d;hp=967555881c0c1f5f535163fb1657b8ea9349a642;hpb=0278e606640247da48fb8600f18b963330f4ebef;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 967555881c..544aa446bb 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,7 +1,8 @@
' . $sql . '';
- $network_group = q($sql, intval(local_user()), intval(local_user()));
- #echo '';
+ 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 = '%s'."\n";
- return sprintf ( $notsxml,
- xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ $notsxml = '%s'."\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\r\n";
if ($register!=0) echo "$register";
- if ( count($network_group) ) {
+ if (count($groups_unseen)) {
echo '';
- foreach ($network_group as $it) {
- echo '' . $it['count'] . "";
- }
+ foreach ($groups_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
echo "";
}
- if ( count($forums_unseen) ) {
+ if (count($forums_unseen)) {
echo '';
- foreach ($forums_unseen as $it) {
- echo '' . $it['count'] . "";
- }
+ foreach ($forums_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
echo "";
}
@@ -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"]));