diff options
| author | Friendika <info@friendika.com> | 2011-07-19 17:25:13 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-07-19 17:25:13 -0700 |
| commit | bf1739aef2e05c41254ac12ccb0ae75fd9088faf (patch) | |
| tree | bf70b3d711c07a4aa47ee4715c81ded884a6f94b /include/acl_selectors.php | |
| parent | 6ce5bcee9f73cd526633cc30228c13972ee9ddb0 (diff) | |
| parent | 1d35d1e5a1c807ea391d7958657b13a6bb471a0b (diff) | |
| download | volse-hubzilla-bf1739aef2e05c41254ac12ccb0ae75fd9088faf.tar.gz volse-hubzilla-bf1739aef2e05c41254ac12ccb0ae75fd9088faf.tar.bz2 volse-hubzilla-bf1739aef2e05c41254ac12ccb0ae75fd9088faf.zip | |
Merge branch 'pull'
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index c3e26082e..99de67d64 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -239,7 +239,7 @@ function populate_acl($user = null,$celeb = false) { array_walk($deny_gid,'fixacl'); } - $o = ''; + /*$o = ''; $o .= '<div id="acl-wrapper">'; $o .= '<div id="acl-permit-outer-wrapper">'; $o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>'; @@ -272,7 +272,20 @@ function populate_acl($user = null,$celeb = false) { $o .= '<div id="acl-deny-end"></div>' . "\r\n"; $o .= '</div>'; $o .= '</div>' . "\r\n"; - $o .= '<div id="acl-wrapper-end"></div>' . "\r\n"; + $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/ + + $tpl = get_markup_template("acl_selector.tpl"); + $o = replace_macros($tpl, array( + '$showall'=> t("Visible to everybody"), + '$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), + )); + + return $o; } |