aboutsummaryrefslogtreecommitdiffstats
path: root/mod/hostxrd.php
diff options
context:
space:
mode:
authortony baldwin <tony@tonybaldwin.org>2014-04-12 08:37:56 -0400
committertony baldwin <tony@tonybaldwin.org>2014-04-12 08:37:56 -0400
commitebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch)
treec23cbf55aac433c90ac254d0684dabf9d4528133 /mod/hostxrd.php
parent5cca00ddc79dad667464674e08a2a860e262eabd (diff)
parentd0834c7e1394e1986b2b00e039125deff74d9e5e (diff)
downloadvolse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz
volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2
volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/css/style.css whatever
Diffstat (limited to 'mod/hostxrd.php')
-rw-r--r--mod/hostxrd.php24
1 files changed, 6 insertions, 18 deletions
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 0a66dcc84..ef86f2dd9 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -1,28 +1,16 @@
<?php
-require_once('include/crypto.php');
-
function hostxrd_init(&$a) {
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
- $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 = get_markup_template('xrd_host.tpl');
- echo replace_macros($tpl, array(
+ $x = replace_macros(get_markup_template('xrd_host.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')),
+ '$zroot' => z_root()
));
- session_write_close();
- exit();
-
+ $arr = array('xrd' => $x);
+ call_hooks('hostxrd',$arr);
+ echo $arr['xrd'];
+ killme();
}