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

zot_finger from navbar people search looping

Browse Source
This commit is contained in:
zotlabs 2016-10-26 18:35:10 -07:00
parent aee2742951
commit d42da529ec
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Zotlabs/Module/Chanview.php
View File

@ -58,7 +58,9 @@ class Chanview extends \Zotlabs\Web\Controller {
} }
logger('mod_chanview: constructed address ' . print_r($matches,true)); logger('mod_chanview: constructed address ' . print_r($matches,true));
} }
$r = null;
if($_REQUEST['address']) { if($_REQUEST['address']) {
$j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null); $j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null);
if($j['success']) { if($j['success']) {
@ -66,19 +68,36 @@ class Chanview extends \Zotlabs\Web\Controller {
$r = q("select * from xchan where xchan_addr = '%s' limit 1", $r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($_REQUEST['address']) dbesc($_REQUEST['address'])
); );
if($r) if($r) {
\App::$poi = $r[0]; \App::$poi = $r[0];
}
}
if(! $r) {
if(discover_by_webbie($_REQUEST['address'])) {
$r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($_REQUEST['address'])
);
if($r) {
\App::$poi = $r[0];
}
}
} }
} }
} }
if(! \App::$poi) { if(! \App::$poi) {
// We don't know who this is, and we can't figure it out from the URL // We don't know who this is, and we can't figure it out from the URL
// On the plus side, there's a good chance we know somebody else at that // On the plus side, there's a good chance we know somebody else at that
// hub so sending them there with a Zid will probably work anyway. // hub so sending them there with a Zid will probably work anyway.
$url = ($_REQUEST['url']); $url = ($_REQUEST['url']);
if(! $url) {
notice( t('Channel not found.') . EOL);
return;
}
if($observer) if($observer)
$url = zid($url); $url = zid($url);
} }
if (\App::$poi) { if (\App::$poi) {