diff options
| author | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
| commit | b80c218606994032e76805900cb9b340ea132358 (patch) | |
| tree | bf625cf4c59bf521e639018399bf1770d116a6a0 /mod/xrd.php | |
| parent | aa6d61d3b19cb13c30bf5a1579adefedf0cc9515 (diff) | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| download | volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.gz volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.bz2 volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.zip | |
Merge pull request #1 from friendica/master
test pull request
Diffstat (limited to 'mod/xrd.php')
| -rw-r--r-- | mod/xrd.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mod/xrd.php b/mod/xrd.php index 4d6a530e4..4fa81c7f3 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -22,7 +22,13 @@ function xrd_init(&$a) { if(! $r) killme(); -// $salmon_key = salmon_key($r[0]['pubkey']); + $dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array( + '$baseurl' => $a->get_baseurl(), + '$dspr_guid' => $r[0]['channel_guid'], + '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) + )); + + $salmon_key = salmon_key($r[0]['channel_pubkey']); header('Access-Control-Allow-Origin: *'); header("Content-type: text/xml"); @@ -34,15 +40,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']) )); |