Events: Now with guid.

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index dfb188c138197f17bdd00aa2f608aec17df7cb25..094211360e03b107c23e7d841d385c96253b2ec1 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -6,9 +6,11 @@ function xrd_init(&$a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));
 
-       if(substr($uri,0,4) === 'http')
+       if(substr($uri,0,4) === 'http') {
+               $acct = false;
                $name = basename($uri);
-       else {
+       } else {
+               $acct = true;
                $local = str_replace('acct:', '', $uri);
                if(substr($local,0,2) == '//')
                        $local = substr($local,2);
@@ -27,25 +29,31 @@ function xrd_init(&$a) {
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
 
-       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'],
-                       '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
-               ));
-       }
-       else
-               $dspr = '';
+       $tpl = get_markup_template('xrd_diaspora.tpl');
+       $dspr = replace_macros($tpl,array(
+               '$baseurl' => $a->get_baseurl(),
+               '$dspr_guid' => $r[0]['guid'],
+               '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
+       ));
 
-       //$tpl = file_get_contents('view/xrd_person.tpl');
        $tpl = get_markup_template('xrd_person.tpl');
 
+       $profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
+
+       if ($acct)
+               $alias = $profile_url;
+       else {
+               $alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
+
+               if ($a->get_path())
+                       $alias .= '/'.$a->get_path();
+       }
+
        $o = replace_macros($tpl, array(
                '$nick'        => $r[0]['nickname'],
                '$accturi'     => $uri,
-               '$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
+               '$alias'       => $alias,
+               '$profile_url' => $profile_url,
                '$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'],