diff --git a/mod/xrd.php b/mod/xrd.php
index 97ee0016e4..72175d67f3 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -6,11 +6,20 @@ use Friendica\Core\System;
require_once('include/crypto.php');
function xrd_init(App $a) {
-
- $uri = urldecode(notags(trim($_GET['uri'])));
-
- if ($uri == "") {
+ if ($a->argv[0] == 'xrd') {
+ $uri = urldecode(notags(trim($_GET['uri'])));
+ if ($_SERVER['HTTP_ACCEPT'] == 'application/jrd+json') {
+ $mode = 'json';
+ } else {
+ $mode = 'xml';
+ }
+ } else {
$uri = urldecode(notags(trim($_GET['resource'])));
+ if ($_SERVER['HTTP_ACCEPT'] == 'application/xrd+xml') {
+ $mode = 'xml';
+ } else {
+ $mode = 'json';
+ }
}
if(substr($uri,0,4) === 'http') {
@@ -20,36 +29,21 @@ function xrd_init(App $a) {
$acct = true;
$local = str_replace('acct:', '', $uri);
if(substr($local,0,2) == '//')
- $local = substr($local,2);
+ $local = substr($local, 2);
- $name = substr($local,0,strpos($local,'@'));
+ $name = substr($local, 0, strpos($local,'@'));
}
$r = dba::select('user', array(), array('nickname' => $name), array('limit' => 1));
- if (! dbm::is_result($r)) {
+ if (!dbm::is_result($r)) {
killme();
}
- $salmon_key = salmon_key($r['spubkey']);
-
- header('Access-Control-Allow-Origin: *');
- header("Content-type: text/xml");
-
- $tpl = get_markup_template('xrd_diaspora.tpl');
- $dspr = replace_macros($tpl,array(
- '$baseurl' => System::baseUrl(),
- '$dspr_guid' => $r['guid'],
- '$dspr_key' => base64_encode(pemtorsa($r['pubkey']))
- ));
-
- $tpl = get_markup_template('xrd_person.tpl');
-
$profile_url = System::baseUrl().'/profile/'.$r['nickname'];
if ($acct) {
$alias = $profile_url;
- }
- else {
+ } else {
$alias = 'acct:'.$r['nickname'].'@'.$a->get_hostname();
if ($a->get_path()) {
@@ -57,6 +51,46 @@ function xrd_init(App $a) {
}
}
+ if ($mode == 'xml') {
+ xrd_xml($a, $uri, $alias, $profile_url, $r);
+ } else {
+ xrd_json($a, $uri, $alias, $profile_url, $r);
+ }
+}
+
+function xrd_json($a, $uri, $alias, $profile_url, $r) {
+ $salmon_key = salmon_key($r['spubkey']);
+
+ header('Access-Control-Allow-Origin: *');
+ header("Content-type: application/json; charset=utf-8");
+
+ $json = array('subject' => $uri,
+ 'aliases' => array($alias),
+ 'links' => array(array('rel' => NAMESPACE_DFRN, 'href' => $profile_url),
+ array('rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']),
+ array('rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url),
+ array('rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']),
+ array('rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']),
+ array('rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'),
+ array('rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()),
+ array('rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']),
+ array('rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']),
+ array('rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'),
+ array('rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'),
+ array('rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key)
+));
+ echo json_encode($json);
+ killme();
+}
+
+function xrd_xml($a, $uri, $alias, $profile_url, $r) {
+ $salmon_key = salmon_key($r['spubkey']);
+
+ header('Access-Control-Allow-Origin: *');
+ header("Content-type: text/xml");
+
+ $tpl = get_markup_template('xrd_person.tpl');
+
$o = replace_macros($tpl, array(
'$nick' => $r['nickname'],
'$accturi' => $uri,
@@ -67,7 +101,7 @@ function xrd_init(App $a) {
'$zot_post' => System::baseUrl() . '/post/' . $r['nickname'],
'$poco_url' => System::baseUrl() . '/poco/' . $r['nickname'],
'$photo' => System::baseUrl() . '/photo/profile/' . $r['uid'] . '.jpg',
- '$dspr' => $dspr,
+ '$baseurl' => System::baseUrl(),
'$salmon' => System::baseUrl() . '/salmon/' . $r['nickname'],
'$salmen' => System::baseUrl() . '/salmon/' . $r['nickname'] . '/mention',
'$subscribe' => System::baseUrl() . '/follow?url={uri}',
@@ -75,11 +109,9 @@ function xrd_init(App $a) {
'$bigkey' => salmon_key($r['pubkey']),
));
-
$arr = array('user' => $r, 'xml' => $o);
call_hooks('personal_xrd', $arr);
echo $arr['xml'];
killme();
-
}
diff --git a/view/templates/xrd_diaspora.tpl b/view/templates/xrd_diaspora.tpl
deleted file mode 100644
index 59e3f7c4e7..0000000000
--- a/view/templates/xrd_diaspora.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/view/templates/xrd_host.tpl b/view/templates/xrd_host.tpl
index 5df18b173e..7a49e06c07 100644
--- a/view/templates/xrd_host.tpl
+++ b/view/templates/xrd_host.tpl
@@ -4,7 +4,8 @@
{{$zhost}}
-
+
+
{{$accturi}}
@@ -21,7 +20,9 @@
- {{$dspr}}
+
-
- {{$bigkey}}
-