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

rework the pdl_selector a bit since we've slightly changed the way layouts are stored.

Browse Source
This commit is contained in:
friendica 2013-09-01 18:36:14 -07:00
parent cbab62c95e
commit a1906482dc
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/comanche.php
View File

@ -17,16 +17,10 @@ function pdl_selector($uid,$current="") {
$o = ''; $o = '';
// You can use anybody's Comanche layouts on this site that haven't been protected in some way
$sql_extra = item_permissions_sql($uid); $sql_extra = item_permissions_sql($uid);
// By default order by title (therefore at this time pdl's need a unique title across this system), $r = q("select item_id.*, mid from item_id left join item on iid = item.id where item_id.uid = %d and item_id.uid = item.uid and service = 'PDL' order by sid asc",
// though future work may allow categorisation intval($owner)
// based on taxonomy terms
$r = q("select title, mid from item where (item_restrict & %d) $sql_extra order by title",
intval(ITEM_PDL)
); );
$arr = array('channel_id' => $uid, 'current' => $current, 'entries' => $r); $arr = array('channel_id' => $uid, 'current' => $current, 'entries' => $r);
@ -39,7 +33,7 @@ function pdl_selector($uid,$current="") {
$entries[] = array('title' => t('Default'), 'mid' => ''); $entries[] = array('title' => t('Default'), 'mid' => '');
foreach($entries as $selection) { foreach($entries as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : ''); $selected = (($selection == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['title']}</option>"; $o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['sid']}</option>";
} }
$o .= '</select>'; $o .= '</select>';

13
mod/page.php
View File

@ -61,6 +61,19 @@ function page_content(&$a) {
return; return;
} }
if($r[0]['layout_mid']) {
$l = q("select body from item where mid = '%s' and uid = %d limit 1",
dbesc($r[0]['layout_mid']),
intval($u[0]['channel_id'])
);
if($l) {
require_once('include/comanche.php');
comanche_parser(get_app(),$l[0]['body']);
}
}
// Use of widgets should be determined by Comanche, but we don't have it yet, so... // Use of widgets should be determined by Comanche, but we don't have it yet, so...
if ($perms['write_pages']) { if ($perms['write_pages']) {