X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=57728d32949ef64aab036fbd6f8ffd10531366f3;hb=f4173d17649afc81c14278941cd046f958818d93;hp=8cbfd308e67aa3792a0a5329617ae84efa609fe7;hpb=573a441d83169afa90bc564add3b7ff753ac2f7b;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 8cbfd308e6..57728d3294 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,8 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
+require_once('include/forums.php');
+require_once('include/group.php');
 require_once("mod/proxy.php");
 
 function ping_init(&$a) {
@@ -33,7 +35,8 @@ function ping_init(&$a) {
 
 		$home = 0;
 		$network = 0;
-		$network_group = array();
+		$groups_unseen = array();
+		$forums_unseen = array();
 
 		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
 				`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
@@ -86,20 +89,15 @@ function ping_init(&$a) {
 			}
 		}
 
-		if ( $network )
-		{
-			# Find out how unseen network posts are spread across groups
-			$sql = "SELECT g.id, g.name, count(i.id) count " .
-				"FROM `group` g, group_member gm, item i " .
-				"WHERE g.uid = %d " .
-				"AND i.uid = %d " .
-				"AND i.unseen AND i.visible " .
-				"AND NOT i.deleted " .
-				"AND i.`contact-id` = gm.`contact-id` " .
-				"AND gm.gid = g.id GROUP BY g.id";
-			#echo '<SQL id="' . intval(local_user()) . '">' . $sql . '</SQL>';
-			$network_group = q($sql, intval(local_user()), intval(local_user()));
-			#echo '<COUNT R="' . count($network_group) . '"/>';
+		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();
+			}
 		}
 
 		$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
@@ -220,14 +218,23 @@ function ping_init(&$a) {
 				<net>$network</net>
 				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
-		if ( count($network_group) ) {
+
+		if ( count($groups_unseen) ) {
 			echo '<groups>';
-			foreach ($network_group as $it) {
+			foreach ($groups_unseen as $it) {
 				echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
 			}
 			echo "</groups>";
 		}
 
+		if ( count($forums_unseen) ) {
+			echo '<forums>';
+			foreach ($forums_unseen as $it) {
+				echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
+			}
+			echo "</forums>";
+		}
+
 		echo "<all-events>$all_events</all-events>
 			<all-events-today>$all_events_today</all-events-today>
 			<events>$events</events>