diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Chanview.php | 29 | ||||
| -rw-r--r-- | Zotlabs/Module/Linkinfo.php | 17 |
2 files changed, 36 insertions, 10 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) { diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index e1a3a6abe..8f8231c49 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -13,7 +13,7 @@ class Linkinfo extends \Zotlabs\Web\Controller { $text = null; $str_tags = ''; - + $process_oembed = true; $br = "\n"; @@ -22,6 +22,11 @@ class Linkinfo extends \Zotlabs\Web\Controller { else $url = trim($_GET['url']); + if(substr($url,0,1) === '!') { + $process_oembed = false; + $url = substr($url,1); + } + $url = strip_zids($url); if((substr($url,0,1) != '/') && (substr($url,0,4) != 'http')) @@ -91,10 +96,12 @@ class Linkinfo extends \Zotlabs\Web\Controller { killme(); } - $x = oembed_process($url); - if($x) { - echo $x; - killme(); + if($process_oembed) { + $x = oembed_process($url); + if($x) { + echo $x; + killme(); + } } if($url && $title && $text) { |