aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Xrd.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2021-02-04 22:16:48 +0100
committerMario Vavti <mario@mariovavti.com>2021-02-04 22:16:48 +0100
commit19007dd8ebc0d4364cff56c923f5ea8fad018b76 (patch)
tree78ce535e6ad536d474dd301d5c1f7f4a376b6659 /Zotlabs/Module/Xrd.php
parent03e1f5f8a41c88e8feea19784d7521435e7e4b2e (diff)
downloadvolse-hubzilla-19007dd8ebc0d4364cff56c923f5ea8fad018b76.tar.gz
volse-hubzilla-19007dd8ebc0d4364cff56c923f5ea8fad018b76.tar.bz2
volse-hubzilla-19007dd8ebc0d4364cff56c923f5ea8fad018b76.zip
move key conversion to separate lib
Diffstat (limited to 'Zotlabs/Module/Xrd.php')
-rw-r--r--Zotlabs/Module/Xrd.php38
1 files changed, 20 insertions, 18 deletions
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 959e31cbe..21574eb8d 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -1,19 +1,21 @@
<?php
namespace Zotlabs\Module;
+use Zotlabs\Lib\Keyutils;
+
require_once('include/crypto.php');
class Xrd extends \Zotlabs\Web\Controller {
function init() {
-
+
$uri = urldecode(notags(trim($_GET['uri'])));
$subject = $uri;
logger('xrd: ' . $uri,LOGGER_DEBUG);
-
+
$resource = $uri;
-
+
if(substr($uri,0,4) === 'http') {
$uri = str_replace('~','',$uri);
$name = basename($uri);
@@ -22,29 +24,29 @@ class Xrd extends \Zotlabs\Web\Controller {
$local = str_replace('acct:', '', $uri);
if(substr($local,0,2) == '//')
$local = substr($local,2);
-
+
$name = substr($local,0,strpos($local,'@'));
}
-
+
$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
dbesc($name)
);
- if(! $r)
+ if(! $r)
killme();
-
- $salmon_key = salmon_key($r[0]['channel_pubkey']);
-
+
+ $salmon_key = Keyutils::salmonKey($r[0]['channel_pubkey']);
+
header('Access-Control-Allow-Origin: *');
header("Content-type: application/xrd+xml");
-
-
+
+
$aliases = array('acct:' . channel_reddress($r[0]), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']);
-
+
for($x = 0; $x < count($aliases); $x ++) {
if($aliases[$x] === $resource)
unset($aliases[$x]);
}
-
+
$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
'$nick' => $r[0]['channel_address'],
'$accturi' => $resource,
@@ -60,14 +62,14 @@ class Xrd extends \Zotlabs\Web\Controller {
'$modexp' => 'data:application/magic-public-key,' . $salmon_key,
'$subscribe' => z_root() . '/follow?f=&amp;url={uri}',
));
-
-
+
+
$arr = array('user' => $r[0], 'xml' => $o);
call_hooks('personal_xrd', $arr);
-
+
echo $arr['xml'];
killme();
-
+
}
-
+
}