X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=57728d32949ef64aab036fbd6f8ffd10531366f3;hb=2ca9d011fe2118293a53b0fda068b3ec27d34c4a;hp=e87ed985534bd0eaeccfc0a482857dd53f2ffc90;hpb=6fc864c947f85999056657b17dae14e4cd167ecb;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index e87ed98553..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,6 +35,8 @@ function ping_init(&$a) {
 
 		$home = 0;
 		$network = 0;
+		$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`,
@@ -40,8 +44,9 @@ function ping_init(&$a) {
 				FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
 				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
+				AND `item`.`contact-id` != %d
 				ORDER BY `item`.`created` DESC",
-			intval(local_user())
+			intval(local_user()), intval(local_user())
 		);
 
 		if(count($r)) {
@@ -84,6 +89,17 @@ function ping_init(&$a) {
 			}
 		}
 
+		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`,
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
 			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@@ -173,7 +189,7 @@ function ping_init(&$a) {
 		 *		'message' => notification message. "{0}" will be replaced by subject name
 		 **/
 		function xmlize($n){
-			$n['photo'] = proxy_url($n['photo']);
+			$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
 
 			$n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
 			$n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
@@ -186,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 = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
 			return sprintf ( $notsxml,
@@ -203,6 +219,22 @@ function ping_init(&$a) {
 				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
 
+		if ( count($groups_unseen) ) {
+			echo '<groups>';
+			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>
@@ -226,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;
 			}
@@ -339,7 +371,7 @@ function ping_get_notifications($uid) {
 			$quit = true;
 		else
 			$offset += 50;
-			
+
 
 		foreach ($r AS $notification) {
 			if (is_null($notification["visible"]))
@@ -362,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;
@@ -371,6 +403,6 @@ function ping_get_notifications($uid) {
 
 	} while ((count($result) < 50) AND !$quit);
 
-	
+
 	return($result);
 }