Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

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

diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 3d731d79fa7e435fb06b17761fcfa8909f038d0c..283a932ca56772b4191a5bc6a5fa7e2c5618085c 100644 (file)
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -1,5 +1,17 @@
 <?php
-/*
+
+/**
+ * Public 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.
  *
@@ -17,67 +29,94 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/openid.php');
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-# XXX: factor out similarities with XrdsAction
+require_once INSTALLDIR.'/lib/openid.php';
 
+/**
+ * Public 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/
+ *
+ * @todo factor out similarities with XrdsAction
+ */
 class PublicxrdsAction extends Action
 {
-
-    function is_readonly()
+    /**
+     * Is read only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
     {
         return true;
     }
 
+    /**
+     * Class handler.
+     *
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
     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)',
+        $this->startXML();
+        $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
-
-        common_element('Type', null, 'xri://$xrds*simple');
-
-        foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) {
-            $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
+        $this->element('Type', null, 'xri://$xrds*simple');
+        foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) {
+            $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
                                 common_local_url($finish));
         }
-
-        common_element_end('XRD');
-
-        common_element_end('XRDS');
-        common_end_xml();
+        $this->elementEnd('XRD');
+        $this->elementEnd('XRDS');
+        $this->endXML();
     }
 
-    function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
+    /**
+     * Show service.
+     *
+     * @param string $type    XRDS type
+     * @param string $uri     URI
+     * @param array  $params  type parameters, null by default
+     * @param array  $sigs    type signatures, null by default
+     * @param string $localId local ID, null by default
+     *
+     * @return void
+     */
+    function showService($type, $uri, $params=null, $sigs=null, $localId=null)
     {
-        common_element_start('Service');
+        $this->elementStart('Service');
         if ($uri) {
-            common_element('URI', null, $uri);
+            $this->element('URI', null, $uri);
         }
-        common_element('Type', null, $type);
+        $this->element('Type', null, $type);
         if ($params) {
             foreach ($params as $param) {
-                common_element('Type', null, $param);
+                $this->element('Type', null, $param);
             }
         }
         if ($sigs) {
             foreach ($sigs as $sig) {
-                common_element('Type', null, $sig);
+                $this->element('Type', null, $sig);
             }
         }
         if ($localId) {
-            common_element('LocalID', null, $localId);
+            $this->element('LocalID', null, $localId);
         }
-        common_element_end('Service');
+        $this->elementEnd('Service');
     }
-}
\ No newline at end of file
+}
+