use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it.

8 files changed, 5 insertions, 8 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 5a7e9e2cd..09bdc022f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1129,7 +1129,6 @@ function status_editor($a,$x,$popup=false) {
 		'$baseurl' => $a->get_baseurl(true),
 		'$defloc' => $x['default_location'],
 		'$visitor' => $x['visitor'],
-		'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -1137,7 +1136,7 @@ function status_editor($a,$x,$popup=false) {
 		'$acl' => $x['acl'],
 		'$mimeselect' => $mimeselect,
 		'$layoutselect' => $layoutselect,
-		'$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'),
+		'$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : true),
 		'$bang' => $x['bang'],
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => $preview,
diff --git a/mod/blocks.php b/mod/blocks.php
index 343653ac4..74a980c25 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -60,6 +60,7 @@ require_once ('include/conversation.php');
 			'nickname' => $a->profile['channel_address'],
 			'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 			'bang' => (($group || $cid) ? '!' : ''),
+			'showacl' => false,
 			'visitor' => true,
 			'mimetype' => 'choose',
 			'ptlabel' => t('Block Name'),
diff --git a/mod/editblock.php b/mod/editblock.php
index 8aca9e1f4..507050eb0 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -126,7 +126,6 @@ function editblock_content(&$a) {
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $channel['channel_location'],
 		'$visitor' => false,
-		'$pvisit' => 'none',
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 4d0c00293..da681cf34 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -120,7 +120,6 @@ function editlayout_content(&$a) {
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $channel['channel_location'],
 		'$visitor' => false,
-		'$pvisit' => 'none',
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
diff --git a/mod/editpost.php b/mod/editpost.php
index 938c12083..6556405e3 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -126,7 +126,6 @@ function editpost_content(&$a) {
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $channel['channel_location'],
 		'$visitor' => false,
-		'$pvisit' => 'none',
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 5b6d91784..38aef4a8b 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -158,8 +158,7 @@ function editwebpage_content(&$a) {
 		'$defloc' => $itm[0]['location'],
 		'$visitor' => ($is_owner) ? true : false,
 		'$acl' => populate_acl($itm[0]),
-		'$showacl' => true,
-		'$pvisit' => ($is_owner) ? 'block' : 'none',
+		'$showacl' => ($is_owner) ? true : false,
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
 		'$mimeselect' => $mimeselect,
diff --git a/mod/layouts.php b/mod/layouts.php
index 3fbb63ed4..318e6e29f 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -78,6 +78,7 @@ function layouts_content(&$a) {
 		'nickname' => $a->profile['channel_address'],
 		'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 		'bang' => (($group || $cid) ? '!' : ''),
+		'showacl' => false,
 		'visitor' => false,
 		'nopreview' => 1,
 		'ptlabel' => t('Layout Name'),
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index b20644f49..e1b8dc906 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -75,7 +75,7 @@
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group pull-right">
 				{{if $showacl}}
-				<a href="#profile-jot-acl-wrapper" class="btn btn-default btn-sm jot-icons icon-{{$lockstate}}" id="jot-perms-icon" title="{{$permset}}" style="display: {{$pvisit}};"></a>{{$bang}}
+				<a href="#profile-jot-acl-wrapper" class="btn btn-default btn-sm jot-icons icon-{{$lockstate}}" id="jot-perms-icon" title="{{$permset}}"></a>{{$bang}}
 				{{/if}}
 				{{if $preview}}
 				<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">