aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-04 17:36:13 -0700
committerredmatrix <git@macgirvin.com>2016-05-04 17:36:13 -0700
commit1b6bc5394b7cf8435928eaa2ace4e321f517ecb6 (patch)
tree0d1e8c70de7961b9332d4e624e134691c40fc84c /Zotlabs/Module/Network.php
parent50fb525b280069e4a95f9ae133b15460e8b02318 (diff)
parent8c9a773a90fc331f0b4d6ce44119abe1278fd8ea (diff)
downloadvolse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.tar.gz
volse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.tar.bz2
volse-hubzilla-1b6bc5394b7cf8435928eaa2ace4e321f517ecb6.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Network.php')
-rw-r--r--Zotlabs/Module/Network.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 77353da05..e4b936dc2 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -154,6 +154,14 @@ class Network extends \Zotlabs\Web\Controller {
}
nav_set_selected('network');
+
+ // I'm trying to make two points in this description text - warn about finality of wall
+ // post permissions, and try to clear up confusion that these permissions set who is
+ // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking
+ // the "Show" button on a group does not post it to the feed of people in that group, it
+ // mearly allows those people to view the post if they are viewing/following this channel.
+ $aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.');
+ $aclContextHelpCmd = 'acl_dialog_post';
$channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'],
@@ -161,7 +169,7 @@ class Network extends \Zotlabs\Web\Controller {
'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid']
);
-
+
$private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false);
$x = array(
@@ -170,7 +178,7 @@ class Network extends \Zotlabs\Web\Controller {
'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'],
'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
- 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
+ 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), $aclDesc, $aclContextHelpCmd),
'bang' => (($private_editing) ? '!' : ''),
'visitor' => true,
'profile_uid' => local_channel(),