snakebite: bring back some of the legacy XML discovery interfaces, update as required.

3 files changed, 29 insertions, 35 deletions

diff --git a/mod/_well_known.php b/mod/_well_known.php
index c5a38078a..885ff9b50 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -19,6 +19,13 @@ function _well_known_init(&$a){
 				require_once('mod/wfinger.php');

 				wfinger_init($a);

 				break;

+			case 'host-meta':

+				$a->argc -= 1;

+				array_shift($a->argv);

+				$a->argv[0] = 'hostxrd';

+				require_once('mod/hostxrd.php');

+				hostxrd_init($a);

+				break;

 			default:

 				break;

 

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();
 }
diff --git a/mod/xrd.php b/mod/xrd.php
index a576f76c4..4d6a530e4 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -16,35 +16,34 @@ function xrd_init(&$a) {
 		$name = substr($local,0,strpos($local,'@'));
 	}
 
-	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+	$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
 		dbesc($name)
 	);
-	if(! count($r))
+	if(! $r) 
 		killme();
 
-	$salmon_key = salmon_key($r[0]['pubkey']);
+//	$salmon_key = salmon_key($r[0]['pubkey']);
 
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 
-	$dspr = '';
 
 	$tpl = get_markup_template('view/xrd_person.tpl');
 
-	$o = replace_macros($tpl, array(
-		'$nick'        => $r[0]['nickname'],
+	$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
+		'$nick'        => $r[0]['channel_address'],
 		'$accturi'     => $uri,
-		'$profile_url' => $a->get_baseurl() . '/channel/'       . $r[0]['nickname'],
-		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
-		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
-		'$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],
-		'$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['nickname'],
-		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid'],
-		'$dspr'        => $dspr,
-		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
-		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
-		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
-		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
+		'$profile_url' => $a->get_baseurl() . '/channel/'       . $r[0]['channel_address'],
+//		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['channel_address'],
+		'$atom'        => $a->get_baseurl() . '/feed/'          . $r[0]['channel_address'],
+		'$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['channel_address'],
+		'$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['channel_address'],
+		'$photo'       => $a->get_baseurl() . '/photo/profile/l/' . $r[0]['channel_id'],
+//		'$dspr'        => $dspr,
+//		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'],
+//		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'] . '/mention',
+//		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
+//		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
 	));