aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-27 11:36:02 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-27 11:36:02 +0200
commita6baa5a6da5f5231c119cab3170f68cf271f703b (patch)
tree848e3165c2ef5bbd3c42eb25aa3fe2e071c5452a /Zotlabs
parent26131ffc91d9fd9149466323df86a068e4df9368 (diff)
downloadvolse-hubzilla-a6baa5a6da5f5231c119cab3170f68cf271f703b.tar.gz
volse-hubzilla-a6baa5a6da5f5231c119cab3170f68cf271f703b.tar.bz2
volse-hubzilla-a6baa5a6da5f5231c119cab3170f68cf271f703b.zip
some refinements on jot
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Editblock.php17
-rw-r--r--Zotlabs/Module/Editwebpage.php15
2 files changed, 9 insertions, 23 deletions
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php
index 90016952e..2821b3fe0 100644
--- a/Zotlabs/Module/Editblock.php
+++ b/Zotlabs/Module/Editblock.php
@@ -143,16 +143,11 @@ class Editblock extends \Zotlabs\Web\Controller {
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
- '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'),
- '$upload' => t('Upload photo'),
+ '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
'$attach' => t('Attach file'),
- '$weblink' => t('Insert web link'),
- '$youtube' => t('Insert YouTube video'),
- '$video' => t('Insert Vorbis [.ogg] video'),
- '$audio' => t('Insert Vorbis [.ogg] audio'),
- '$setloc' => t('Set your location'),
- '$noloc' => t('Clear browser location'),
- '$wait' => t('Please wait'),
+ '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
+ '$setloc' => false,
+ '$noloc' => false,
'$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'],
'$mimeselect' => $mimeselect,
@@ -160,7 +155,7 @@ class Editblock extends \Zotlabs\Web\Controller {
'$post_id' => $post_id,
'$baseurl' => z_root(),
'$defloc' => $channel['channel_location'],
- '$visitor' => false,
+ '$visitor' => true,
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
@@ -177,8 +172,6 @@ class Editblock extends \Zotlabs\Web\Controller {
'$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'],
'$defexpire' => '',
- '$feature_expire' => false,
- '$expires' => t('Set expiration date'),
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
));
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 01d9e8aad..d3b031db2 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -176,7 +176,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$webpage' => ITEM_TYPE_WEBPAGE,
'$placeholdpagetitle' => t('Page link title'),
'$pagetitle' => $page_title,
- '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'),
+ '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
'$action' => 'item',
'$share' => t('Edit'),
'$bold' => t('Bold'),
@@ -184,15 +184,10 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
- '$upload' => t('Upload photo'),
'$attach' => t('Attach file'),
- '$weblink' => t('Insert web link'),
- '$youtube' => t('Insert YouTube video'),
- '$video' => t('Insert Vorbis [.ogg] video'),
- '$audio' => t('Insert Vorbis [.ogg] audio'),
- '$setloc' => t('Set your location'),
- '$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
- '$wait' => t('Please wait'),
+ '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
+ '$setloc' => false, //t('Set your location'),
+ '$noloc' => false, //((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
'$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'],
'$content' => undo_post_tagging($itm[0]['body']),
@@ -218,8 +213,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
'$jotplugins' => $jotplugins,
'$sourceapp' => \App::$sourcename,
'$defexpire' => '',
- '$feature_expire' => false,
- '$expires' => t('Set expiration date'),
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
));