private forum issues
This commit is contained in:
parent
e8a7fb3d01
commit
ed7712cfbf
@ -389,7 +389,8 @@ function create_identity($arr) {
|
||||
dbesc( t('Friends') )
|
||||
);
|
||||
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'] . '>'),
|
||||
intval($newuid)
|
||||
);
|
||||
|
@ -98,6 +98,7 @@ function collect_recipients($item,&$private_envelope) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// This is a somewhat expensive operation but important.
|
||||
// Don't send this item to anybody who isn't allowed to see it
|
||||
|
||||
|
15
mod/item.php
15
mod/item.php
@ -257,10 +257,16 @@ function item_post(&$a) {
|
||||
killme();
|
||||
}
|
||||
|
||||
$walltowall = false;
|
||||
|
||||
if($observer) {
|
||||
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));
|
||||
if($webpage)
|
||||
$public_policy = '';
|
||||
@ -329,6 +335,15 @@ function item_post(&$a) {
|
||||
$str_group_deny = $channel['channel_deny_gid'];
|
||||
$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 {
|
||||
|
||||
// use the posted permissions
|
||||
|
@ -1 +1 @@
|
||||
2014-10-20.834
|
||||
2014-10-21.835
|
||||
|
Reference in New Issue
Block a user