X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fxrds.php;h=70a18a6b9ba37b1ea4405646222662885e04d2a5;hb=800c2e9a094681eff82aacdba6e5d22d547c4950;hp=7448b50f7d145b8972391793d02057230e02d1f0;hpb=3a20f1202b032b755f657d42379fe1137cf7c699;p=quix0rs-gnu-social.git diff --git a/actions/xrds.php b/actions/xrds.php index 7448b50f7d..70a18a6b9b 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -28,19 +28,19 @@ class XrdsAction extends Action { $nickname = $this->trimmed('nickname'); $user = User::staticGet('nickname', $nickname); if (!$user) { - common_user_error(_t('No such user.')); + common_user_error(_('No such user.')); return; } $this->show_xrds($user); } function show_xrds($user) { - + header('Content-Type: application/xrds+xml'); common_start_xml(); common_element_start('XRDS', array('xmlns' => 'xri://$xrds')); - + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xml:id' => 'oauth', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', @@ -57,8 +57,7 @@ class XrdsAction extends Action { $this->show_service(OAUTH_ENDPOINT_AUTHORIZE, common_local_url('userauthorization'), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), - array(OAUTH_HMAC_SHA1), - $user->uri); + array(OAUTH_HMAC_SHA1)); $this->show_service(OAUTH_ENDPOINT_ACCESS, common_local_url('accesstoken'), @@ -69,18 +68,18 @@ class XrdsAction extends Action { NULL, array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), array(OAUTH_HMAC_SHA1)); - + common_element_end('XRD'); - + # XXX: decide whether to include user's ID/nickname in postNotice URL - + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'xml:id' => 'omb', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); - + common_element('Type', NULL, 'xri://$xrds*simple'); - + $this->show_service(OMB_ENDPOINT_POSTNOTICE, common_local_url('postnotice')); @@ -88,23 +87,23 @@ class XrdsAction extends Action { common_local_url('updateprofile')); common_element_end('XRD'); - + common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', 'version' => '2.0')); common_element('Type', NULL, 'xri://$xrds*simple'); - + $this->show_service(OAUTH_DISCOVERY, '#oauth'); $this->show_service(OMB_NAMESPACE, '#omb'); - + common_element_end('XRD'); - + common_element_end('XRDS'); common_end_xml(); } - + function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) { common_element_start('Service'); if ($uri) { @@ -122,7 +121,7 @@ class XrdsAction extends Action { } } if ($localId) { - common_element('LocalID', NULL, $localID); + common_element('LocalID', NULL, $localId); } common_element_end('Service'); }