aboutsummaryrefslogtreecommitdiffstats
path: root/include/acl_selectors.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-31 15:10:36 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-31 15:10:36 -0800
commit1964fa05e1b8874a094922206a1fb5f436194991 (patch)
treecebabfed1fd8e4e56aa25105ff9d8cbbd73dd3de /include/acl_selectors.php
parentcaf3a69d999853bb7cc3b7ff525c331e68f2e0ae (diff)
downloadvolse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.tar.gz
volse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.tar.bz2
volse-hubzilla-1964fa05e1b8874a094922206a1fb5f436194991.zip
issue #239, provide 'Public' text on ACL selector when appropriate to do so.
Diffstat (limited to 'include/acl_selectors.php')
-rw-r--r--include/acl_selectors.php26
1 files changed, 14 insertions, 12 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4d44ec12e..b8a241f26 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -210,10 +210,13 @@ function fixacl(&$item) {
$item = str_replace(array('<','>'),array('',''),$item);
}
-function populate_acl($defaults = null,$show_jotnets = true) {
+function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
+ if(! $showall)
+ $showall = t('Visible to your default audience');
+
if(is_array($defaults)) {
$allow_cid = ((strlen($defaults['allow_cid']))
? explode('><', $defaults['allow_cid']) : array() );
@@ -231,22 +234,21 @@ function populate_acl($defaults = null,$show_jotnets = true) {
$jotnets = '';
if($show_jotnets) {
-logger('jot_networks');
call_hooks('jot_networks', $jotnets);
}
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(
- '$showall'=> t("Visible to your default audience"),
- '$show' => t("Show"),
- '$hide' => t("Don't show"),
- '$allowcid' => json_encode($allow_cid),
- '$allowgid' => json_encode($allow_gid),
- '$denycid' => json_encode($deny_cid),
- '$denygid' => json_encode($deny_gid),
- '$jnetModalTitle' => t('Other networks and post services'),
- '$jotnets' => $jotnets,
- '$aclModalTitle' => t('Permissions'),
+ '$showall' => $showall,
+ '$show' => t("Show"),
+ '$hide' => t("Don't show"),
+ '$allowcid' => json_encode($allow_cid),
+ '$allowgid' => json_encode($allow_gid),
+ '$denycid' => json_encode($deny_cid),
+ '$denygid' => json_encode($deny_gid),
+ '$jnetModalTitle' => t('Other networks and post services'),
+ '$jotnets' => $jotnets,
+ '$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close')
));