Merge branch '1.0.x' into feedsub-wizard

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

diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index f9ffa81b86cf12b17b6a99c68bd856e6b6a12140..aac6f423cf6ff263b317b9a7222b3431f29c84aa 100644 (file)
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -1,7 +1,20 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Public XRDS for OpenID
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Robin Millette <millette@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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,61 +30,54 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/openid.php');
-
-# XXX: factor out similarities with XrdsAction
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
 
-class PublicxrdsAction extends Action {
+require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once INSTALLDIR.'/lib/xrdsoutputter.php';
 
-       function handle($args) {
-               
-               parent::handle($args);
-               
-               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'));
+/**
+ * Public XRDS
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @todo factor out similarities with XrdsAction
+ */
+class PublicxrdsAction extends Action
+{
+    /**
+     * Is read only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
 
-               common_element('Type', NULL, 'xri://$xrds*simple');
+    /**
+     * Class handler.
+     *
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $xrdsOutputter = new XRDSOutputter();
+        $xrdsOutputter->startXRDS();
+        Event::handle('StartPublicXRDS', array($this,&$xrdsOutputter));
+        Event::handle('EndPublicXRDS', array($this,&$xrdsOutputter));
+        $xrdsOutputter->endXRDS();
+    }
+}
 
-               $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
-                                                       common_local_url('finishopenidlogin'));
-               
-               $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
-                                                       common_local_url('finishaddopenid'));
-               
-               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');
-       }
-}
\ No newline at end of file