Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
old mode 100644 (file)
new mode 100755 (executable)
index dae6e48..2fa6bcd
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -41,16 +41,19 @@ function xrd_init(&$a) {
        $tpl = file_get_contents('view/xrd_person.tpl');
 
        $o = replace_macros($tpl, array(
+               '$nick'        => $r[0]['nickname'],
                '$accturi'     => $uri,
                '$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
                '$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
                '$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
                '$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],
+               '$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['nickname'],
                '$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
                '$dspr'        => $dspr,
                '$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
                '$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
-               '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key
+               '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
+               '$bigkey'      =>  salmon_key($r[0]['pubkey'])
        ));