From d5d853f37f5b42d4b78f823ed0fb154064ee0e70 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 17 May 2012 19:35:24 -0700
Subject: setup delivery chain for private groups (work in progress)

---
 include/items.php | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index 129499967..51e21d289 100644
--- a/include/items.php
+++ b/include/items.php
@@ -959,6 +959,8 @@ function tag_deliver($uid,$item_id) {
 		return;
 
 	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
+
 
 	$i = q("select * from item where id = %d and uid = %d limit 1",
 		intval($item_id),
@@ -986,30 +988,33 @@ function tag_deliver($uid,$item_id) {
 		}
 	}
 
-	if(! $mention)
+	if((! $mention) && (! $prvgroup))
 		return;
 
-	// send a notification
-
-	require_once('include/enotify.php');
-	notification(array(
-		'type'         => NOTIFY_TAGSELF,
-		'notify_flags' => $u[0]['notify-flags'],
-		'language'     => $u[0]['language'],
-		'to_name'      => $u[0]['username'],
-		'to_email'     => $u[0]['email'],
-		'uid'          => $u[0]['uid'],
-		'item'         => $item,
-		'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
-		'source_name'  => $item['author-name'],
-		'source_link'  => $item['author-link'],
-		'source_photo' => $item['author-avatar'],
-		'verb'         => ACTIVITY_TAG,
-		'otype'        => 'item'
-	));
+	if($mention) {
 
-	if(! $community_page)
-		return;
+		// send a notification
+
+		require_once('include/enotify.php');
+		notification(array(
+			'type'         => NOTIFY_TAGSELF,
+			'notify_flags' => $u[0]['notify-flags'],
+			'language'     => $u[0]['language'],
+			'to_name'      => $u[0]['username'],
+			'to_email'     => $u[0]['email'],
+			'uid'          => $u[0]['uid'],
+			'item'         => $item,
+			'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
+			'source_name'  => $item['author-name'],
+			'source_link'  => $item['author-link'],
+			'source_photo' => $item['author-avatar'],
+			'verb'         => ACTIVITY_TAG,
+			'otype'        => 'item'
+		));
+
+		if(! $community_page)
+			return;
+	}
 
 	// tgroup delivery - setup a second delivery chain
 	// prevent delivery looping - only proceed
-- 
cgit v1.2.3