aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Channel.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-06 08:54:55 +1000
committerredmatrix <git@macgirvin.com>2016-05-06 08:54:55 +1000
commitf38c8e5eca119266ee7f4fb7b6fbfd19c1ac747e (patch)
tree061fb8b85f05f8dc7829a4a7e8593fce20c223c5 /Zotlabs/Module/Channel.php
parent8ffdc4859baa9f2ae9567a4c443dfbb227919167 (diff)
parent2174cdcd0ebda4ba62653791489f003bf085f282 (diff)
downloadvolse-hubzilla-f38c8e5eca119266ee7f4fb7b6fbfd19c1ac747e.tar.gz
volse-hubzilla-f38c8e5eca119266ee7f4fb7b6fbfd19c1ac747e.tar.bz2
volse-hubzilla-f38c8e5eca119266ee7f4fb7b6fbfd19c1ac747e.zip
Merge pull request #368 from Treer/permissions
Unify permissions dialog for network posts, channel posts, and remote posts
Diffstat (limited to 'Zotlabs/Module/Channel.php')
-rw-r--r--Zotlabs/Module/Channel.php10
1 files changed, 1 insertions, 9 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index d0c6d83d8..47c5f31fb 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -126,21 +126,13 @@ function get($update = 0, $load = false) {
if($perms['post_wall']) {
- // 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';
-
$x = array(
'is_owner' => $is_owner,
'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(\App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
'nickname' => \App::$profile['channel_address'],
'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
- 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), $aclDesc, $aclContextHelpCmd) : ''),
+ 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
'showacl' => (($is_owner) ? 'yes' : ''),
'bang' => '',
'visitor' => (($is_owner || $observer) ? true : false),