aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-17 19:08:15 -0700
committerfriendica <info@friendica.com>2014-09-17 19:08:15 -0700
commit618b93d42e54e0ecefb69d6e1acf24429d39785e (patch)
treeade0a31763509da8b05c85579b2ed1ff49275f26
parent401409357238183702c1628a02ccef6cf0394d72 (diff)
downloadvolse-hubzilla-618b93d42e54e0ecefb69d6e1acf24429d39785e.tar.gz
volse-hubzilla-618b93d42e54e0ecefb69d6e1acf24429d39785e.tar.bz2
volse-hubzilla-618b93d42e54e0ecefb69d6e1acf24429d39785e.zip
let the xchan diagnostic accept a webbie
-rw-r--r--mod/xchan.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/mod/xchan.php b/mod/xchan.php
index e51cc53cc..a4dc70550 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -7,7 +7,7 @@ function xchan_content(&$a) {
$o .= '<h3>Xchan Lookup</h3>';
$o .= '<form action="xchan" method="get">';
- $o .= 'Lookup xchan beginning with: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
+ $o .= 'Lookup xchan beginning with (or webbie): <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
$o .= '<br /><br />';
@@ -15,27 +15,27 @@ function xchan_content(&$a) {
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
- $r = q("select * from xchan where xchan_hash like '%s%%'",
+ $r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash",
+ dbesc($addr),
dbesc($addr)
);
if($r) {
- foreach($r as $rr)
+ foreach($r as $rr) {
$o .= str_replace("\n","<br />",print_r($rr,true)) . EOL;
- }
- else
- notice( t('Not found.') . EOL);
- $r = q("select * from hubloc where hubloc_hash like '%s%%'",
- dbesc($addr)
- );
-
- if($r) {
- foreach($r as $rr)
- $o .= str_replace("\n","<br />",print_r($rr,true)) . EOL;
+ $s = q("select * from hubloc where hubloc_hash like '%s'",
+ dbesc($r[0]['xchan_hash'])
+ );
+ if($s) {
+ foreach($s as $rr)
+ $o .= str_replace("\n","<br />",print_r($rr,true)) . EOL;
+ }
+ }
}
-
+ else
+ notice( t('Not found.') . EOL);
}
return $o;