From 1964fa05e1b8874a094922206a1fb5f436194991 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Thu, 31 Dec 2015 15:10:36 -0800
Subject: issue #239, provide 'Public' text on ACL selector when appropriate to
 do so.

---
 include/acl_selectors.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'include')

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')
 	));
 
-- 
cgit v1.2.3