X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=2eb94576b375b47e13277a2f1cd1b7aa36795e9b;hb=a3960bda371c8083bad2ed422169282fed004d24;hp=adff0912f479af5c4d4c7deff73e332b8a9cfc40;hpb=44592611e1582fd97ae1988343418a0dae1ae2a0;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index adff0912f4..2eb94576b3 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");
@@ -220,19 +219,21 @@ function ping_init(&$a) {
 				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
 
-		if ( count($groups_unseen) ) {
+		if (count($groups_unseen)) {
 			echo '<groups>';
-			foreach ($groups_unseen as $it) {
-				echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
-			}
+			foreach ($groups_unseen as $it)
+				if ($it['count'] > 0)
+					echo '<group id="'.$it['id'].'">'.$it['count']."</group>";
+
 			echo "</groups>";
 		}
 
-		if ( count($forums_unseen) ) {
+		if (count($forums_unseen)) {
 			echo '<forums>';
-			foreach ($forums_unseen as $it) {
-				echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
-			}
+			foreach ($forums_unseen as $it)
+				if ($it['count'] > 0)
+					echo '<forum id="'.$it['id'].'">'.$it['count']."</forum>";
+
 			echo "</forums>";
 		}
 
@@ -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);
 }
-}