diff options
| author | friendica <info@friendica.com> | 2012-05-17 19:35:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-05-17 19:35:24 -0700 |
| commit | d5d853f37f5b42d4b78f823ed0fb154064ee0e70 (patch) | |
| tree | b582e2b4606637a64cc28d86c49124c7b5dcee61 | |
| parent | 4f0e26759c2cc6cc08adc2bd94e85e4821194f2b (diff) | |
| download | volse-hubzilla-d5d853f37f5b42d4b78f823ed0fb154064ee0e70.tar.gz volse-hubzilla-d5d853f37f5b42d4b78f823ed0fb154064ee0e70.tar.bz2 volse-hubzilla-d5d853f37f5b42d4b78f823ed0fb154064ee0e70.zip | |
setup delivery chain for private groups (work in progress)
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 47 | ||||
| -rw-r--r-- | util/messages.po | 4 |
3 files changed, 29 insertions, 24 deletions
@@ -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 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 diff --git a/util/messages.po b/util/messages.po index eccf53ae6..51da2038f 100644 --- 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" |