make editwebpage use status_editor() and fix storing of layout on webpage creation
This commit is contained in:
Mario Vavti
parent
c8f686b8a5
commit
24c1dc528d
@ -3,6 +3,7 @@ namespace Zotlabs\Module;
|
||||
|
||||
require_once('include/identity.php');
|
||||
require_once('include/acl_selectors.php');
|
||||
require_once('include/conversation.php');
|
||||
require_once('include/PermissionDescription.php');
|
||||
|
||||
|
||||
@ -26,7 +27,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
|
||||
|
||||
}
|
||||
|
||||
|
||||
function get() {
|
||||
|
||||
if(! \App::$profile) {
|
||||
@ -77,7 +77,6 @@ class Editwebpage 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;
|
||||
@ -121,8 +120,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
|
||||
if($item_id)
|
||||
$page_title = $item_id[0]['sid'];
|
||||
|
||||
$plaintext = true;
|
||||
|
||||
$mimetype = $itm[0]['mimetype'];
|
||||
|
||||
if($mimetype === 'application/x-php') {
|
||||
@ -132,90 +129,41 @@ class Editwebpage extends \Zotlabs\Web\Controller {
|
||||
}
|
||||
}
|
||||
|
||||
$mimeselect = '';
|
||||
|
||||
if($mimetype != 'text/bbcode')
|
||||
$plaintext = true;
|
||||
|
||||
if(get_config('system','page_mimetype'))
|
||||
$mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
|
||||
else
|
||||
$mimeselect = mimetype_select($itm[0]['uid'],$mimetype);
|
||||
|
||||
$layout = get_config('system','page_layout');
|
||||
if($layout)
|
||||
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />';
|
||||
else
|
||||
$layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']);
|
||||
|
||||
\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 webpage?'),
|
||||
'$bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : '')
|
||||
));
|
||||
$layout = $itm[0]['layout_mid'];
|
||||
|
||||
$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 = 'webpages/' . $which;
|
||||
|
||||
$editor = replace_macros($tpl,array(
|
||||
'$return_path' => $rp,
|
||||
'$webpage' => ITEM_TYPE_WEBPAGE,
|
||||
'$placeholdpagetitle' => t('Page link title'),
|
||||
'$pagetitle' => $page_title,
|
||||
'$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
|
||||
'$action' => 'item',
|
||||
'$share' => t('Edit'),
|
||||
'$bold' => t('Bold'),
|
||||
'$italic' => t('Italic'),
|
||||
'$underline' => t('Underline'),
|
||||
'$quote' => t('Quote'),
|
||||
'$code' => t('Code'),
|
||||
'$attach' => t('Attach file'),
|
||||
'$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']),
|
||||
'$post_id' => $post_id,
|
||||
'$baseurl' => z_root(),
|
||||
'$defloc' => $itm[0]['location'],
|
||||
'$visitor' => ($is_owner) ? true : false,
|
||||
'$acl' => populate_acl($itm[0],false,\PermissionDescription::fromGlobalPermission('view_pages')),
|
||||
'$showacl' => ($is_owner) ? true : false,
|
||||
'$public' => t('Public post'),
|
||||
'$jotnets' => $jotnets,
|
||||
'$mimeselect' => $mimeselect,
|
||||
'$layoutselect' => $layoutselect,
|
||||
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
|
||||
'$placeholdertitle' => t('Title (optional)'),
|
||||
'$category' => '',
|
||||
'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
|
||||
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
|
||||
$x = array(
|
||||
'nickname' => $channel['channel_address'],
|
||||
'bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : ''),
|
||||
'return_path' => $rp,
|
||||
'webpage' => ITEM_TYPE_WEBPAGE,
|
||||
'ptlabel' => t('Page link'),
|
||||
'pagetitle' => $page_title,
|
||||
'writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
|
||||
'button' => t('Edit'),
|
||||
'weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
|
||||
'hide_location' => true,
|
||||
'hide_voting' => true,
|
||||
'ptyp' => $itm[0]['type'],
|
||||
'body' => undo_post_tagging($itm[0]['body']),
|
||||
'post_id' => $post_id,
|
||||
'visitor' => ($is_owner) ? true : false,
|
||||
'acl' => populate_acl($itm[0],false,\PermissionDescription::fromGlobalPermission('view_pages')),
|
||||
'showacl' => ($is_owner) ? true : false,
|
||||
'mimetype' => $mimetype,
|
||||
'mimeselect' => true,
|
||||
'layout' => $layout,
|
||||
'layoutselect' => true,
|
||||
'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
|
||||
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
|
||||
'$bang' => '',
|
||||
'$profile_uid' => (intval($owner)),
|
||||
'$preview' => t('Preview'),
|
||||
'$jotplugins' => $jotplugins,
|
||||
'$sourceapp' => \App::$sourcename,
|
||||
'$defexpire' => '',
|
||||
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
|
||||
));
|
||||
'profile_uid' => (intval($owner)),
|
||||
'bbcode' => (($mimetype == 'text/bbcode') ? true : false)
|
||||
);
|
||||
|
||||
$editor = status_editor($a, $x);
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit Webpage'),
|
||||
@ -228,6 +176,4 @@ class Editwebpage extends \Zotlabs\Web\Controller {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -77,13 +77,7 @@ class Webpages extends \Zotlabs\Web\Controller {
|
||||
|
||||
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
|
||||
|
||||
if(! $mimetype) {
|
||||
$mimetype = 'choose';
|
||||
}
|
||||
|
||||
$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
|
||||
if(! $layout)
|
||||
$layout = 'choose';
|
||||
|
||||
// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
|
||||
// Nickname is set to the observers xchan, and profile_uid to the owner's.
|
||||
@ -111,13 +105,16 @@ class Webpages extends \Zotlabs\Web\Controller {
|
||||
'is_owner' => true,
|
||||
'nickname' => \App::$profile['channel_address'],
|
||||
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
|
||||
'bang' => '',
|
||||
'acl' => (($is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_pages')) : ''),
|
||||
'showacl' => (($is_owner) ? true : false),
|
||||
'visitor' => true,
|
||||
'hide_location' => true,
|
||||
'hide_voting' => true,
|
||||
'profile_uid' => intval($owner),
|
||||
'mimetype' => $mimetype,
|
||||
'mimeselect' => true,
|
||||
'layout' => $layout,
|
||||
'layoutselect' => true,
|
||||
'expanded' => true,
|
||||
'novoting'=> true,
|
||||
'bbco_autocomplete' => 'bbcode',
|
||||
|
||||
@ -1144,7 +1144,7 @@ function status_editor($a, $x, $popup = false) {
|
||||
if($mimeselect)
|
||||
$mimeselect = mimetype_select($x['profile_uid'], $mimetype);
|
||||
else
|
||||
$mimeselect = '<input type="hidden" name="mimetype" value="' . $x['mimetype'] . '" />';
|
||||
$mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
|
||||
|
||||
$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
|
||||
if(x($x, 'hide_weblink'))
|
||||
@ -1154,6 +1154,15 @@ function status_editor($a, $x, $popup = false) {
|
||||
if(x($x, 'hide_attach'))
|
||||
$writefiles = false;
|
||||
|
||||
$layout = ((x($x,'layout')) ? $x['layout'] : 'default');
|
||||
|
||||
$layoutselect = ((x($x,'layoutselect')) ? $x['layoutselect'] : false);
|
||||
if($layoutselect)
|
||||
$layoutselect = layout_select($x['profile_uid'], $layout);
|
||||
else
|
||||
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />';
|
||||
|
||||
/*
|
||||
$layoutselect = '';
|
||||
if(array_key_exists('layout', $x) && $x['layout']) {
|
||||
if($x['layout'] === 'choose') {
|
||||
@ -1162,7 +1171,7 @@ function status_editor($a, $x, $popup = false) {
|
||||
else
|
||||
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $x['layout'] . '" />';
|
||||
}
|
||||
|
||||
*/
|
||||
if(array_key_exists('channel_select',$x) && $x['channel_select']) {
|
||||
require_once('include/identity.php');
|
||||
$id_select = identity_selector();
|
||||
|
||||
@ -2223,7 +2223,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
|
||||
dbesc($arr['layout_mid']),
|
||||
intval($arr['uid'])
|
||||
);
|
||||
if((! $l) || (! ($l[0]['item_type'] != ITEM_TYPE_PDL)))
|
||||
if((! $l) || ($l[0]['item_type'] != ITEM_TYPE_PDL))
|
||||
unset($arr['layout_mid']);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user