diff options
author | Evan Prodromou <evan@status.net> | 2010-11-26 22:09:51 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-11-26 22:09:51 -0500 |
commit | edf660c6ffd19aeda42c889c1070a5f84b0c2cf2 (patch) | |
tree | e8b680e6915c4c0db1af418700b200afc7f15b42 | |
parent | fcc0825b14c1499ec97088fa4ec39a7bbb4d0ec1 (diff) |
Make userxrd work without OStatus enabled
-rw-r--r-- | actions/userxrd.php | 4 | ||||
-rw-r--r-- | lib/xrdaction.php | 44 |
2 files changed, 37 insertions, 11 deletions
diff --git a/actions/userxrd.php b/actions/userxrd.php index 575a07c40..582f7a35e 100644 --- a/actions/userxrd.php +++ b/actions/userxrd.php @@ -32,9 +32,9 @@ class UserxrdAction extends XrdAction parent::prepare($args); $this->uri = $this->trimmed('uri'); - $this->uri = Discovery::normalize($this->uri); + $this->uri = self::normalize($this->uri); - if (Discovery::isWebfinger($this->uri)) { + if (self::isWebfinger($this->uri)) { $parts = explode('@', substr(urldecode($this->uri), 5)); if (count($parts) == 2) { list($nick, $domain) = $parts; diff --git a/lib/xrdaction.php b/lib/xrdaction.php index 85a70f8b3..43826b32b 100644 --- a/lib/xrdaction.php +++ b/lib/xrdaction.php @@ -28,6 +28,10 @@ if (!defined('STATUSNET')) { class XrdAction extends Action { + const PROFILEPAGE = 'http://webfinger.net/rel/profile-page'; + const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from'; + const HCARD = 'http://microformats.org/profile/hcard'; + public $uri; public $user; @@ -46,7 +50,7 @@ class XrdAction extends Action } if (empty($xrd->subject)) { - $xrd->subject = Discovery::normalize($this->uri); + $xrd->subject = self::normalize($this->uri); } if (Event::handle('StartXrdActionAliases', array(&$xrd, $this->user))) { @@ -74,12 +78,12 @@ class XrdAction extends Action if (Event::handle('StartXrdActionLinks', array(&$xrd, $this->user))) { - $xrd->links[] = array('rel' => Discovery::PROFILEPAGE, + $xrd->links[] = array('rel' => self::PROFILEPAGE, 'type' => 'text/html', 'href' => $profile->profileurl); // hCard - $xrd->links[] = array('rel' => Discovery::HCARD, + $xrd->links[] = array('rel' => self::HCARD, 'type' => 'text/html', 'href' => common_local_url('hcard', array('nickname' => $nick))); @@ -93,12 +97,7 @@ class XrdAction extends Action 'href' => common_local_url('foaf', array('nickname' => $nick))); - $xrd->links[] = array('rel' => Discovery::UPDATESFROM, - 'href' => common_local_url('ApiTimelineUser', - array('id' => $this->user->id, - 'format' => 'atom')), - 'type' => 'application/atom+xml'); - + Event::handle('EndXrdActionLinks', array(&$xrd, $this->user)); } @@ -106,4 +105,31 @@ class XrdAction extends Action header('Content-type: application/xrd+xml'); print $xrd->toXML(); } + + /** + * Given a "user id" make sure it's normalized to either a webfinger + * acct: uri or a profile HTTP URL. + */ + + public static function normalize($user_id) + { + if (substr($user_id, 0, 5) == 'http:' || + substr($user_id, 0, 6) == 'https:' || + substr($user_id, 0, 5) == 'acct:') { + return $user_id; + } + + if (strpos($user_id, '@') !== FALSE) { + return 'acct:' . $user_id; + } + + return 'http://' . $user_id; + } + + public static function isWebfinger($user_id) + { + $uri = self::normalize($user_id); + + return (substr($uri, 0, 5) == 'acct:'); + } } |