GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make userxrd part of the default hostmeta

This commit is contained in:
Evan Prodromou 2010-11-26 21:46:51 -05:00
parent 0a4911552e
commit fcc0825b14
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/hostmeta.php
View File

@ -51,6 +51,11 @@ class HostMetaAction extends Action
$xrd->host = $domain;
if(Event::handle('StartHostMetaLinks', array(&$xrd->links))) {
$url = common_local_url('userxrd');
$url.= '?uri={uri}';
$xrd->links[] = array('rel' => Discovery::LRDD_REL,
'template' => $url,
'title' => array('Resource Descriptor'));
Event::handle('EndHostMetaLinks', array(&$xrd->links));
}

2
lib/router.php
View File

@ -151,6 +151,8 @@ class Router
array('action' => 'publicxrds'));
$m->connect('.well-known/host-meta',
array('action' => 'hostmeta'));
$m->connect('main/xrd',
array('action' => 'userxrd'));
// these take a code

10
plugins/OStatus/OStatusPlugin.php
View File

@ -52,8 +52,6 @@ class OStatusPlugin extends Plugin
function onRouterInitialized($m)
{
// Discovery actions
$m->connect('main/xrd',
array('action' => 'userxrd'));
$m->connect('main/ownerxrd',
array('action' => 'ownerxrd'));
$m->connect('main/ostatus',
@ -1010,14 +1008,6 @@ class OStatusPlugin extends Plugin
return true;
}
function onStartHostMetaLinks(&$links) {
$url = common_local_url('userxrd');
$url.= '?uri={uri}';
$links[] = array('rel' => Discovery::LRDD_REL,
'template' => $url,
'title' => array('Resource Descriptor'));
}
function onEndXrdActionLinks(&$xrd, $user)
{
// Salmon