correct server error output

[quix0rs-gnu-social.git] / actions / xrds.php

diff --git a/actions/xrds.php b/actions/xrds.php
index ad78e86b2a00552cfad4585b27cfb7528e14cc99..1b10f947735045ed2ac3ff374b4afed25e62f255 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -19,19 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('OAUTH_NAMESPACE', 'http://oauth.net/core/1.0/');
-define('OMB_NAMESPACE', 'http://openmicroblogging.org/protocol/0.1');
-define('OAUTH_DISCOVERY', 'http://oauth.net/discovery/1.0');
+require_once(INSTALLDIR.'/lib/omb.php');
 
-define('OMB_ENDPOINT_UPDATEPROFILE', OMB_NAMESPACE.'updateProfile');
-define('OAUTH_ENDPOINT_REQUEST', OAUTH_NAMESPACE.'endpoint/request');
-define('OAUTH_ENDPOINT_AUTHORIZE', OAUTH_NAMESPACE.'endpoint/authorize');
-define('OAUTH_ENDPOINT_ACCESS', OAUTH_NAMESPACE.'endpoint/access');
-define('OAUTH_ENDPOINT_RESOURCE', OAUTH_NAMESPACE.'endpoint/resource');
-define('OAUTH_AUTH_HEADER', OAUTH_NAMESPACE.'parameters/auth-header');
-define('OAUTH_POST_BODY', OAUTH_NAMESPACE.'parameters/post-body');
-define('OAUTH_HMAC_SHA1', OAUTH_NAMESPACE.'signature/HMAC-SHA1');
-          
 class XrdsAction extends Action {
 
        function handle($args) {
@@ -47,7 +36,7 @@ class XrdsAction extends Action {
 
        function show_xrds($user) {
                
-               header('Content-Type: application/rdf+xml');
+               header('Content-Type: application/xrds+xml');
 
                common_start_xml();
                common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
@@ -59,24 +48,23 @@ class XrdsAction extends Action {
 
                common_element('Type', NULL, 'xri://$xrds*simple');
 
-               $this->show_service(OAUTH_ENDPONT_REQUEST,
+               $this->show_service(OAUTH_ENDPOINT_REQUEST,
                                                        common_local_url('requesttoken'),
                                                        array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
                                                        array(OAUTH_HMAC_SHA1),
                                                        $user->uri);
 
-               $this->show_service(OAUTH_ENDPONT_AUTHORIZE,
+               $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_ENDPONT_ACCESS,
+               $this->show_service(OAUTH_ENDPOINT_ACCESS,
                                                        common_local_url('accesstoken'),
                                                        array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
                                                        array(OAUTH_HMAC_SHA1));
 
-               $this->show_service(OAUTH_ENDPONT_RESOURCE,
+               $this->show_service(OAUTH_ENDPOINT_RESOURCE,
                                                        NULL,
                                                        array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
                                                        array(OAUTH_HMAC_SHA1));
@@ -92,10 +80,10 @@ class XrdsAction extends Action {
                
                common_element('Type', NULL, 'xri://$xrds*simple');
                
-               $this->show_service(OMB_ENDPONT_POSTNOTICE,
+               $this->show_service(OMB_ENDPOINT_POSTNOTICE,
                                                        common_local_url('postnotice'));
 
-               $this->show_service(OMB_ENDPONT_UPDATEPROFILE,
+               $this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
                                                        common_local_url('updateprofile'));
 
                common_element_end('XRD');
@@ -118,7 +106,9 @@ class XrdsAction extends Action {
        
        function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) {
                common_element_start('Service');
-               common_element('URI', NULL, $uri);
+               if ($uri) {
+                       common_element('URI', NULL, $uri);
+               }
                common_element('Type', NULL, $type);
                if ($params) {
                        foreach ($params as $param) {
@@ -131,7 +121,7 @@ class XrdsAction extends Action {
                        }
                }
                if ($localId) {
-                       common_element('LocalID', NULL, $localID);
+                       common_element('LocalID', NULL, $localId);
                }
                common_element_end('Service');
        }