Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / hostxrd.php

diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index e057cccad8547155db9eee7ca88e412817779f55..4121764f1a526b340fc1c4805aa705a0a8a0f97a 100644 (file)
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -5,10 +5,27 @@ require_once('include/crypto.php');
 function hostxrd_init(&$a) {
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
-       $tpl = file_get_contents('view/xrd_host.tpl');
-       echo str_replace(array(
-               '$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+       $pubkey = get_config('system','site_pubkey');
+
+       if(! $pubkey) {
+               $res = new_keypair(1024);
+
+               set_config('system','site_prvkey', $res['prvkey']);
+               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);*/
+       $tpl = get_markup_template('xrd_host.tpl');
+       echo replace_macros($tpl, array(
+               '$zhost' => $a->get_hostname(),
+               '$zroot' => z_root(),
+               '$domain' => z_path(),
+               '$zot_post' => z_root() . '/post',
+               '$bigkey' => salmon_key(get_config('system','site_pubkey')),
+       ));
        session_write_close();
        exit();
 
-}
\ No newline at end of file
+}