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

put vcard widget with author of top-level post on display page

Browse Source
This commit is contained in:
zotlabs 2018-03-27 18:01:20 -07:00
parent 5ea11d1222
commit 08274ffab7
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Display.php
View File

@ -102,7 +102,7 @@ class Display extends \Zotlabs\Web\Controller {
if($decoded) if($decoded)
$item_hash = $decoded; $item_hash = $decoded;
$r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1",
dbesc($item_hash . '%') dbesc($item_hash . '%')
); );
@ -110,6 +110,13 @@ class Display extends \Zotlabs\Web\Controller {
$target_item = $r[0]; $target_item = $r[0];
} }
$x = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($target_item['author_xchan'])
);
if($x) {
\App::$poi = $x[0];
}
//if the item is to be moderated redirect to /moderate //if the item is to be moderated redirect to /moderate
if($target_item['item_blocked'] == ITEM_MODERATED) { if($target_item['item_blocked'] == ITEM_MODERATED) {
goaway(z_root() . '/moderate/' . $target_item['id']); goaway(z_root() . '/moderate/' . $target_item['id']);
@ -169,6 +176,7 @@ class Display extends \Zotlabs\Web\Controller {
} }
} }
$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);

1
include/connections.php
View File

@ -100,7 +100,6 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') {
if(! $xchan) if(! $xchan)
return; return;
// FIXME - show connect button to observer if appropriate
$connect = false; $connect = false;
if(local_channel()) { if(local_channel()) {
$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",

3
view/pdl/mod_display.pdl
View File

@ -1,3 +1,6 @@
[region=aside]
[widget=vcard][/widget]
[/region]
[region=right_aside] [region=right_aside]
[widget=notifications][/widget] [widget=notifications][/widget]
[widget=newmember][/widget] [widget=newmember][/widget]