From 1cd3b4182595b838a535dd6b6990251db05d49e6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 30 Mar 2016 22:13:24 -0700 Subject: deprecate $a->get_baseurl() --- mod/editblock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/editblock.php') diff --git a/mod/editblock.php b/mod/editblock.php index 9269676b1..a49beca3d 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -109,7 +109,7 @@ function editblock_content(&$a) { $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$pretext' => '', '$ispublic' => ' ', // t('Visible to everybody'), @@ -153,7 +153,7 @@ function editblock_content(&$a) { '$mimeselect' => $mimeselect, '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$defloc' => $channel['channel_location'], '$visitor' => false, '$public' => t('Public post'), -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- mod/editblock.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mod/editblock.php') diff --git a/mod/editblock.php b/mod/editblock.php index a49beca3d..35922e483 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -8,7 +8,7 @@ function editblock_init(&$a) { if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { - $a->is_sys = true; + App::$is_sys = true; } } @@ -25,9 +25,9 @@ function editblock_init(&$a) { function editblock_content(&$a) { - if(! $a->profile) { + if(! App::$profile) { notice( t('Requested profile is not available.') . EOL ); - $a->error = 404; + App::$error = 404; return; } @@ -36,11 +36,11 @@ function editblock_content(&$a) { $uid = local_channel(); $owner = 0; $channel = null; - $observer = $a->get_observer(); + $observer = App::get_observer(); - $channel = $a->get_channel(); + $channel = App::get_channel(); - if($a->is_sys && is_site_admin()) { + if(App::$is_sys && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { $uid = $owner = intval($sys['channel_id']); @@ -108,7 +108,7 @@ function editblock_content(&$a) { else $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( + App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$pretext' => '', -- cgit v1.2.3 From e2b4d33627d5f4cf5f68eb087059d86c78eec41e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 9 Apr 2016 12:16:42 +0200 Subject: some work on comanche autocomplete --- mod/editblock.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mod/editblock.php') diff --git a/mod/editblock.php b/mod/editblock.php index 35922e483..214c495dd 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -115,7 +115,8 @@ function editblock_content(&$a) { '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => '', '$nickname' => $channel['channel_address'], - '$confirmdelete' => t('Delete block?') + '$confirmdelete' => t('Delete block?'), + '$bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : 'comanche-block') )); $tpl = get_markup_template("jot.tpl"); @@ -174,6 +175,7 @@ function editblock_content(&$a) { '$defexpire' => '', '$feature_expire' => false, '$expires' => t('Set expiration date'), + '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( -- cgit v1.2.3