don't use load_view_file() except in email templates and install of htconfig - to...

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index 47516e8dd50e4af3bbb059bcd6bb1425e75b8cbc..8ac6ff7cfca81d5b174f2d9f7ac309ab17dcbc26 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -5,11 +5,16 @@ require_once('salmon.php');
 function xrd_content(&$a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));
-       $local = str_replace('acct:', '', $uri);
-       if(substr($local,0,2) == '//')
-               $local = substr($local,2);
 
-       $name = substr($local,0,strpos($local,'@'));
+       if(substr($uri,0,4) === 'http')
+               $name = basename($uri);
+       else {
+               $local = str_replace('acct:', '', $uri);
+               if(substr($local,0,2) == '//')
+                       $local = substr($local,2);
+
+               $name = substr($local,0,strpos($local,'@'));
+       }
 
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                dbesc($name)
@@ -22,7 +27,7 @@ function xrd_content(&$a) {
 
        header("Content-type: text/xml");
 
-       $tpl = load_view_file('view/xrd_person.tpl');
+       $tpl = file_get_contents('view/xrd_person.tpl');
 
        $o = replace_macros($tpl, array(
                '$accturi'     => $uri,
@@ -34,6 +39,10 @@ function xrd_content(&$a) {
                '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key
        ));
 
+
+       $arr = array('user' => $r[0], 'xml' => $o);
+       call_hooks('personal_xrd', $arr);
+
        echo $o;
        killme();