don't accept pubsub from diaspora

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index accc2f68ef1f0388f8a9b193aa180dafccc3f311..fcec74336e4eeda0e27726de34263530d03e9a80 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once('salmon.php');
+require_once('include/crypto.php');
 
-function xrd_content(&$a) {
+function xrd_init(&$a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));
 
@@ -27,25 +27,23 @@ function xrd_content(&$a) {
        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(),
                        '$dspr_guid' => $r[0]['guid'],
-                       '$dspr_key' => base64_encode($r[0]['pubkey'])
+                       '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
                ));
        }
        else
                $dspr = '';
 
-
        $tpl = file_get_contents('view/xrd_person.tpl');
 
        $o = replace_macros($tpl, array(
                '$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'],
                '$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
                '$dspr'        => $dspr,
@@ -58,7 +56,7 @@ function xrd_content(&$a) {
        $arr = array('user' => $r[0], 'xml' => $o);
        call_hooks('personal_xrd', $arr);
 
-       echo $o;
+       echo $arr['xml'];
        killme();
 
 }