diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-27 13:27:19 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-27 13:27:19 -0700 |
| commit | d4eb5e7c6d4ca944b523125b2e3e10160e50ac94 (patch) | |
| tree | 4dd69437f377d73d64355601bed5ac1578cefc03 /Zotlabs | |
| parent | 8e8df26066d806c663e3eecc7d869d611e311f81 (diff) | |
| parent | c91e43af343557afd2e4769a538106689776a3f5 (diff) | |
| download | volse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.tar.gz volse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.tar.bz2 volse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Editblock.php | 17 | ||||
| -rw-r--r-- | Zotlabs/Module/Editwebpage.php | 15 |
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) )); |