Merge pull request #3861 from annando/direct-forum-post

[friendica.git] / mod / hostxrd.php

diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 9b2411f26692a659b2b15c573356348158f1903c..fd4bfd10b06fa8daea782515fa5489fa15da7504 100644 (file)
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -1,8 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('include/crypto.php');
 
-function hostxrd_init(&$a) {
+function hostxrd_init(App $a) {
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
        $pubkey = get_config('system','site_pubkey');
@@ -14,10 +17,17 @@ function hostxrd_init(&$a) {
                set_config('system','site_pubkey', $res['pubkey']);
        }
 
-       $tpl = file_get_contents('view/xrd_host.tpl');
-       echo str_replace(array(
-               '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
-       session_write_close();
+       //$tpl = file_get_contents('view/xrd_host.tpl');
+       /*echo str_replace(array(
+               '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
+       $tpl = get_markup_template('xrd_host.tpl');
+       echo replace_macros($tpl, array(
+               '$zhost' => $a->get_hostname(),
+               '$zroot' => System::baseUrl(),
+               '$domain' => System::baseUrl(),
+               '$zot_post' => System::baseUrl() . '/post',
+               '$bigkey' => salmon_key(get_config('system','site_pubkey')),
+       ));
        exit();
 
-}
\ No newline at end of file
+}