From 75af366122fa472c28a4105553646c53ec0a16e7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 27 Sep 2011 06:50:18 -0700 Subject: [PATCH] zot/salmon new key format for batch keys --- mod/hostxrd.php | 4 +++- mod/xrd.php | 4 +++- view/xrd_host.tpl | 4 ++++ view/xrd_person.tpl | 6 +++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mod/hostxrd.php b/mod/hostxrd.php index 1cc18da7a..e057cccad 100644 --- a/mod/hostxrd.php +++ b/mod/hostxrd.php @@ -1,11 +1,13 @@ $r[0]['nickname'], '$accturi' => $uri, '$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'], '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'], @@ -50,7 +51,8 @@ function xrd_init(&$a) { '$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 + '$modexp' => 'data:application/magic-public-key,' . $salmon_key, + '$bigkey' => salmon_key($r[0]['pubkey']) )); diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl index ee687ffa9..d27f948ac 100644 --- a/view/xrd_host.tpl +++ b/view/xrd_host.tpl @@ -21,5 +21,9 @@ type="http://purl.org/zot/1.0/accept" zot:accept="application/atom+xml" /> + $bigkey + diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl index 7373499bf..2b5af3d0d 100644 --- a/view/xrd_person.tpl +++ b/view/xrd_person.tpl @@ -5,7 +5,7 @@ $accturi $profile_url - + $bigkey +