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

webpages blocks fixes

Browse Source
This commit is contained in:
Mario Vavti
2015-04-23 21:04:01 +02:00
parent 4759fa662b
commit c696860cc5
6 changed files with 123 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mod/blocks.php
View File

@@ -70,7 +70,6 @@ function blocks_content(&$a) {
return;
}
// Block design features from visitors
if((! $uid) || ($uid != $owner)) {
@@ -105,11 +104,10 @@ function blocks_content(&$a) {
if($_REQUEST['pagetitle'])
$x['pagetitle'] = $_REQUEST['pagetitle'];
$editor = status_editor($a,$x);
$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc",
$r = q("select * from item_id left join item on item_id.iid = item.id
where item_id.uid = %d and service = 'BUILDBLOCK' order by item.created desc",
intval($owner)
);
@@ -118,7 +116,22 @@ function blocks_content(&$a) {
if($r) {
$pages = array();
foreach($r as $rr) {
$pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
$element_arr = array(
'type' => 'block',
'body' => $rr['body'],
'created' => $rr['created'],
'edited' => $rr['edited'],
'mimetype' => $rr['mimetype'],
'pagetitle' => $rr['sid'],
'mid' => $rr['mid']
);
$pages[$rr['iid']][] = array(
'url' => $rr['iid'],
'title' => $rr['sid'],
'created' => $rr['created'],
'edited' => $rr['edited'],
'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
);
}
}
@@ -128,8 +141,13 @@ function blocks_content(&$a) {
$o .= replace_macros(get_markup_template('blocklist.tpl'), array(
'$baseurl' => $url,
'$title' => t('Blocks'),
'$name' => t('Block Name'),
'$created' => t('Created'),
'$edited' => t('Edited'),
'$create' => t('Create'),
'$edit' => t('Edit'),
'$share' => t('Share'),
'$delete' => t('Delete'),
'$editor' => $editor,
'$pages' => $pages,
'$channel' => $which,