diff options
| -rw-r--r-- | include/hostxrd.php | 2 | ||||
| -rw-r--r-- | mod/xrd.php | 14 | ||||
| -rw-r--r-- | view/xrd_person.tpl | 38 |
3 files changed, 33 insertions, 21 deletions
diff --git a/include/hostxrd.php b/include/hostxrd.php index 3279cea68..f8c398927 100644 --- a/include/hostxrd.php +++ b/include/hostxrd.php @@ -1,5 +1,5 @@ <?php - + header("Content-type: text/xml"); $tpl = file_get_contents('view/xrd_host.tpl'); echo str_replace('$domain',$this->hostname,$tpl); session_write_close(); diff --git a/mod/xrd.php b/mod/xrd.php index 53985e10c..fd87803e9 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -20,16 +20,18 @@ function xrd_content(&$a) { $salmon_key = salmon_key($r[0]['spubkey']); - + header("Content-type: text/xml"); $tpl = load_view_file('view/xrd_person.tpl'); $o = replace_macros($tpl, array( - '$accturi' => $uri, - '$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' => 'data:application/magic-public-key,' . $salmon_key + '$accturi' => $uri, + '$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'], + '$atom' => $a->get_baseurl() . '/dfrn_poll/' . $r[0]['nickname'], + '$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid'], + '$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 )); echo $o; diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl index d7ce13efa..24bf9449a 100644 --- a/view/xrd_person.tpl +++ b/view/xrd_person.tpl @@ -1,20 +1,30 @@ -<?xml version='1.0' encoding='UTF-8'?> -<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> +<?xml version="1.0" encoding="UTF-8"?> +<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>$accturi</Subject> + <Alias>$accturi</Alias> <Alias>$profile_url</Alias> - <Link rel='http://purl.org/macgirvin/dfrn/1.0' - href='$profile_url' /> - <Link rel='http://webfinger.net/rel/profile-page' - type='text/html' - href='$profile_url' /> - <Link rel='http://microformats.org/profile/hcard' - type='text/html' - href='$profile_url' /> - <Link rel='http://webfinger.net/rel/avatar' - href='$photo' /> - <Link rel="salmon" href="$salmon" /> - <Link rel="magic-public-key" href="$modexp" /> + <Link rel="http://purl.org/macgirvin/dfrn/1.0" + href="$profile_url" /> + <Link rel="http://schemas.google.com/g/2010#updates-from" + type="application/atom+xml" + href="$atom" /> + <Link rel="http://webfinger.net/rel/profile-page" + type="text/html" + href="$profile_url" /> + <Link rel="http://microformats.org/profile/hcard" + type="text/html" + href="$profile_url" /> + <Link rel="http://webfinger.net/rel/avatar" + href="$photo" /> + <Link rel="salmon" + href="$salmon" /> + <Link rel="http://salmon-protocol.org/ns/salmon-replies" + href="$salmon" /> + <Link rel="http://salmon-protocol.org/ns/salmon-mention" + href="$salmen" /> + <Link rel="magic-public-key" + href="$modexp" /> </XRD> |