Extract image management code to a helper function

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

diff --git a/actions/xrds.php b/actions/xrds.php
index e82685a78cd5c01c14c980cd1b4aa86c90b58523..14cb9d503e98a4a2842fa522b41754e6785e63d6 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -21,112 +21,117 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class XrdsAction extends Action {
-
-       function is_readonly() {
-               return true;
-       }
-
-       function handle($args) {
-               parent::handle($args);
-               $nickname = $this->trimmed('nickname');
-               $user = User::staticGet('nickname', $nickname);
-               if (!$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',
-                                                                                 'version' => '2.0'));
-
-               common_element('Type', NULL, 'xri://$xrds*simple');
-
-               $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_ENDPOINT_AUTHORIZE,
-                                                       common_local_url('userauthorization'),
-                                                       array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
-                                                       array(OAUTH_HMAC_SHA1));
-
-               $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_ENDPOINT_RESOURCE,
-                                                       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'));
-
-               $this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
-                                                       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) {
-                       common_element('URI', NULL, $uri);
-               }
-               common_element('Type', NULL, $type);
-               if ($params) {
-                       foreach ($params as $param) {
-                               common_element('Type', NULL, $param);
-                       }
-               }
-               if ($sigs) {
-                       foreach ($sigs as $sig) {
-                               common_element('Type', NULL, $sig);
-                       }
-               }
-               if ($localId) {
-                       common_element('LocalID', NULL, $localId);
-               }
-               common_element_end('Service');
-       }
+class XrdsAction extends Action
+{
+
+    function isReadOnly()
+    {                
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $nickname = $this->trimmed('nickname');
+        $user = User::staticGet('nickname', $nickname);
+        if (!$user) {
+            $this->clientError(_('No such user.'));
+            return;
+        }
+        $this->show_xrds($user);
+    }
+
+    function show_xrds($user)
+    {
+
+        header('Content-Type: application/xrds+xml');
+
+        common_start_xml();
+        $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
+
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xml:id' => 'oauth',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+
+        $this->element('Type', null, 'xri://$xrds*simple');
+
+        $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_ENDPOINT_AUTHORIZE,
+                            common_local_url('userauthorization'),
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                            array(OAUTH_HMAC_SHA1));
+
+        $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_ENDPOINT_RESOURCE,
+                            null,
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
+                            array(OAUTH_HMAC_SHA1));
+
+        $this->elementEnd('XRD');
+
+        # XXX: decide whether to include user's ID/nickname in postNotice URL
+
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xml:id' => 'omb',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+
+        $this->element('Type', null, 'xri://$xrds*simple');
+
+        $this->show_service(OMB_ENDPOINT_POSTNOTICE,
+                            common_local_url('postnotice'));
+
+        $this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
+                            common_local_url('updateprofile'));
+
+        $this->elementEnd('XRD');
+
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'version' => '2.0'));
+
+        $this->element('Type', null, 'xri://$xrds*simple');
+
+        $this->show_service(OAUTH_DISCOVERY,
+                            '#oauth');
+        $this->show_service(OMB_NAMESPACE,
+                            '#omb');
+
+        $this->elementEnd('XRD');
+
+        $this->elementEnd('XRDS');
+        common_end_xml();
+    }
+
+    function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
+    {
+        $this->elementStart('Service');
+        if ($uri) {
+            $this->element('URI', null, $uri);
+        }
+        $this->element('Type', null, $type);
+        if ($params) {
+            foreach ($params as $param) {
+                $this->element('Type', null, $param);
+            }
+        }
+        if ($sigs) {
+            foreach ($sigs as $sig) {
+                $this->element('Type', null, $sig);
+            }
+        }
+        if ($localId) {
+            $this->element('LocalID', null, $localId);
+        }
+        $this->elementEnd('Service');
+    }
 }
\ No newline at end of file