Adds theme info file to define 'parent' theme from where load tpl files

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index 9021222b748fc898e7b929e3891350dcd1a984be..dae6e4828b4c49eebedc49705b5fb5b6690e953b 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'])));
 
@@ -23,14 +22,12 @@ function xrd_content(&$a) {
        if(! count($r))
                killme();
 
-       $salmon_key = str_replace('=','',salmon_key($r[0]['spubkey']));
+       $salmon_key = salmon_key($r[0]['spubkey']);
 
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
 
-       $dspr_enabled = get_config('system','diaspora_enabled');
-
-       if($dspr_enabled) {
+       if(get_config('system','diaspora_enabled')) {
                $tpl = file_get_contents('view/xrd_diaspora.tpl');
                $dspr = replace_macros($tpl,array(
                        '$baseurl' => $a->get_baseurl(),
@@ -41,7 +38,6 @@ function xrd_content(&$a) {
        else
                $dspr = '';
 
-
        $tpl = file_get_contents('view/xrd_person.tpl');
 
        $o = replace_macros($tpl, array(
@@ -49,6 +45,7 @@ function xrd_content(&$a) {
                '$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'],
                '$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
                '$dspr'        => $dspr,
                '$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
@@ -60,7 +57,7 @@ function xrd_content(&$a) {
        $arr = array('user' => $r[0], 'xml' => $o);
        call_hooks('personal_xrd', $arr);
 
-       echo $o;
+       echo $arr['xml'];
        killme();
 
 }