X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=8cbfd308e67aa3792a0a5329617ae84efa609fe7;hb=b888382cc6cc2b2b123ef06abefe4ea10c2620d5;hp=ee5be67f6b6cee847393af5dcba0fba671231364;hpb=100f6343ad4d5bf5cf51872d149f5439a3f93f63;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index ee5be67f6b..8cbfd308e6 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
-
+require_once("mod/proxy.php");
 
 function ping_init(&$a) {
 
@@ -21,12 +21,7 @@ function ping_init(&$a) {
 			killme();
 		}
 
-		$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
-
-		// Are the nofications calles from the regular process or via the friendica app?
-		$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
-
-		$z = ping_get_notifications(local_user(), $regularnotifications);
+		$notifs = ping_get_notifications(local_user());
 		$sysnotify = 0; // we will update this in a moment
 
 		$tags = array();
@@ -38,6 +33,7 @@ function ping_init(&$a) {
 
 		$home = 0;
 		$network = 0;
+		$network_group = 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`,
@@ -45,8 +41,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)) {
@@ -89,6 +86,22 @@ 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) . '"/>';
+		}
+
 		$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
 			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@@ -165,15 +178,40 @@ function ping_init(&$a) {
 		}
 
 
+		/**
+		 * return xml from notification array
+		 *
+		 * @param array $n Notification array:
+		 *		'href' => notification link
+		 *		'name' => subject name
+		 *		'url' => subject url
+		 *		'photo' => subject photo
+		 *		'date' => notification date
+		 *		'seen' => bool true/false
+		 *		'message' => notification message. "{0}" will be replaced by subject name
+		 **/
+		function xmlize($n){
+			$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");
+
+			// Are the nofications calles from the regular process or via the friendica app?
+			$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
+
+			$a = get_app();
+
+			if ($a->is_friendica_app() OR !$regularnotifications)
+				$n['message'] = str_replace("{0}", $n['name'], $n['message']);
 
-		function xmlize($href, $name, $url, $photo, $date, $seen, $message){
-			require_once("mod/proxy.php");
-			$photo = proxy_url($photo);
-			$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
-			call_hooks('ping_xmlize', $data);
-			$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
+			$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,
-				xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
+				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'])
 			);
 		}
 
@@ -182,6 +220,13 @@ function ping_init(&$a) {
 				<net>$network</net>
 				<home>$home</home>\r\n";
 		if ($register!=0) echo "<register>$register</register>";
+		if ( count($network_group) ) {
+			echo '<groups>';
+			foreach ($network_group as $it) {
+				echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
+			}
+			echo "</groups>";
+		}
 
 		echo "<all-events>$all_events</all-events>
 			<all-events-today>$all_events_today</all-events-today>
@@ -190,99 +235,79 @@ function ping_init(&$a) {
 			<birthdays>$birthdays</birthdays>
 			<birthdays-today>$birthdays_today</birthdays-today>\r\n";
 
-		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 
-		if($firehose) {
-			echo '	<notif count="'.$tot.'">';
-		}
-		else {
-			if(count($z) && (! $sysnotify)) {
-				foreach($z as $zz) {
-					if($zz['seen'] == 0)
-						$sysnotify ++;
-				}
-			}
-
-			echo '	<notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
-
-			if ($intro>0){
-				foreach ($intros as $i) {
-					echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', "&rarr; ".t("{0} wants to be your friend"));
-				};
-			}
-			if ($mail>0){
-				foreach ($mails as $i) {
-					echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',"&rarr; ".t("{0} sent you a message"));
-				};
-			}
-			if ($register>0){
-				foreach ($regs as $i) {
-					echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', "&rarr; ".t("{0} requested registration"));
-				};
+		if(count($notifs) && (! $sysnotify)) {
+			foreach($notifs as $zz) {
+				if($zz['seen'] == 0)
+					$sysnotify ++;
 			}
+		}
 
-			if(count($z)) {
-				foreach($z as $zz) {
-					echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '&rarr; ') .strip_tags(bbcode($zz['msg'])));
-				}
+		echo '	<notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
+
+		// merge all notification types in one array
+		if ($intro>0){
+			foreach ($intros as $i) {
+				$n = array(
+					'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
+					'name' => $i['name'],
+					'url' => $i['url'],
+					'photo' => $i['photo'],
+					'date' => $i['datetime'],
+					'seen' => false,
+					'message' => t("{0} wants to be your friend"),
+				);
+				$notifs[] = $n;
 			}
 		}
 
-		if($firehose) {
-			if ($intro>0){
-				foreach ($intros as $i) {
-					echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") );
-				};
-			}
-			if ($mail>0){
-				foreach ($mails as $i) {
-					echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") );
-				};
-			}
-			if ($register>0){
-				foreach ($regs as $i) {
-					echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") );
-				};
+		if ($mail>0){
+			foreach ($mails as $i) {
+				$n = array(
+					'href' => $a->get_baseurl().'/message/'.$i['id'],
+					'name' => $i['from-name'],
+					'url' => $i['from-url'],
+					'photo' => $i['from-photo'],
+					'date' => $i['created'],
+					'seen' => false,
+					'message' => t("{0} sent you a message"),
+				);
+				$notifs[] = $n;
 			}
+		}
 
-			if (count($comments)){
-				foreach ($comments as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) );
-				};
-			}
-			if (count($likes)){
-				foreach ($likes as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) );
-				};
-			}
-			if (count($dislikes)){
-				foreach ($dislikes as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) );
-				};
-			}
-			if (count($friends)){
-				foreach ($friends as $i) {
-					echo xmlize($a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'],$i['author-name'],$i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) );
-				};
+		if ($register>0){
+			foreach ($regs as $i) {
+				$n = array(
+					'href' => $a->get_baseurl().'/admin/users/',
+					'name' => $i['name'],
+					'url' => $i['url'],
+					'photo' => $i['micro'],
+					'date' => $i['created'],
+					'seen' => false,
+					'message' => t("{0} requested registration"),
+				);
+				$notifs[] = $n;
 			}
-			if (count($posts)){
-				foreach ($posts as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} posted") ) );
-				};
-			}
-			if (count($tags)){
-				foreach ($tags as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
-				};
+		}
+		// sort notifications by $[]['date']
+		$sort_function = function($a, $b) {
+			$adate = date($a['date']);
+			$bdate = date($b['date']);
+			if ($adate == $bdate) {
+				return 0;
 			}
+			return ($adate < $bdate) ? 1 : -1;
+		};
+		usort($notifs, $sort_function);
 
-			if (count($cit)){
-				foreach ($cit as $i) {
-					echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',t("{0} mentioned you in a post") );
-				};
+		if(count($notifs)) {
+			foreach($notifs as $n) {
+				echo xmlize($n);
 			}
 		}
 
+
 		echo "  </notif>";
 	}
 	echo " <sysmsgs>";
@@ -307,15 +332,17 @@ function ping_init(&$a) {
 	killme();
 }
 
-function ping_get_notifications($uid, $regularnotifications) {
+function ping_get_notifications($uid) {
 
 	$result = array();
 	$offset = 0;
 	$seen = false;
 	$seensql = "NOT";
-	$order = "";
+	$order = "DESC";
 	$quit = false;
 
+	$a = get_app();
+
 	do {
 		$r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
 			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
@@ -338,6 +365,7 @@ function ping_get_notifications($uid, $regularnotifications) {
 		else
 			$offset += 50;
 
+
 		foreach ($r AS $notification) {
 			if (is_null($notification["visible"]))
 				$notification["visible"] = true;
@@ -348,24 +376,26 @@ function ping_get_notifications($uid, $regularnotifications) {
 			if (is_null($notification["deleted"]))
 				$notification["deleted"] = 0;
 
-			$notification["msg"] = strip_tags(bbcode($notification["msg"]));
+			$notification["message"] = strip_tags(bbcode($notification["msg"]));
 			$notification["name"] = strip_tags(bbcode($notification["name"]));
 
 			// Replace the name with {0} but ensure to make that only once
 			// The {0} is used later and prints the name in bold.
-			// But don't do it for the android app.
-			$pos = strpos($notification["msg"],$notification['name']);
-			if (($pos !== false) AND $regularnotifications)
-				$notification["msg"] = substr_replace($notification["msg"],"{0}",$pos,strlen($notification["name"]));
-			else
-				$notification["msg"] = str_replace("{0}", $notification["name"], $notification["msg"]);
+
+			$pos = strpos($notification["message"],$notification['name']);
+			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"]]))
+				!$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
 				$result[$notification["parent"]] = $notification;
+			}
 		}
 
 	} while ((count($result) < 50) AND !$quit);
 
+
 	return($result);
 }