TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

issue #239, provide 'Public' text on ACL selector when appropriate to do so.

Browse Source
This commit is contained in:
redmatrix
2015-12-31 15:10:36 -08:00
parent caf3a69d99
commit 1964fa05e1
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/acl_selectors.php
View File

@@ -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')
));