make mod editlayout use status_editor()
This commit is contained in:
Mario Vavti
parent
8189a7c693
commit
c96b20c559
@ -3,7 +3,7 @@ namespace Zotlabs\Module;
|
||||
|
||||
require_once('include/identity.php');
|
||||
require_once('include/acl_selectors.php');
|
||||
|
||||
require_once('include/conversation.php');
|
||||
|
||||
class Editlayout extends \Zotlabs\Web\Controller {
|
||||
|
||||
@ -25,7 +25,7 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
|
||||
}
|
||||
|
||||
function get() {
|
||||
function get() {
|
||||
|
||||
if(! \App::$profile) {
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
@ -75,7 +75,6 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
// Figure out which post we're editing
|
||||
$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
|
||||
|
||||
|
||||
if(! $post_id) {
|
||||
notice( t('Item not found') . EOL);
|
||||
return;
|
||||
@ -92,7 +91,6 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
|
||||
intval($post_id),
|
||||
intval($owner)
|
||||
@ -104,80 +102,31 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
if($item_id)
|
||||
$layout_title = $item_id[0]['sid'];
|
||||
|
||||
$plaintext = true;
|
||||
|
||||
\App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => z_root(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$pretext' => '',
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $channel['channel_address'],
|
||||
'$confirmdelete' => t('Delete layout?'),
|
||||
'$bbco_autocomplete'=> 'comanche'
|
||||
));
|
||||
|
||||
|
||||
$tpl = get_markup_template("jot.tpl");
|
||||
|
||||
$jotplugins = '';
|
||||
$jotnets = '';
|
||||
|
||||
call_hooks('jot_tool', $jotplugins);
|
||||
call_hooks('jot_networks', $jotnets);
|
||||
|
||||
|
||||
// FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD
|
||||
// instead of loading a sensible page. So, send folk to the webpage list.
|
||||
|
||||
$rp = 'layouts/' . $which;
|
||||
|
||||
$editor = replace_macros($tpl,array(
|
||||
'$return_path' => $rp,
|
||||
'$action' => 'item',
|
||||
'$webpage' => ITEM_TYPE_PDL,
|
||||
'$share' => t('Edit'),
|
||||
'$bold' => t('Bold'),
|
||||
'$italic' => t('Italic'),
|
||||
'$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' => t('Clear browser location'),
|
||||
'$wait' => t('Please wait'),
|
||||
'$permset' => t('Permission settings'),
|
||||
'$ptyp' => $itm[0]['type'],
|
||||
'$content' => undo_post_tagging($itm[0]['body']),
|
||||
'$post_id' => $post_id,
|
||||
'$baseurl' => z_root(),
|
||||
'$defloc' => $channel['channel_location'],
|
||||
'$visitor' => false,
|
||||
'$public' => t('Public post'),
|
||||
'$jotnets' => $jotnets,
|
||||
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
|
||||
'$placeholdertitle' => t('Layout Description (Optional)'),
|
||||
'$pagetitle' => $layout_title,
|
||||
'$placeholdpagetitle' => t('Layout Name'),
|
||||
'$category' => '',
|
||||
'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
|
||||
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
|
||||
'$lockstate' => $lockstate,
|
||||
'$acl' => '',
|
||||
'$bang' => '',
|
||||
'$profile_uid' => (intval($owner)),
|
||||
'$jotplugins' => $jotplugins,
|
||||
'$sourceapp' => t(\App::$sourcename),
|
||||
'$defexpire' => '',
|
||||
'$feature_expire' => false,
|
||||
'$expires' => t('Set expiration date'),
|
||||
));
|
||||
$x = array(
|
||||
'webpage' => ITEM_TYPE_PDL,
|
||||
'nickname' => $channel['channel_address'],
|
||||
'editor_autocomplete'=> true,
|
||||
'bbco_autocomplete'=> 'comanche',
|
||||
'return_path' => $rp,
|
||||
'button' => t('Edit'),
|
||||
'hide_voting' => true,
|
||||
'hide_future' => true,
|
||||
'hide_location' => true,
|
||||
'hide_preview' => true,
|
||||
'ptyp' => $itm[0]['obj_type'],
|
||||
'body' => undo_post_tagging($itm[0]['body']),
|
||||
'post_id' => $post_id,
|
||||
'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
|
||||
'pagetitle' => $layout_title,
|
||||
'showacl' => false,
|
||||
'profile_uid' => intval($owner),
|
||||
'catsenabled' => $catsenabled,
|
||||
'hide_expire' => true,
|
||||
);
|
||||
|
||||
$editor = status_editor($a, $x);
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Layout'),
|
||||
@ -190,6 +139,4 @@ class Editlayout extends \Zotlabs\Web\Controller {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1187,7 +1187,7 @@ function status_editor($a, $x, $popup = false) {
|
||||
$jotplugins = '';
|
||||
|
||||
$preview = t('Preview');
|
||||
if(x($x, 'nopreview'))
|
||||
if(x($x, 'hide_preview'))
|
||||
$preview = '';
|
||||
|
||||
$defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : '');
|
||||
|
||||
Reference in New Issue
Block a user