add layouts and editlayout and rework the page logic in mod/item
This commit is contained in:
friendica
parent
de3345f5f3
commit
cbab62c95e
@ -37,7 +37,7 @@ function webpages_content(&$a) {
|
||||
// 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');
|
||||
$x = array(
|
||||
'webpage' => 1,
|
||||
'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'),
|
||||
|
||||
139
mod/editlayout.php
Normal file
139
mod/editlayout.php
Normal file
@ -0,0 +1,139 @@
|
||||
|
||||
<?php
|
||||
|
||||
// What is this here for? I think it's cruft, but comment out for now in case it's here for a reason
|
||||
// require_once('acl_selectors.php');
|
||||
|
||||
function editlayout_content(&$a) {
|
||||
|
||||
// We first need to figure out who owns the webpage, grab it from an argument
|
||||
$which = argv(1);
|
||||
|
||||
// $a->get_channel() and stuff don't work here, so we've got to find the owner for ourselves.
|
||||
$r = q("select channel_id from channel where channel_address = '%s'",
|
||||
dbesc($which)
|
||||
);
|
||||
if($r) {
|
||||
$owner = intval($r[0]['channel_id']);
|
||||
//logger('owner: ' . print_r($owner,true));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
|
||||
$which = $channel['channel_address'];
|
||||
}
|
||||
|
||||
|
||||
$o = '';
|
||||
|
||||
|
||||
// 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;
|
||||
}
|
||||
|
||||
// Now we've got a post and an owner, let's find out if we're allowed to edit it
|
||||
|
||||
$observer = $a->get_observer();
|
||||
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
|
||||
|
||||
$perms = get_all_perms($owner,$ob_hash);
|
||||
|
||||
if(! $perms['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($owner)
|
||||
);
|
||||
|
||||
|
||||
|
||||
$plaintext = true;
|
||||
// You may or may not be a local user. This won't work,
|
||||
if(feature_enabled(local_user(),'richtext'))
|
||||
$plaintext = false;
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit block')
|
||||
));
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
));
|
||||
|
||||
|
||||
$tpl = get_markup_template("jot.tpl");
|
||||
|
||||
$jotplugins = '';
|
||||
$jotnets = '';
|
||||
|
||||
call_hooks('jot_tool', $jotplugins);
|
||||
call_hooks('jot_networks', $jotnets);
|
||||
|
||||
$channel = $a->get_channel();
|
||||
|
||||
//$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 = '/layouts/' . $which;
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$return_path' => $rp,
|
||||
'$action' => 'item',
|
||||
'$share' => t('Edit'),
|
||||
'$upload' => t('Upload photo'),
|
||||
'$attach' => t('Attach file'),
|
||||
'$weblink' => t('Insert web link'),
|
||||
'$youtube' => t('Insert YouTube video'),
|
||||
'$video' => t('Insert Vorbis [.ogg] video'),
|
||||
'$audio' => t('Insert Vorbis [.ogg] audio'),
|
||||
'$setloc' => t('Set your location'),
|
||||
'$noloc' => t('Clear browser location'),
|
||||
'$wait' => t('Please wait'),
|
||||
'$permset' => t('Permission settings'),
|
||||
'$ptyp' => $itm[0]['type'],
|
||||
'$content' => undo_post_tagging($itm[0]['body']),
|
||||
'$post_id' => $post_id,
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$defloc' => $channel['channel_location'],
|
||||
'$visitor' => 'none',
|
||||
'$pvisit' => 'none',
|
||||
'$public' => t('Public post'),
|
||||
'$jotnets' => $jotnets,
|
||||
'$title' => htmlspecialchars($itm[0]['title']),
|
||||
'$placeholdertitle' => t('Set title'),
|
||||
'$category' => '',
|
||||
'$placeholdercategory' => t('Categories (comma-separated list)'),
|
||||
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
|
||||
'$lockstate' => $lockstate,
|
||||
'$acl' => '',
|
||||
'$bang' => '',
|
||||
'$profile_uid' => (intval($owner)),
|
||||
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
|
||||
'$jotplugins' => $jotplugins,
|
||||
'$sourceapp' => t($a->sourcename),
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
|
||||
17
mod/item.php
17
mod/item.php
@ -70,7 +70,6 @@ function item_post(&$a) {
|
||||
$categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : '');
|
||||
$webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0);
|
||||
$pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']): '');
|
||||
$buildblock = ((x($_REQUEST,'buildblock')) ? intval($_REQUEST['buildblock']) : 0);
|
||||
|
||||
if($pagetitle) {
|
||||
require_once('library/urlify/URLify.php');
|
||||
@ -491,13 +490,7 @@ function item_post(&$a) {
|
||||
$item_restrict = $item_restrict | ITEM_MODERATED;
|
||||
|
||||
if($webpage)
|
||||
$item_restrict = $item_restrict | ITEM_WEBPAGE;
|
||||
|
||||
if($buildblock)
|
||||
$item_restrict = $item_restrict | ITEM_BUILDBLOCK;
|
||||
|
||||
if($pdl)
|
||||
$item_restrict = $item_restrict | ITEM_PDL;
|
||||
$item_restrict = $item_restrict | $webpage;
|
||||
|
||||
|
||||
if(! strlen($verb))
|
||||
@ -769,11 +762,11 @@ function item_post(&$a) {
|
||||
|
||||
$page_type = '';
|
||||
|
||||
if($webpage)
|
||||
if($webpage & ITEM_WEBPAGE)
|
||||
$page_type = 'WEBPAGE';
|
||||
elseif($buildblock)
|
||||
elseif($webpage & ITEM_BUILDBLOCK)
|
||||
$page_type = 'BUILDBLOCK';
|
||||
elseif($ptemplate)
|
||||
elseif($webpage & ITEM_PDL)
|
||||
$page_type = 'PDL';
|
||||
|
||||
if($page_type) {
|
||||
@ -783,8 +776,6 @@ function item_post(&$a) {
|
||||
// if no pagetitle was given or it couldn't be transliterated into a url, use the first
|
||||
// sixteen bytes of the mid - which makes the link portable and not quite as daunting
|
||||
// as the entire mid. If it were the post_id the link would be less portable.
|
||||
// We should have the ability to edit this and arrange pages into menus via the pages module
|
||||
|
||||
|
||||
q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )",
|
||||
intval($post_id),
|
||||
|
||||
82
mod/layouts.php
Normal file
82
mod/layouts.php
Normal file
@ -0,0 +1,82 @@
|
||||
<?php
|
||||
|
||||
function layouts_content(&$a) {
|
||||
|
||||
if(argc() > 1)
|
||||
$which = argv(1);
|
||||
else {
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
$a->error = 404;
|
||||
return;
|
||||
}
|
||||
|
||||
profile_load($a,$which,0);
|
||||
|
||||
|
||||
// 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']);
|
||||
}
|
||||
|
||||
// Get the observer, check their permissions
|
||||
|
||||
$observer = $a->get_observer();
|
||||
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
|
||||
|
||||
$perms = get_all_perms($owner,$ob_hash);
|
||||
|
||||
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
|
||||
// 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');
|
||||
$x = array(
|
||||
'webpage' => ITEM_PDL,
|
||||
'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) ? '!' : ''),
|
||||
'visitor' => 'block',
|
||||
'profile_uid' => intval($owner),
|
||||
);
|
||||
|
||||
$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 = 'PDL' order by sid asc",
|
||||
intval($owner)
|
||||
);
|
||||
|
||||
$pages = null;
|
||||
|
||||
if($r) {
|
||||
$pages = array();
|
||||
foreach($r as $rr) {
|
||||
$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Build the base URL for edit links
|
||||
$url = z_root() . "/editlayout/" . $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("webpagelist.tpl"), array(
|
||||
'$baseurl' => $url,
|
||||
'$edit' => t('Edit'),
|
||||
'$pages' => $pages,
|
||||
'$channel' => $which,
|
||||
'$view' => t('View'),
|
||||
'$preview' => '1',
|
||||
|
||||
));
|
||||
|
||||
|
||||
}
|
||||
@ -45,7 +45,7 @@ function webpages_content(&$a) {
|
||||
// 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');
|
||||
$x = array(
|
||||
'webpage' => 1,
|
||||
'webpage' => ITEM_WEBPAGE,
|
||||
'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'),
|
||||
|
||||
Reference in New Issue
Block a user