From 013d2604f886bc7cbd2c5263d3577e8cf40f9fcc Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Tue, 12 Oct 2010 04:07:03 -0700
Subject: inline salmon magic keys

---
 mod/xrd.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'mod/xrd.php')

diff --git a/mod/xrd.php b/mod/xrd.php
index 06b2442b2..53985e10c 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once('salmon.php');
 
 function xrd_content(&$a) {
 
@@ -16,6 +17,11 @@ function xrd_content(&$a) {
 	if(! count($r))
 		killme();
 
+	$salmon_key = salmon_key($r[0]['spubkey']);
+
+
+
+
 	$tpl = load_view_file('view/xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
@@ -23,10 +29,10 @@ function xrd_content(&$a) {
 		'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
 		'$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid'],
 		'$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention',
-		'$modexp' => $a->get_baseurl() . '/modexp/' . $r[0]['nickname']
+		'$modexp' => 'data:application/magic-public-key,' . $salmon_key
 	));
 
 	echo $o;
 	killme();
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3