Implement Smarty3

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index 4889639f07dcf7ca8b8cd6d26aedc56613d752cd..7cfb643df1413bfa5d1d211369edfdcb89ee4929 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,9 +1,8 @@
 <?php
 
-require_once('salmon.php');
-require_once('certfns.php');
+require_once('include/crypto.php');
 
-function xrd_content(&$a) {
+function xrd_init(&$a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));
 
@@ -28,10 +27,9 @@ function xrd_content(&$a) {
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
 
-       $dspr_enabled = get_config('system','diaspora_enabled');
-
-       if($dspr_enabled) {
-               $tpl = file_get_contents('view/xrd_diaspora.tpl');
+       if(get_config('system','diaspora_enabled')) {
+               //$tpl = file_get_contents('view/xrd_diaspora.tpl');
+               $tpl = get_markup_template('xrd_diaspora.tpl');
                $dspr = replace_macros($tpl,array(
                        '$baseurl' => $a->get_baseurl(),
                        '$dspr_guid' => $r[0]['guid'],
@@ -41,25 +39,30 @@ function xrd_content(&$a) {
        else
                $dspr = '';
 
-
-       $tpl = file_get_contents('view/xrd_person.tpl');
+       //$tpl = file_get_contents('view/xrd_person.tpl');
+       $tpl = get_markup_template('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'])
        ));
 
 
        $arr = array('user' => $r[0], 'xml' => $o);
        call_hooks('personal_xrd', $arr);
 
-       echo $o;
+       echo $arr['xml'];
        killme();
 
 }