harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make mod editlayout use status_editor()

Browse Source
This commit is contained in:
Mario Vavti 2016-04-30 21:56:52 +02:00
parent 8189a7c693
commit c96b20c559
2 changed files with 55 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
Zotlabs/Module/Editlayout.php
View File

@ -3,7 +3,7 @@ namespace Zotlabs\Module;
require_once('include/identity.php'); require_once('include/identity.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
require_once('include/conversation.php');
class Editlayout extends \Zotlabs\Web\Controller { class Editlayout extends \Zotlabs\Web\Controller {
@ -75,7 +75,6 @@ class Editlayout extends \Zotlabs\Web\Controller {
// Figure out which post we're editing // Figure out which post we're editing
$post_id = ((argc() > 2) ? intval(argv(2)) : 0); $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
if(! $post_id) { if(! $post_id) {
notice( t('Item not found') . EOL); notice( t('Item not found') . EOL);
return; return;
@ -92,7 +91,6 @@ class Editlayout extends \Zotlabs\Web\Controller {
return; return;
} }
$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
intval($post_id), intval($post_id),
intval($owner) intval($owner)
@ -104,80 +102,31 @@ class Editlayout extends \Zotlabs\Web\Controller {
if($item_id) if($item_id)
$layout_title = $item_id[0]['sid']; $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' => '&nbsp;', // 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; $rp = 'layouts/' . $which;
$editor = replace_macros($tpl,array( $x = array(
'$return_path' => $rp, 'webpage' => ITEM_TYPE_PDL,
'$action' => 'item', 'nickname' => $channel['channel_address'],
'$webpage' => ITEM_TYPE_PDL, 'editor_autocomplete'=> true,
'$share' => t('Edit'), 'bbco_autocomplete'=> 'comanche',
'$bold' => t('Bold'), 'return_path' => $rp,
'$italic' => t('Italic'), 'button' => t('Edit'),
'$underline' => t('Underline'), 'hide_voting' => true,
'$quote' => t('Quote'), 'hide_future' => true,
'$code' => t('Code'), 'hide_location' => true,
'$upload' => t('Upload photo'), 'hide_preview' => true,
'$attach' => t('Attach file'), 'ptyp' => $itm[0]['obj_type'],
'$weblink' => t('Insert web link'), 'body' => undo_post_tagging($itm[0]['body']),
'$youtube' => t('Insert YouTube video'), 'post_id' => $post_id,
'$video' => t('Insert Vorbis [.ogg] video'), 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
'$audio' => t('Insert Vorbis [.ogg] audio'), 'pagetitle' => $layout_title,
'$setloc' => t('Set your location'), 'showacl' => false,
'$noloc' => t('Clear browser location'), 'profile_uid' => intval($owner),
'$wait' => t('Please wait'), 'catsenabled' => $catsenabled,
'$permset' => t('Permission settings'), 'hide_expire' => true,
'$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'),
));
$editor = status_editor($a, $x);
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array( $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Layout'), '$title' => t('Edit Layout'),
@ -190,6 +139,4 @@ class Editlayout extends \Zotlabs\Web\Controller {
} }
} }

2
include/conversation.php
View File

@ -1187,7 +1187,7 @@ function status_editor($a, $x, $popup = false) {
$jotplugins = ''; $jotplugins = '';
$preview = t('Preview'); $preview = t('Preview');
if(x($x, 'nopreview')) if(x($x, 'hide_preview'))
$preview = ''; $preview = '';
$defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : ''); $defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : '');