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

make editwebpage use status_editor() and fix storing of layout on webpage creation

Browse Source
This commit is contained in:
Mario Vavti
2016-05-09 11:56:42 +02:00
parent c8f686b8a5
commit 24c1dc528d
4 changed files with 91 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
Zotlabs/Module/Editwebpage.php
View File

@@ -3,6 +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');
require_once('include/PermissionDescription.php'); require_once('include/PermissionDescription.php');
@@ -26,8 +27,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
} }
function get() {
function get() {
if(! \App::$profile) { if(! \App::$profile) {
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
@@ -77,7 +77,6 @@ class Editwebpage 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;
@@ -121,8 +120,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
if($item_id) if($item_id)
$page_title = $item_id[0]['sid']; $page_title = $item_id[0]['sid'];
$plaintext = true;
$mimetype = $itm[0]['mimetype']; $mimetype = $itm[0]['mimetype'];
if($mimetype === 'application/x-php') { if($mimetype === 'application/x-php') {
@@ -132,90 +129,41 @@ class Editwebpage extends \Zotlabs\Web\Controller {
} }
} }
$mimeselect = ''; $layout = $itm[0]['layout_mid'];
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' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
'$nickname' => $channel['channel_address'],
'$confirmdelete' => t('Delete webpage?'),
'$bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : '')
));
$tpl = get_markup_template("jot.tpl"); $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; $rp = 'webpages/' . $which;
$editor = replace_macros($tpl,array( $x = array(
'$return_path' => $rp, 'nickname' => $channel['channel_address'],
'$webpage' => ITEM_TYPE_WEBPAGE, 'bbco_autocomplete'=> (($mimetype == 'text/bbcode') ? 'bbcode' : ''),
'$placeholdpagetitle' => t('Page link title'), 'return_path' => $rp,
'$pagetitle' => $page_title, 'webpage' => ITEM_TYPE_WEBPAGE,
'$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), 'ptlabel' => t('Page link'),
'$action' => 'item', 'pagetitle' => $page_title,
'$share' => t('Edit'), 'writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
'$bold' => t('Bold'), 'button' => t('Edit'),
'$italic' => t('Italic'), 'weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false),
'$underline' => t('Underline'), 'hide_location' => true,
'$quote' => t('Quote'), 'hide_voting' => true,
'$code' => t('Code'), 'ptyp' => $itm[0]['type'],
'$attach' => t('Attach file'), 'body' => undo_post_tagging($itm[0]['body']),
'$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false), 'post_id' => $post_id,
'$setloc' => false, //t('Set your location'), 'visitor' => ($is_owner) ? true : false,
'$noloc' => false, //((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''), 'acl' => populate_acl($itm[0],false,\PermissionDescription::fromGlobalPermission('view_pages')),
'$permset' => t('Permission settings'), 'showacl' => ($is_owner) ? true : false,
'$ptyp' => $itm[0]['type'], 'mimetype' => $mimetype,
'$content' => undo_post_tagging($itm[0]['body']), 'mimeselect' => true,
'$post_id' => $post_id, 'layout' => $layout,
'$baseurl' => z_root(), 'layoutselect' => true,
'$defloc' => $itm[0]['location'], 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
'$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'),
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), '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)),
'$profile_uid' => (intval($owner)), 'bbcode' => (($mimetype == 'text/bbcode') ? true : false)
'$preview' => t('Preview'), );
'$jotplugins' => $jotplugins,
'$sourceapp' => \App::$sourcename, $editor = status_editor($a, $x);
'$defexpire' => '',
'$bbcode' => (($mimetype == 'text/bbcode') ? true : false)
));
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array( $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Webpage'), '$title' => t('Edit Webpage'),
@@ -228,6 +176,4 @@ class Editwebpage extends \Zotlabs\Web\Controller {
} }
} }

31
Zotlabs/Module/Webpages.php
View File

@@ -77,13 +77,7 @@ class Webpages extends \Zotlabs\Web\Controller {
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); $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')); $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 // 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. // Nickname is set to the observers xchan, and profile_uid to the owner's.
@@ -107,18 +101,21 @@ class Webpages extends \Zotlabs\Web\Controller {
$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$x = array( $x = array(
'webpage' => ITEM_TYPE_WEBPAGE, 'webpage' => ITEM_TYPE_WEBPAGE,
'is_owner' => true, 'is_owner' => true,
'nickname' => \App::$profile['channel_address'], 'nickname' => \App::$profile['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), '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')) : ''),
'acl' => (($is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_pages')) : ''), 'showacl' => (($is_owner) ? true : false),
'showacl' => (($is_owner) ? true : false), 'visitor' => true,
'visitor' => true, 'hide_location' => true,
'hide_voting' => true,
'profile_uid' => intval($owner), 'profile_uid' => intval($owner),
'mimetype' => $mimetype, 'mimetype' => $mimetype,
'layout' => $layout, 'mimeselect' => true,
'expanded' => true, 'layout' => $layout,
'layoutselect' => true,
'expanded' => true,
'novoting'=> true, 'novoting'=> true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true 'bbcode' => true

13
include/conversation.php
View File

@@ -1144,7 +1144,7 @@ function status_editor($a, $x, $popup = false) {
if($mimeselect) if($mimeselect)
$mimeselect = mimetype_select($x['profile_uid'], $mimetype); $mimeselect = mimetype_select($x['profile_uid'], $mimetype);
else 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); $weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
if(x($x, 'hide_weblink')) if(x($x, 'hide_weblink'))
@@ -1154,6 +1154,15 @@ function status_editor($a, $x, $popup = false) {
if(x($x, 'hide_attach')) if(x($x, 'hide_attach'))
$writefiles = false; $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 = ''; $layoutselect = '';
if(array_key_exists('layout', $x) && $x['layout']) { if(array_key_exists('layout', $x) && $x['layout']) {
if($x['layout'] === 'choose') { if($x['layout'] === 'choose') {
@@ -1162,7 +1171,7 @@ function status_editor($a, $x, $popup = false) {
else else
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $x['layout'] . '" />'; $layoutselect = '<input type="hidden" name="layout_mid" value="' . $x['layout'] . '" />';
} }
*/
if(array_key_exists('channel_select',$x) && $x['channel_select']) { if(array_key_exists('channel_select',$x) && $x['channel_select']) {
require_once('include/identity.php'); require_once('include/identity.php');
$id_select = identity_selector(); $id_select = identity_selector();

2
include/items.php
View File

@@ -2223,7 +2223,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
dbesc($arr['layout_mid']), dbesc($arr['layout_mid']),
intval($arr['uid']) 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']); unset($arr['layout_mid']);
} }