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

3 files changed, 16 insertions, 14 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')
 	));
 
diff --git a/mod/channel.php b/mod/channel.php
index 2b9d0ed89..074017466 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -128,7 +128,7 @@ function channel_content(&$a, $update = 0, $load = false) {
 	            'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''),
     	        'nickname' => $a->profile['channel_address'],
         	    'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-            	'acl' => (($is_owner) ? populate_acl($channel_acl) : ''),
+            	'acl' => (($is_owner) ? populate_acl($channel_acl,true,(($a->profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
 				'showacl' => (($is_owner) ? 'yes' : ''),
 	            'bang' => '',
 				'visitor' => (($is_owner || $observer) ? true : false),
diff --git a/mod/network.php b/mod/network.php
index 9f0604296..ba2ef761b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -166,7 +166,7 @@ function network_content(&$a, $update = 0, $load = false) {
 			'default_location' => $channel['channel_location'],
 			'nickname'         => $channel['channel_address'],
 			'lockstate'        => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-			'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl)),
+			'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
 			'bang'             => (($private_editing) ? '!' : ''),
 			'visitor'          => true,
 			'profile_uid'      => local_channel()