From 2637831d9056862f7c3db718702116ef4652629a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 1 Aug 2011 21:02:25 -0700
Subject: some more zot changes migrating back to f9a mainline

---
 include/hostxrd.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/hostxrd.php')

diff --git a/include/hostxrd.php b/include/hostxrd.php
index 7040f927d..18c3e4b1e 100644
--- a/include/hostxrd.php
+++ b/include/hostxrd.php
@@ -1,11 +1,10 @@
 <?php
 
-function hostxrd($baseurl) {
-
+function hostxrd() {
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace('$domain',$baseurl,$tpl);
+	echo str_replace(array('$zroot','$domain'),array(z_root(),z_path()),$tpl);
 	session_write_close();
 	exit();
 
-- 
cgit v1.2.3


From 2abcf76ec17a9a7754c399cdde9a4449308a4b02 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 4 Aug 2011 22:37:45 -0700
Subject: salmon protocol changes magicsig draft-experimental, fixes to hostxrd

---
 include/hostxrd.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 include/hostxrd.php

(limited to 'include/hostxrd.php')

diff --git a/include/hostxrd.php b/include/hostxrd.php
deleted file mode 100644
index 18c3e4b1e..000000000
--- a/include/hostxrd.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-function hostxrd() {
-	header('Access-Control-Allow-Origin: *');
-	header("Content-type: text/xml");
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array('$zroot','$domain'),array(z_root(),z_path()),$tpl);
-	session_write_close();
-	exit();
-
-}
\ No newline at end of file
-- 
cgit v1.2.3