register checks Profile bio length correctly

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

diff --git a/actions/xrds.php b/actions/xrds.php
index 7edc6aa39cbbfc6ef8070680017226c7e6cb728b..7518a5f709609e9825d48e97307ed897cc3c8de1 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -1,7 +1,19 @@
 <?php
-/*
+
+/**
+ * XRDS for OpenID
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,121 +29,89 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/omb.php');
+require_once INSTALLDIR.'/lib/omb.php';
+require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
+require_once INSTALLDIR.'/extlib/libomb/xrds_mapper.php';
 
+/**
+ * XRDS for OpenID
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class XrdsAction extends Action
 {
-
-    function is_readonly()
-    {                
+    /**
+     * Is read only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly()
+    {
         return true;
     }
 
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     *
+     * @return void
+     */
     function handle($args)
     {
         parent::handle($args);
         $nickname = $this->trimmed('nickname');
-        $user = User::staticGet('nickname', $nickname);
+        $user     = User::staticGet('nickname', $nickname);
         if (!$user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return;
         }
-        $this->show_xrds($user);
+        $this->showXrds($user);
     }
 
-    function show_xrds($user)
+    /**
+     * Show XRDS for a user.
+     *
+     * @param class $user XRDS for this user.
+     *
+     * @return void
+     */
+    function showXrds($user)
     {
+        $srv = new OMB_Service_Provider(profile_to_omb_profile($user->uri,
+                                        $user->getProfile()));
+        /* Use libomb’s default XRDS Writer. */
+        $xrds_writer = null;
+        $srv->writeXRDS(new Laconica_XRDS_Mapper(), $xrds_writer);
+    }
+}
 
-        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');
+class Laconica_XRDS_Mapper implements OMB_XRDS_Mapper
+{
+    protected $urls;
 
-        common_element_end('XRDS');
-        common_end_xml();
+    public function __construct()
+    {
+        $this->urls = array(
+            OAUTH_ENDPOINT_REQUEST => 'requesttoken',
+            OAUTH_ENDPOINT_AUTHORIZE => 'userauthorization',
+            OAUTH_ENDPOINT_ACCESS => 'accesstoken',
+            OMB_ENDPOINT_POSTNOTICE => 'postnotice',
+            OMB_ENDPOINT_UPDATEPROFILE => 'updateprofile');
     }
 
-    function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
+    public function getURL($action)
     {
-        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');
+        return common_local_url($this->urls[$action]);
     }
-}
\ No newline at end of file
+}
+?>