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

extend sys support to layouts

Browse Source
This commit is contained in:
friendica 2014-11-12 00:48:09 -08:00
parent 9be4fcce55
commit ada2e43ea2
4 changed files with 213 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
mod/editlayout.php
View File

@ -1,34 +1,79 @@
<?php <?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('include/identity.php');
// require_once('acl_selectors.php'); require_once('include/acl_selectors.php');
function editlayout_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 editlayout_content(&$a) { 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. if(! $a->profile) {
$r = q("select channel_id from channel where channel_address = '%s'", notice( t('Requested profile is not available.') . EOL );
dbesc($which) $a->error = 404;
return;
}
$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)
); );
if($r) { if($r) {
$owner = intval($r[0]['channel_id']); $owner = intval($r[0]['channel_id']);
//logger('owner: ' . print_r($owner,true)); }
} }
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) {
notice( t('Permission denied.') . EOL);
return;
}
$is_owner = (($uid && $uid == $owner) ? true : false);
if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
$which = $channel['channel_address'];
}
$o = ''; $o = '';
// 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);
@ -37,48 +82,41 @@ function editlayout_content(&$a) {
return; return;
} }
// Now we've got a post and an owner, let's find out if we're allowed to edit it // 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'] : '');
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash); $perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) { if(! $perms['write_pages']) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1",
// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here intval($post_id),
$itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", intval($owner)
intval($post_id), );
intval($owner)
);
$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1", $item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
$itm[0]['id'] intval($itm[0]['id'])
); );
if($item_id) if($item_id)
$layout_title = $item_id[0]['sid']; $layout_title = $item_id[0]['sid'];
$plaintext = true; $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( $o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Layout') '$title' => t('Edit Layout')
)); ));
$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, '$geotag' => $geotag,
'$nickname' => $a->user['nickname'], '$nickname' => $channel['channel_address'],
'$confirmdelete' => t('Delete layout?') '$confirmdelete' => t('Delete layout?')
)); ));
@ -91,71 +129,68 @@ function editlayout_content(&$a) {
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets); 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. // 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; $rp = '/layouts/' . $which;
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $rp, '$return_path' => $rp,
'$action' => 'item', '$action' => 'item',
'$webpage' => ITEM_PDL, '$webpage' => ITEM_PDL,
'$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'],
'$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' => $layout_title, '$pagetitle' => $layout_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($owner)), '$profile_uid' => (intval($owner)),
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$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) || ($itm[0]['owner_xchan'] === $ob)) if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
$o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />'; $o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
$x = array( $x = array(
'type' => 'layout', 'type' => 'layout',
'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;

4
mod/editwebpage.php
View File

@ -214,9 +214,7 @@ function editwebpage_content(&$a) {
)); ));
$ob = (($observer) ? $observer['xchan_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="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />'; $o .= '<br /><br /><a class="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />';

119
mod/layouts.php
View File

@ -1,36 +1,82 @@
<?php <?php
function layouts_content(&$a) { require_once('include/identity.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
function layouts_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 layouts_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;
}
}
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'] : '');
$perms = get_all_perms($owner,$ob_hash);
if(! $perms['write_pages']) {
notice( t('Permission denied.') . EOL);
return;
} }
// Block design features from visitors // Block design features from visitors
if((! local_user()) || (local_user() != $owner)) { if((! $uid) || ($uid != $owner)) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
// Get the observer, check their permissions // Get the observer, check their permissions
$observer = $a->get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner,$ob_hash); $perms = get_all_perms($owner,$ob_hash);
@ -41,7 +87,9 @@ function layouts_content(&$a) {
} }
if((argc() > 3) && (argv(2) === 'share') && (argv(3))) { if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
$r = q("select sid, service, mimetype, title, body from item_id left join item on item.id = item_id.iid where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc", $r = q("select sid, service, mimetype, title, body from item_id
left join item on item.id = item_id.iid
where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc",
intval($owner), intval($owner),
dbesc(argv(3)) dbesc(argv(3))
); );
@ -63,7 +111,6 @@ function layouts_content(&$a) {
'id' => 'layout-help-tab', 'id' => 'layout-help-tab',
)); ));
$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs)); $o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
@ -71,18 +118,16 @@ function layouts_content(&$a) {
// Nickname is set to the observers xchan, and profile_uid to the owners. // Nickname is set to the observers xchan, and profile_uid to the owners.
// This lets you post pages at other people's channels. // This lets you post pages at other people's channels.
require_once ('include/conversation.php');
$x = array( $x = array(
'webpage' => ITEM_PDL, 'webpage' => ITEM_PDL,
'is_owner' => true, 'is_owner' => true,
'nickname' => $a->profile['channel_address'], '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'), 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''), 'bang' => '',
'showacl' => false, 'showacl' => false,
'visitor' => false, 'visitor' => false,
'nopreview' => 1, 'nopreview' => 1,
'ptlabel' => t('Layout Name'), 'ptlabel' => t('Layout Name'),
'profile_uid' => intval($owner), 'profile_uid' => intval($owner),
); );
@ -96,10 +141,8 @@ function layouts_content(&$a) {
$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 iid, sid, mid from item_id left join item on item.id = item_id.iid
// TODO - this should be replaced with pagelist_widget where item_id.uid = %d and service = 'PDL' order by sid asc",
$r = q("select iid, sid, mid from item_id left join item on item.id = item_id.iid where item_id.uid = %d and service = 'PDL' order by sid asc",
intval($owner) intval($owner)
); );
@ -108,24 +151,28 @@ function layouts_content(&$a) {
if($r) { if($r) {
$pages = array(); $pages = array();
foreach($r as $rr) { foreach($r as $rr) {
$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid'], 'mid' => $rr['mid']); $pages[$rr['iid']][] = array(
'url' => $rr['iid'],
'title' => $rr['sid'],
'mid' => $rr['mid']
);
} }
} }
//Build the base URL for edit links //Build the base URL for edit links
$url = z_root() . "/editlayout/" . $which; $url = z_root() . '/editlayout/' . $which;
return $o . replace_macros(get_markup_template("layoutlist.tpl"), array( $o .= replace_macros(get_markup_template('layoutlist.tpl'), array(
'$baseurl' => $url, '$baseurl' => $url,
'$edit' => t('Edit'), '$edit' => t('Edit'),
'$share' => t('Share'), '$share' => t('Share'),
'$pages' => $pages, '$pages' => $pages,
'$channel' => $which, '$channel' => $which,
'$view' => t('View'), '$view' => t('View'),
'$preview' => '1', '$preview' => '1',
)); ));
return $o;
} }

2
version.inc
View File

@ -1 +1 @@
2014-11-11.856 2014-11-12.857