aboutsummaryrefslogtreecommitdiffstats
path: root/mod/wfinger.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-16 21:27:58 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-16 21:27:58 -0700
commitc34d8286a397b8a80d28a9b1d13a297196e4c124 (patch)
treefbccd4d982556ff6b917383f64bdc8872e8d7326 /mod/wfinger.php
parent4c5a74284bb1c2e23ef1e40c09d10f3449f8c853 (diff)
downloadvolse-hubzilla-c34d8286a397b8a80d28a9b1d13a297196e4c124.tar.gz
volse-hubzilla-c34d8286a397b8a80d28a9b1d13a297196e4c124.tar.bz2
volse-hubzilla-c34d8286a397b8a80d28a9b1d13a297196e4c124.zip
change matrix to grid, begin webfinger optimisation
Diffstat (limited to 'mod/wfinger.php')
-rw-r--r--mod/wfinger.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/mod/wfinger.php b/mod/wfinger.php
index c61a97b30..7b9eaa461 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -18,6 +18,8 @@ function wfinger_init(&$a) {
killme();
}
+ $zot = intval($_REQUEST['zot']);
+
$resource = $_REQUEST['resource'];
logger('webfinger: ' . $resource,LOGGER_DEBUG);
@@ -30,7 +32,7 @@ function wfinger_init(&$a) {
if(strpos($channel,'@') !== false) {
$host = substr($channel,strpos($channel,'@')+1);
if(strcasecmp($host,get_app()->get_hostname())) {
- goaway('https://' . $host . '/.well-known/webfinger?resource=' . $resource);
+ goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=' . $zot : ''));
}
$channel = substr($channel,0,strpos($channel,'@'));
}
@@ -52,10 +54,9 @@ function wfinger_init(&$a) {
header('Content-type: application/jrd+json');
-
if($resource && $r) {
- $h = q("select hubloc_addr from hubloc where hubloc_hash = '%s'",
+ $h = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
dbesc($r[0]['channel_hash'])
);
@@ -105,6 +106,13 @@ function wfinger_init(&$a) {
)
);
+ if($zot) {
+ // @FIXME do a lookup straightaway and return the zot-info packet
+
+ $_REQUEST['address'] = $r[0]['xchan_address'];
+
+
+ }
}
else {
header($_SERVER["SERVER_PROTOCOL"] . ' ' . 400 . ' ' . 'Bad Request');