diff options
| author | redmatrix <mike@macgirvin.com> | 2016-08-31 19:22:47 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-08-31 19:22:47 -0700 |
| commit | d18a8e849e5cd3b34ce53a2ea57a7ec8da86b829 (patch) | |
| tree | 553b247f3cfa44d9cc04b4ee06d979e58f1b7226 | |
| parent | c3fdd00aa458523d24b4b897845243f00a4e1769 (diff) | |
| download | volse-hubzilla-d18a8e849e5cd3b34ce53a2ea57a7ec8da86b829.tar.gz volse-hubzilla-d18a8e849e5cd3b34ce53a2ea57a7ec8da86b829.tar.bz2 volse-hubzilla-d18a8e849e5cd3b34ce53a2ea57a7ec8da86b829.zip | |
Do not allow PERMS_PUBLIC as a choice for writable permission limits. Change text of buttons in expert mode for consistency with usage ('Channel Permission Limits' and 'Default Access Control List (ACL)').
| -rw-r--r-- | Zotlabs/Module/Settings.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 81c24e02b..847f64da9 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1121,6 +1121,8 @@ class Settings extends \Zotlabs\Web\Controller { foreach($global_perms as $k => $perm) { $options = array(); foreach($perm_opts as $opt) { + if((! strstr($perm,'view')) && $opt[1] == PERMS_PUBLIC) + continue; $options[$opt[1]] = $opt[0]; } $permiss[] = array($k,$perm,$limits[$k],'',$options); @@ -1274,11 +1276,11 @@ class Settings extends \Zotlabs\Web\Controller { '$permiss_arr' => $permiss, '$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no), - '$lbl_p2macro' => t('Advanced Privacy Settings'), + '$lbl_p2macro' => t('Channel Permission Limits'), '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), - '$permissions' => t('Default Post and Publish Permissions'), + '$permissions' => t('Default Access Control List (ACL)'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$allow_cid' => acl2json($perm_defaults['allow_cid']), |