harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

private forum issues

Browse Source
This commit is contained in:
friendica 2014-10-21 16:33:35 -07:00
parent e8a7fb3d01
commit ed7712cfbf
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/identity.php
View File

@ -389,7 +389,8 @@ function create_identity($arr) {
dbesc( t('Friends') ) dbesc( t('Friends') )
); );
if($r) { if($r) {
q("update channel set channel_allow_gid = '%s' where channel_id = %d limit 1", q("update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d limit 1",
dbesc($r[0]['hash']),
dbesc('<' . $r[0]['hash'] . '>'), dbesc('<' . $r[0]['hash'] . '>'),
intval($newuid) intval($newuid)
); );

1
include/items.php
View File

@ -98,6 +98,7 @@ function collect_recipients($item,&$private_envelope) {
} }
} }
// This is a somewhat expensive operation but important. // This is a somewhat expensive operation but important.
// Don't send this item to anybody who isn't allowed to see it // Don't send this item to anybody who isn't allowed to see it

15
mod/item.php
View File

@ -257,10 +257,16 @@ function item_post(&$a) {
killme(); killme();
} }
$walltowall = false;
if($observer) { if($observer) {
logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG); logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG);
if($observer['xchan_name'] != $owner_xchan['xchan_name'])
$walltowall = true;
} }
$public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true)); $public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true));
if($webpage) if($webpage)
$public_policy = ''; $public_policy = '';
@ -329,6 +335,15 @@ function item_post(&$a) {
$str_group_deny = $channel['channel_deny_gid']; $str_group_deny = $channel['channel_deny_gid'];
$str_contact_deny = $channel['channel_deny_cid']; $str_contact_deny = $channel['channel_deny_cid'];
} }
elseif($walltowall) {
// use the channel owner's default permissions
$str_group_allow = $channel['channel_allow_gid'];
$str_contact_allow = $channel['channel_allow_cid'];
$str_group_deny = $channel['channel_deny_gid'];
$str_contact_deny = $channel['channel_deny_cid'];
}
else { else {
// use the posted permissions // use the posted permissions

2
version.inc
View File

@ -1 +1 @@
2014-10-20.834 2014-10-21.835