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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
mod/blocks.php
View File

@ -1,108 +1,140 @@
<?php <?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) if(argc() > 1)
$which = argv(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 ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;
} }
profile_load($a,$which,0); $which = argv(1);
$uid = local_user();
$owner = 0;
$channel = null;
$observer = $a->get_observer();
// Figure out who the page owner is. $channel = $a->get_channel();
$r = q("select channel_id from channel where channel_address = '%s'",
dbesc($which) if($a->is_sys && is_site_admin()) {
); $sys = get_sys_channel();
if($r) { if($sys && intval($sys['channel_id'])) {
$owner = intval($r[0]['channel_id']); $uid = $owner = intval($sys['channel_id']);
$channel = $sys;
$observer = $sys;
}
} }
// Block design features from visitors 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']);
}
}
if((! local_user()) || (local_user() != $owner)) { $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
// Block design features from visitors
if((! $uid) || ($uid != $owner)) {
notice( t('Permission denied.') . EOL);
return;
}
// Get the observer, check their permissions if(feature_enabled($owner,'expert')) {
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
$observer = $a->get_observer(); if(! $mimetype)
$ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $mimetype = 'choose';
}
$perms = get_all_perms($owner,$ob_hash); else {
$mimetype = 'text/bbcode';
if(! $perms['write_pages']) { }
notice( t('Permission denied.') . EOL);
return;
}
// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages $x = array(
// Nickname is set to the observers xchan, and profile_uid to the owners. 'webpage' => ITEM_BUILDBLOCK,
// This lets you post pages at other people's channels. 'is_owner' => true,
require_once ('include/conversation.php'); 'nickname' => $a->profile['channel_address'],
$x = array( 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'webpage' => ITEM_BUILDBLOCK, 'bang' => '',
'is_owner' => true, 'showacl' => false,
'nickname' => $a->profile['channel_address'], 'visitor' => true,
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'mimetype' => $mimetype,
'bang' => (($group || $cid) ? '!' : ''), 'ptlabel' => t('Block Name'),
'showacl' => false, 'profile_uid' => intval($owner),
'visitor' => true, );
'mimetype' => 'choose',
'ptlabel' => t('Block Name'),
'profile_uid' => intval($owner),
);
if($_REQUEST['title']) if($_REQUEST['title'])
$x['title'] = $_REQUEST['title']; $x['title'] = $_REQUEST['title'];
if($_REQUEST['body']) if($_REQUEST['body'])
$x['body'] = $_REQUEST['body']; $x['body'] = $_REQUEST['body'];
if($_REQUEST['pagetitle']) if($_REQUEST['pagetitle'])
$x['pagetitle'] = $_REQUEST['pagetitle']; $x['pagetitle'] = $_REQUEST['pagetitle'];
$o .= status_editor($a,$x); $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. $r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc",
//TODO - this should be replaced with pagelist_widget intval($owner)
);
$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", $pages = null;
intval($owner)
);
$pages = null; if($r) {
$pages = array();
if($r) { foreach($r as $rr) {
$pages = array(); $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
foreach($r as $rr) {
$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
}
} }
}
//Build the base URL for edit links
$url = z_root() . '/editblock/' . $which;
//Build the base URL for edit links $o .= replace_macros(get_markup_template('blocklist.tpl'), array(
$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(
'$baseurl' => $url, '$baseurl' => $url,
'$edit' => t('Edit'), '$edit' => t('Edit'),
'$pages' => $pages, '$pages' => $pages,
'$channel' => $which, '$channel' => $which,
'$view' => t('View'), '$view' => t('View'),
'$preview' => '1', '$preview' => '1',
));
)); return $o;
} }

197
mod/editblock.php
View File

@ -1,20 +1,72 @@
<?php <?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) { function editblock_content(&$a) {
if(! $a->profile) {
if(argc() < 2) { notice( t('Requested profile is not available.') . EOL );
notice( t('Item not found') . EOL); $a->error = 404;
return; return;
} }
$channel = get_channel_by_nick(argv(1)); $which = argv(1);
if($c) { $uid = local_user();
$owner = intval($channel['channel_id']); $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 = ''; $o = '';
@ -23,28 +75,18 @@ function editblock_content(&$a) {
$post_id = ((argc() > 2) ? intval(argv(2)) : 0); $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
if(! ($post_id && $channel)) { if(! ($post_id && $owner)) {
notice( t('Item not found') . EOL); notice( t('Item not found') . EOL);
return; 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", $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
intval($post_id), intval($post_id),
intval($channel['channel_id']) intval($owner)
); );
if($itm) { if($itm) {
$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1", $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) if($item_id)
$block_title = $item_id[0]['sid']; $block_title = $item_id[0]['sid'];
@ -57,10 +99,6 @@ function editblock_content(&$a) {
$plaintext = true; $plaintext = true;
// You may or may not be a local user.
// if(local_user() && feature_enabled(local_user(),'richtext'))
// $plaintext = false;
$mimeselect = ''; $mimeselect = '';
$mimetype = $itm[0]['mimetype']; $mimetype = $itm[0]['mimetype'];
@ -79,11 +117,11 @@ function editblock_content(&$a) {
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'), '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => '', '$geotag' => '',
'$nickname' => $channel['channel_address'], '$nickname' => $channel['channel_address'],
'$confirmdelete' => t('Delete block?') '$confirmdelete' => t('Delete block?')
)); ));
@ -96,79 +134,70 @@ function editblock_content(&$a) {
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets); 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']; $rp = 'blocks/' . $channel['channel_address'];
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $rp, '$return_path' => $rp,
'$action' => 'item', '$action' => 'item',
'$webpage' => ITEM_BUILDBLOCK, '$webpage' => ITEM_BUILDBLOCK,
'$share' => t('Edit'), '$share' => t('Edit'),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),
'$youtube' => t('Insert YouTube video'), '$youtube' => t('Insert YouTube video'),
'$video' => t('Insert Vorbis [.ogg] video'), '$video' => t('Insert Vorbis [.ogg] video'),
'$audio' => t('Insert Vorbis [.ogg] audio'), '$audio' => t('Insert Vorbis [.ogg] audio'),
'$setloc' => t('Set your location'), '$setloc' => t('Set your location'),
'$noloc' => t('Clear browser location'), '$noloc' => t('Clear browser location'),
'$wait' => t('Please wait'), '$wait' => t('Please wait'),
'$permset' => t('Permission settings'), '$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'], '$ptyp' => $itm[0]['type'],
'$mimeselect' => $mimeselect, '$mimeselect' => $mimeselect,
'$content' => undo_post_tagging($itm[0]['body']), '$content' => undo_post_tagging($itm[0]['body']),
'$post_id' => $post_id, '$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$defloc' => $channel['channel_location'], '$defloc' => $channel['channel_location'],
'$visitor' => false, '$visitor' => false,
'$public' => t('Public post'), '$public' => t('Public post'),
'$jotnets' => $jotnets, '$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
'$placeholdertitle' => t('Set title'), '$placeholdertitle' => t('Set title'),
'$pagetitle' => $block_title, '$pagetitle' => $block_title,
'$category' => '', '$category' => '',
'$placeholdercategory' => t('Categories (comma-separated list)'), '$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'), '$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($channel['channel_id'])), '$profile_uid' => (intval($channel['channel_id'])),
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'], '$sourceapp' => $itm[0]['app'],
'$defexpire' => '', '$defexpire' => '',
'$feature_expire' => false, '$feature_expire' => false,
'$expires' => t('Set expiration date'), '$expires' => t('Set expiration date'),
)); ));
$ob = get_observer_hash(); if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
$o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />'; $o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
$x = array( $x = array(
'type' => 'block', 'type' => 'block',
'title' => $itm[0]['title'], 'title' => $itm[0]['title'],
'body' => $itm[0]['body'], 'body' => $itm[0]['body'],
'term' => $itm[0]['term'], 'term' => $itm[0]['term'],
'created' => $itm[0]['created'], 'created' => $itm[0]['created'],
'edited' => $itm[0]['edited'], 'edited' => $itm[0]['edited'],
'mimetype' => $itm[0]['mimetype'], 'mimetype' => $itm[0]['mimetype'],
'pagetitle' => $page_title, 'pagetitle' => $page_title,
'mid' => $itm[0]['mid'] 'mid' => $itm[0]['mid']
); );
$o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL; $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; return $o;
} }

5
mod/editlayout.php
View File

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

5
mod/editwebpage.php
View File

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