this should make all the 'sys' webpage design tools useable by the admin

This commit is contained in:
friendica 2014-11-12 18:04:00 -08:00
parent 634475164e
commit a2cf1900c8
4 changed files with 212 additions and 157 deletions

View File

@ -1,20 +1,55 @@
<?php
function blocks_content(&$a) {
require_once('include/identity.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
function blocks_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;
}
}
if(argc() > 1)
$which = argv(1);
else {
else
return;
profile_load($a,$which);
}
function blocks_content(&$a) {
if(! $a->profile) {
notice( t('Requested profile is not available.') . EOL );
$a->error = 404;
return;
}
profile_load($a,$which,0);
$which = argv(1);
$uid = local_user();
$owner = 0;
$channel = null;
$observer = $a->get_observer();
$channel = $a->get_channel();
if($a->is_sys && is_site_admin()) {
$sys = get_sys_channel();
if($sys && intval($sys['channel_id'])) {
$uid = $owner = intval($sys['channel_id']);
$channel = $sys;
$observer = $sys;
}
}
if(! $owner) {
// Figure out who the page owner is.
$r = q("select channel_id from channel where channel_address = '%s'",
dbesc($which)
@ -22,20 +57,8 @@ function blocks_content(&$a) {
if($r) {
$owner = intval($r[0]['channel_id']);
}
// Block design features from visitors
if((! local_user()) || (local_user() != $owner)) {
notice( t('Permission denied.') . EOL);
return;
}
// Get the observer, check their permissions
$observer = $a->get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash);
@ -46,19 +69,33 @@ function blocks_content(&$a) {
}
// 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 owners.
// This lets you post pages at other people's channels.
require_once ('include/conversation.php');
// Block design features from visitors
if((! $uid) || ($uid != $owner)) {
notice( t('Permission denied.') . EOL);
return;
}
if(feature_enabled($owner,'expert')) {
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
if(! $mimetype)
$mimetype = 'choose';
}
else {
$mimetype = 'text/bbcode';
}
$x = array(
'webpage' => ITEM_BUILDBLOCK,
'is_owner' => true,
'nickname' => $a->profile['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => '',
'showacl' => false,
'visitor' => true,
'mimetype' => 'choose',
'mimetype' => $mimetype,
'ptlabel' => t('Block Name'),
'profile_uid' => intval($owner),
);
@ -74,9 +111,6 @@ require_once ('include/conversation.php');
$o .= status_editor($a,$x);
//Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
//TODO - this should be replaced with pagelist_widget
$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc",
intval($owner)
);
@ -90,19 +124,17 @@ $r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by
}
}
//Build the base URL for edit links
$url = z_root() . "/editblock/" . $which;
// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM).
return $o . replace_macros(get_markup_template("blocklist.tpl"), array(
$url = z_root() . '/editblock/' . $which;
$o .= replace_macros(get_markup_template('blocklist.tpl'), array(
'$baseurl' => $url,
'$edit' => t('Edit'),
'$pages' => $pages,
'$channel' => $which,
'$view' => t('View'),
'$preview' => '1',
));
return $o;
}

View File

@ -1,20 +1,72 @@
<?php
require_once('include/identity.php');
require_once('include/acl_selectors.php');
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;
}
}
if(argc() > 1)
$which = argv(1);
else
return;
profile_load($a,$which);
}
function editblock_content(&$a) {
if(argc() < 2) {
notice( t('Item not found') . EOL);
if(! $a->profile) {
notice( t('Requested profile is not available.') . EOL );
$a->error = 404;
return;
}
$channel = get_channel_by_nick(argv(1));
$which = argv(1);
if($c) {
$owner = intval($channel['channel_id']);
$uid = local_user();
$owner = 0;
$channel = null;
$observer = $a->get_observer();
$channel = $a->get_channel();
if($a->is_sys && is_site_admin()) {
$sys = get_sys_channel();
if($sys && intval($sys['channel_id'])) {
$uid = $owner = intval($sys['channel_id']);
$channel = $sys;
$observer = $sys;
}
}
if(! $owner) {
// Figure out who the page owner is.
$r = q("select channel_id from channel where channel_address = '%s'",
dbesc($which)
);
if($r) {
$owner = intval($r[0]['channel_id']);
}
}
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
notice( t('Permission denied.') . EOL);
return;
}
$is_owner = (($uid && $uid == $owner) ? true : false);
$o = '';
@ -23,28 +75,18 @@ function editblock_content(&$a) {
$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
if(! ($post_id && $channel)) {
if(! ($post_id && $owner)) {
notice( t('Item not found') . EOL);
return;
}
// Now we've got a post and an owner, let's find out if we're allowed to edit it
if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'write_pages')) {
notice( t('Permission denied.') . EOL);
return;
}
// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here
$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
intval($post_id),
intval($channel['channel_id'])
intval($owner)
);
if($itm) {
$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1",
$itm[0]['id']
intval($itm[0]['id'])
);
if($item_id)
$block_title = $item_id[0]['sid'];
@ -57,10 +99,6 @@ function editblock_content(&$a) {
$plaintext = true;
// You may or may not be a local user.
// if(local_user() && feature_enabled(local_user(),'richtext'))
// $plaintext = false;
$mimeselect = '';
$mimetype = $itm[0]['mimetype'];
@ -96,12 +134,6 @@ function editblock_content(&$a) {
call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets);
//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
// 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 = 'blocks/' . $channel['channel_address'];
$o .= replace_macros($tpl,array(
@ -138,7 +170,7 @@ function editblock_content(&$a) {
'$acl' => '',
'$bang' => '',
'$profile_uid' => (intval($channel['channel_id'])),
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
'$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'],
'$defexpire' => '',
@ -147,9 +179,7 @@ function editblock_content(&$a) {
));
$ob = get_observer_hash();
if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
$o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
@ -168,7 +198,6 @@ function editblock_content(&$a) {
$o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL;
return $o;
}

View File

@ -60,14 +60,11 @@ function editlayout_content(&$a) {
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) {
if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
notice( t('Permission denied.') . EOL);
return;
}
$is_owner = (($uid && $uid == $owner) ? true : false);
$o = '';

View File

@ -60,14 +60,11 @@ function editwebpage_content(&$a) {
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) {
if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
notice( t('Permission denied.') . EOL);
return;
}
$is_owner = (($uid && $uid == $owner) ? true : false);
$o = '';