aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-17 22:18:35 -0700
committerredmatrix <git@macgirvin.com>2016-07-17 22:18:35 -0700
commitf7833411a10d79ce86ec9d47ce05e2c7fcf1968a (patch)
treea30d700cb60dcdf1498e22f0a1942bb457c866c7 /include/zot.php
parentde4f9d68bdaade902a8030888f9df035fa1329ec (diff)
downloadvolse-hubzilla-f7833411a10d79ce86ec9d47ce05e2c7fcf1968a.tar.gz
volse-hubzilla-f7833411a10d79ce86ec9d47ce05e2c7fcf1968a.tar.bz2
volse-hubzilla-f7833411a10d79ce86ec9d47ce05e2c7fcf1968a.zip
clone channel perms
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php15
1 files changed, 14 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index d506e96fe..9e0a4ffa1 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -12,6 +12,7 @@ require_once('include/crypto.php');
require_once('include/items.php');
require_once('include/hubloc.php');
require_once('include/queue_fn.php');
+require_once('include/perm_upgrade.php');
/**
@@ -2936,6 +2937,8 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
$channel = $r[0];
+ translate_channel_perms_outbound($channel);
+
if(intval($channel['channel_removed']))
return;
@@ -3132,6 +3135,8 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
+ translate_channel_perms_inbound($arr['channel']);
+
if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
// These flags cannot be sync'd.
// remove the bits from the incoming flags.
@@ -3145,7 +3150,15 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
- $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', 'channel_system');
+ $disallowed = [
+ 'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey',
+ 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted',
+ 'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook',
+ 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall',
+ 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall',
+ 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish',
+ 'channel_a_delegate'
+ ];
$clean = array();
foreach($arr['channel'] as $k => $v) {