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

allow poke by xchan_hash

Browse Source
This commit is contained in:
zotlabs 2017-06-25 18:30:22 -07:00
parent 21542d1f9e
commit ef53db0b91
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Zotlabs/Module/Poke.php
View File

@ -41,7 +41,10 @@ class Poke extends \Zotlabs\Web\Controller {
$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]); $activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
$contact_id = intval($_REQUEST['cid']); $contact_id = intval($_REQUEST['cid']);
if(! $contact_id)
$xchan = trim($_REQUEST['xchan']);
if(! ($contact_id || $xchan))
return; return;
$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0); $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
@ -49,13 +52,20 @@ class Poke extends \Zotlabs\Web\Controller {
logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG); logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
$r = q("SELECT * FROM abook left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_channel = %d LIMIT 1", if($contact_id) {
intval($contact_id), $r = q("SELECT * FROM abook left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_channel = %d LIMIT 1",
intval($uid) intval($contact_id),
); intval($uid)
);
}
if($xchan) {
$r = q("SELECT * FROM xchan where xchan_hash like ( '%s' ) LIMIT 1",
dbesc($xchan . '%')
);
}
if(! $r) { if(! $r) {
logger('poke: no target ' . $contact_id); logger('poke: no target.');
return; return;
} }
@ -79,7 +89,7 @@ class Poke extends \Zotlabs\Web\Controller {
$deny_gid = $r[0]['deny_gid']; $deny_gid = $r[0]['deny_gid'];
} }
} }
else { elseif($contact_id) {
$item_private = ((x($_GET,'private')) ? intval($_GET['private']) : 0); $item_private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
@ -92,9 +102,11 @@ class Poke extends \Zotlabs\Web\Controller {
$arr = array(); $arr = array();
$arr['item_wall'] = 1; $arr['item_wall'] = 1;
$arr['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $channel['channel_hash']); $arr['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $channel['channel_hash']);
$arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid); $arr['parent_mid'] = (($parent_mid) ? $parent_mid : '');
$arr['title'] = ''; $arr['title'] = '';
$arr['allow_cid'] = $allow_cid; $arr['allow_cid'] = $allow_cid;
$arr['allow_gid'] = $allow_gid; $arr['allow_gid'] = $allow_gid;