aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-26 18:35:10 -0700
committerzotlabs <mike@macgirvin.com>2016-10-26 18:35:10 -0700
commitd42da529ece416a3d69d30eea7ded96731774a62 (patch)
tree3f399ebac7e0703a09510c96699728dddb5d27b1 /Zotlabs/Module
parentaee274295136b80be7173a60be17b2f8e46b19a8 (diff)
downloadvolse-hubzilla-d42da529ece416a3d69d30eea7ded96731774a62.tar.gz
volse-hubzilla-d42da529ece416a3d69d30eea7ded96731774a62.tar.bz2
volse-hubzilla-d42da529ece416a3d69d30eea7ded96731774a62.zip
zot_finger from navbar people search looping
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Chanview.php29
1 files changed, 24 insertions, 5 deletions
diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
index c6dd07eb7..9aa83efc4 100644
--- a/Zotlabs/Module/Chanview.php
+++ b/Zotlabs/Module/Chanview.php
@@ -58,7 +58,9 @@ class Chanview extends \Zotlabs\Web\Controller {
}
logger('mod_chanview: constructed address ' . print_r($matches,true));
}
-
+
+ $r = null;
+
if($_REQUEST['address']) {
$j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null);
if($j['success']) {
@@ -66,19 +68,36 @@ class Chanview extends \Zotlabs\Web\Controller {
$r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($_REQUEST['address'])
);
- if($r)
+ if($r) {
\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) {
- // 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
- // hub so sending them there with a Zid will probably work anyway.
+ // 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
+ // hub so sending them there with a Zid will probably work anyway.
+
$url = ($_REQUEST['url']);
+ if(! $url) {
+ notice( t('Channel not found.') . EOL);
+ return;
+ }
if($observer)
$url = zid($url);
+
}
if (\App::$poi) {