aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/conversation.php4
-rw-r--r--mod/blocks.php2
-rw-r--r--mod/channel.php2
-rw-r--r--mod/display.php2
-rw-r--r--mod/editblock.php4
-rw-r--r--mod/editlayout.php4
-rw-r--r--mod/editpost.php6
-rw-r--r--mod/editwebpage.php4
-rw-r--r--mod/layouts.php2
-rw-r--r--mod/mail.php8
-rw-r--r--mod/network.php2
-rw-r--r--mod/rpost.php2
-rw-r--r--mod/webpages.php2
-rwxr-xr-xview/tpl/jot.tpl34
-rwxr-xr-xview/tpl/prv_message.tpl14
15 files changed, 50 insertions, 42 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 8803e74e7..5a7e9e2cd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1144,9 +1144,9 @@ function status_editor($a,$x,$popup=false) {
'$source' => ((x($x,'source')) ? $x['source'] : ''),
'$jotplugins' => $jotplugins,
'$defexpire' => '',
- '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false),
'$expires' => t('Set expiration date'),
- '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),
diff --git a/mod/blocks.php b/mod/blocks.php
index 81337448c..343653ac4 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -60,7 +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) ? '!' : ''),
- 'visitor' => 'block',
+ 'visitor' => true,
'mimetype' => 'choose',
'ptlabel' => t('Block Name'),
'profile_uid' => intval($owner),
diff --git a/mod/channel.php b/mod/channel.php
index 0551f2645..9ee82a682 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -115,7 +115,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'acl' => (($is_owner) ? populate_acl($channel_acl) : ''),
'showacl' => (($is_owner) ? 'yes' : ''),
'bang' => '',
- 'visitor' => (($is_owner || $observer) ? 'block' : 'none'),
+ 'visitor' => (($is_owner || $observer) ? true : false),
'profile_uid' => $a->profile['profile_uid']
);
diff --git a/mod/display.php b/mod/display.php
index 0b7335028..f4d4c38c3 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -57,7 +57,7 @@ function display_content(&$a, $update = 0, $load = false) {
'acl' => populate_acl($channel_acl, false),
'bang' => '',
- 'visitor' => 'block',
+ 'visitor' => true,
'profile_uid' => local_user(),
'return_path' => 'channel/' . $channel['channel_address']
);
diff --git a/mod/editblock.php b/mod/editblock.php
index 8ccccc24b..8aca9e1f4 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -125,7 +125,7 @@ function editblock_content(&$a) {
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
- '$visitor' => 'none',
+ '$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
@@ -143,7 +143,7 @@ function editblock_content(&$a) {
'$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'],
'$defexpire' => '',
- '$feature_expire' => 'none',
+ '$feature_expire' => false,
'$expires' => t('Set expiration date'),
));
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 838a219c9..4d0c00293 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -119,7 +119,7 @@ function editlayout_content(&$a) {
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
- '$visitor' => 'none',
+ '$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
@@ -137,7 +137,7 @@ function editlayout_content(&$a) {
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$defexpire' => '',
- '$feature_expire' => 'none',
+ '$feature_expire' => false,
'$expires' => t('Set expiration date'),
));
diff --git a/mod/editpost.php b/mod/editpost.php
index 8c4117e7a..938c12083 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -125,7 +125,7 @@ function editpost_content(&$a) {
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'],
- '$visitor' => 'none',
+ '$visitor' => false,
'$pvisit' => 'none',
'$public' => t('Public post'),
'$jotnets' => $jotnets,
@@ -143,9 +143,9 @@ function editpost_content(&$a) {
'$sourceapp' => t($a->sourcename),
'$catsenabled' => $catsenabled,
'$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']),
- '$feature_expire' => ((feature_enabled(get_app()->profile['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_expire' => ((feature_enabled(get_app()->profile['profile_uid'],'content_expire') && (! $webpage)) ? true : false),
'$expires' => t('Set expiration date'),
- '$feature_encrypt' => ((feature_enabled(get_app()->profile['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_encrypt' => ((feature_enabled(get_app()->profile['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index e9c8f5c37..5b6d91784 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -156,7 +156,7 @@ function editwebpage_content(&$a) {
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$defloc' => $itm[0]['location'],
- '$visitor' => ($is_owner) ? 'block' : 'none',
+ '$visitor' => ($is_owner) ? true : false,
'$acl' => populate_acl($itm[0]),
'$showacl' => true,
'$pvisit' => ($is_owner) ? 'block' : 'none',
@@ -177,7 +177,7 @@ function editwebpage_content(&$a) {
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$defexpire' => '',
- '$feature_expire' => 'none',
+ '$feature_expire' => false,
'$expires' => t('Set expiration date'),
));
diff --git a/mod/layouts.php b/mod/layouts.php
index 0dcaba361..3fbb63ed4 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -78,7 +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) ? '!' : ''),
- 'visitor' => 'none',
+ 'visitor' => false,
'nopreview' => 1,
'ptlabel' => t('Layout Name'),
'profile_uid' => intval($owner),
diff --git a/mod/mail.php b/mod/mail.php
index eb1b0ddc0..9c84872ef 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -222,9 +222,9 @@ function mail_content(&$a) {
'$wait' => t('Please wait'),
'$submit' => t('Submit'),
'$defexpire' => '',
- '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'),
+ '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? true : false),
'$expires' => t('Set expiration date'),
- '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'),
+ '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
@@ -335,9 +335,9 @@ function mail_content(&$a) {
'$submit' => t('Submit'),
'$wait' => t('Please wait'),
'$defexpire' => '',
- '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'),
+ '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? true : false),
'$expires' => t('Set expiration date'),
- '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'),
+ '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
diff --git a/mod/network.php b/mod/network.php
index 8a05a5eaa..8202b1044 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -136,7 +136,7 @@ function network_content(&$a, $update = 0, $load = false) {
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl((($group || $cid) ? $def_acl : $channel_acl)),
'bang' => (($group || $cid) ? '!' : ''),
- 'visitor' => 'block',
+ 'visitor' => true,
'profile_uid' => local_user()
);
diff --git a/mod/rpost.php b/mod/rpost.php
index a9a864d5e..dc25444a3 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -107,7 +107,7 @@ function rpost_content(&$a) {
'acl' => populate_acl($channel, $false),
'bang' => '',
// 'channel_select' => true,
- 'visitor' => 'block',
+ 'visitor' => true,
'profile_uid' => local_user(),
'title' => $_REQUEST['title'],
'body' => $_REQUEST['body'],
diff --git a/mod/webpages.php b/mod/webpages.php
index ac9012ce1..6328454a6 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -85,7 +85,7 @@ function webpages_content(&$a) {
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''),
- 'visitor' => 'block',
+ 'visitor' => true,
'profile_uid' => intval($owner),
'mimetype' => $mimetype,
'layout' => $layout,
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 87a9b721f..ab8a3f77b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,43 +36,49 @@
</div>
<div id="profile-jot-submit-wrapper" class="jothidden">
<div id="profile-jot-submit-left" class="btn-group pull-left">
- <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" style="display: {{$visitor}};" >
+ {{if $visitor}}
+ <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
<i class="icon-camera jot-icons"></i>
</button>
- <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" style="display: {{$visitor}};" >
+ <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
<i id="wall-file-upload" class="icon-paper-clip jot-icons"></i>
</button>
- <button id="profile-link-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
+ <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
<i id="profile-link" class="icon-link jot-icons"></i>
</button>
- <button id="profile-video-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$video}}" onclick="jotVideoURL();return false;">
+ <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
<i id="profile-video" class="icon-facetime-video jot-icons"></i>
</button>
- <button id="profile-audio-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$audio}}" onclick="jotAudioURL();return false;">
+ <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
<i id="profile-audio" class="icon-volume-up jot-icons"></i>
</button>
<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
</button>
- <button id="profile-location-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+ <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
<i id="profile-location" class="icon-globe jot-icons"></i>
</button>
- <button id="profile-expire-wrapper" class="btn btn-default btn-sm" style="display: {{$feature_expire}};" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+ {{/if}}
+ {{if $feature_expire}}
+ <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
<i id="profile-expires" class="icon-eraser jot-icons"></i>
</button>
- <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" style="display: {{$feature_encrypt}};" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+ {{/if}}
+ {{if $feature_encrypt}}
+ <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
<i id="profile-encrypt" class="icon-key jot-icons"></i>
</button>
+ {{/if}}
</div>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<div id="profile-rotator"></div>
</div>
<div id="profile-jot-submit-right" class="btn-group pull-right">
- {{if $showacl}}
- <div class="btn btn-default btn-sm" id="profile-jot-perms" style="display: {{$pvisit}};" title="{{$permset}}" >
- <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"></a>{{$bang}}
- </div>
- {{/if}}
+ {{if $showacl}}
+ <div class="btn btn-default btn-sm" id="profile-jot-perms" style="display: {{$pvisit}};" title="{{$permset}}" >
+ <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"></a>{{$bang}}
+ </div>
+ {{/if}}
{{if $preview}}
<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
<i class="icon-eye-open jot-icons" ></i>
@@ -82,7 +88,7 @@
</div>
<div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper">
- {{$jotplugins}}
+ {{$jotplugins}}
</div>
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 3330a338f..118bd846f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -37,14 +37,16 @@
<div id="prvmail-link-wrapper" >
<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
</div>
-
- <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
- <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
- </div>
- <div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+ {{if $feature_expire}}
+ <div id="prvmail-expire-wrapper" >
+ <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+ </div>
+ {{/if}}
+ {{if $feature_encrypt}}
+ <div id="prvmail-encrypt-wrapper" >
<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
</div>
-
+ {{/if}}
<div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 08:05:24 +0000