debugging for addopenid problem

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

diff --git a/actions/xrds.php b/actions/xrds.php
index 6b4c3cdf514f1392c5964a388c7ca3fac2a44bf1..1b10f947735045ed2ac3ff374b4afed25e62f255 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -36,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'));
@@ -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'),
@@ -107,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) {
@@ -120,7 +121,7 @@ class XrdsAction extends Action {
                        }
                }
                if ($localId) {
-                       common_element('LocalID', NULL, $localID);
+                       common_element('LocalID', NULL, $localId);
                }
                common_element_end('Service');
        }