diff options
| author | friendica <info@friendica.com> | 2014-08-21 17:42:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-21 17:42:19 -0700 |
| commit | 921799b045c376c2ffe80a0c4fe0dc6c2c78e854 (patch) | |
| tree | bb67e2285bd0402c855dc7eaf819385812391b33 /mod | |
| parent | 831714f0f0e5bd9a17c760a2476a12603be5d089 (diff) | |
| download | volse-hubzilla-921799b045c376c2ffe80a0c4fe0dc6c2c78e854.tar.gz volse-hubzilla-921799b045c376c2ffe80a0c4fe0dc6c2c78e854.tar.bz2 volse-hubzilla-921799b045c376c2ffe80a0c4fe0dc6c2c78e854.zip | |
make the old personal xrd interface (old webfinger) work again
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/xrd.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/mod/xrd.php b/mod/xrd.php index 4d6a530e4..d059bec9b 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -22,7 +22,20 @@ function xrd_init(&$a) { if(! $r) killme(); -// $salmon_key = salmon_key($r[0]['pubkey']); + if(get_config('system','diaspora_enabled')) { + $tpl = get_markup_template('xrd_diaspora.tpl'); + $dspr = replace_macros($tpl,array( + '$baseurl' => $a->get_baseurl(), + '$dspr_guid' => $r[0]['channel_guid'], + '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) + )); + } + else + $dspr = ''; + + + + $salmon_key = salmon_key($r[0]['channel_pubkey']); header('Access-Control-Allow-Origin: *'); header("Content-type: text/xml"); @@ -34,15 +47,15 @@ function xrd_init(&$a) { '$nick' => $r[0]['channel_address'], '$accturi' => $uri, '$profile_url' => $a->get_baseurl() . '/channel/' . $r[0]['channel_address'], -// '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'], + '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'], '$atom' => $a->get_baseurl() . '/feed/' . $r[0]['channel_address'], '$zot_post' => $a->get_baseurl() . '/post/' . $r[0]['channel_address'], '$poco_url' => $a->get_baseurl() . '/poco/' . $r[0]['channel_address'], '$photo' => $a->get_baseurl() . '/photo/profile/l/' . $r[0]['channel_id'], -// '$dspr' => $dspr, + '$dspr' => $dspr, // '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'], // '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention', -// '$modexp' => 'data:application/magic-public-key,' . $salmon_key, + '$modexp' => 'data:application/magic-public-key,' . $salmon_key, // '$bigkey' => salmon_key($r[0]['pubkey']) )); |