setup delivery chain for private groups (work in progress)

diff --git a/boot.php b/boot.php
index abf335aa0a66a905e7669a9e1d3149efa9da1f9c..4032f26626c5fbba3eaf608afadf49ba97cd1c75 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1344' );
+define ( 'FRIENDICA_VERSION',      '3.0.1345' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1143      );
 

diff --git a/include/items.php b/include/items.php
index 129499967abf0047e9967126f6b90a38e04142f4..51e21d289b3bc8aeb2d308e00775332127de7647 100644 (file)
--- 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

diff --git a/util/messages.po b/util/messages.po
index eccf53ae6d04c57e3419ff4e786447d59c6b18e6..51da2038fc67aea9444fc206a3903b0d5dbf9857 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1344\n"
+"Project-Id-Version: 3.0.1345\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 10:00-0700\n"
+"POT-Creation-Date: 2012-05-17 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"