X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=57728d32949ef64aab036fbd6f8ffd10531366f3;hb=e97a6dfb77f27c03da63d96a2995891f05856d0c;hp=a1648f835ff61e7ca16a0e2a73c8b8dd34f4db3b;hpb=ba158dfeb1eec1025c1af163077b1dd44238ea5c;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index a1648f835f..57728d3294 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,8 @@
' . $sql . '';
- $r = q(sql, intval(local_user()), intval(local_user()));
- #echo $r;
- foreach ($r as $it) {
- $network_group[] = $it;
+ 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();
}
}
@@ -206,8 +202,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 = '%s'."\n";
return sprintf ( $notsxml,
@@ -222,14 +218,23 @@ function ping_init(&$a) {
$network
$home\r\n";
if ($register!=0) echo "$register";
- if ( count($network_group) ) {
- echo '';
- foreach ($network_group as $it) {
+
+ if ( count($groups_unseen) ) {
+ echo '';
+ foreach ($groups_unseen as $it) {
echo '' . $it['count'] . "";
}
echo "";
}
+ if ( count($forums_unseen) ) {
+ echo '';
+ foreach ($forums_unseen as $it) {
+ echo '' . $it['count'] . "";
+ }
+ echo "";
+ }
+
echo "$all_events
$all_events_today
$events
@@ -253,41 +258,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;
}
@@ -366,7 +371,7 @@ function ping_get_notifications($uid) {
$quit = true;
else
$offset += 50;
-
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
@@ -389,7 +394,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;
@@ -398,6 +403,6 @@ function ping_get_notifications($uid) {
} while ((count($result) < 50) AND !$quit);
-
+
return($result);
}