X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=2eb94576b375b47e13277a2f1cd1b7aa36795e9b;hb=beb2346cfc8e3aa57ed0203e35034241e814b61a;hp=791ceed3519a6dc12d588a270f395431f5fb55fb;hpb=649578ae333e70280f8100b36f7d9e95cf27b64a;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 791ceed351..2eb94576b3 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,8 @@
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,
+ $notsxml = '%s'."\n";
+ return sprintf ( $notsxml, intval($n['id']),
xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
@@ -203,6 +219,24 @@ function ping_init(&$a) {
$home\r\n";
if ($register!=0) echo "$register";
+ if (count($groups_unseen)) {
+ echo '';
+ foreach ($groups_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
+ echo "";
+ }
+
+ if (count($forums_unseen)) {
+ echo '';
+ foreach ($forums_unseen as $it)
+ if ($it['count'] > 0)
+ echo ''.$it['count']."";
+
+ echo "";
+ }
+
echo "$all_events
$all_events_today
$events
@@ -226,41 +260,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;
}
@@ -339,7 +373,7 @@ function ping_get_notifications($uid) {
$quit = true;
else
$offset += 50;
-
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
@@ -357,12 +391,16 @@ 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"]));
$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;
@@ -371,6 +409,6 @@ function ping_get_notifications($uid) {
} while ((count($result) < 50) AND !$quit);
-
+
return($result);
}