X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=544aa446bbb4d073e6256a44f0c286209d40e946;hb=dc2e7a66b3cf9401afbc4cf425fc5a37c66d2d74;hp=0d1659a763f6b45cc882035e244aebd40358fae7;hpb=9330a6994c1b9aee49a482efe32e84ca1a944c9b;p=friendica.git
diff --git a/mod/ping.php b/mod/ping.php
index 0d1659a763..544aa446bb 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -5,7 +5,6 @@ require_once('include/ForumManager.php');
require_once('include/group.php');
require_once("mod/proxy.php");
-if(! function_exists('ping_init')) {
function ping_init(&$a) {
header("Content-type: text/xml");
@@ -206,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'])
);
@@ -220,19 +219,21 @@ function ping_init(&$a) {
$home\r\n";
if ($register!=0) echo "$register";
- if ( count($groups_unseen) ) {
+ if (count($groups_unseen)) {
echo '';
- foreach ($groups_unseen 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 "";
}
@@ -339,9 +340,7 @@ function ping_init(&$a) {
killme();
}
-}
-if(! function_exists('ping_get_notifications')) {
function ping_get_notifications($uid) {
$result = array();
@@ -392,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"]));
@@ -409,4 +412,3 @@ function ping_get_notifications($uid) {
return($result);
}
-}