OpenIDPlugin sets up actions for router

diff --git a/lib/router.php b/lib/router.php
index 19839b99722a0682b8f4c253479579d67e969744..37a7e4a0f3d058d16c509290a941c5cc9ae3ee98 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -50,8 +50,7 @@ class Router
     var $m = null;
     static $inst = null;
     static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
-                         'postnotice', 'updateprofile', 'finishremotesubscribe',
-                         'finishopenidlogin', 'finishaddopenid');
+                         'postnotice', 'updateprofile', 'finishremotesubscribe');
 
     static function get()
     {
@@ -76,7 +75,6 @@ class Router
 
         $m->connect('', array('action' => 'public'));
         $m->connect('rss', array('action' => 'publicrss'));
-        $m->connect('xrds', array('action' => 'publicxrds'));
         $m->connect('featuredrss', array('action' => 'featuredrss'));
         $m->connect('favoritedrss', array('action' => 'favoritedrss'));
         $m->connect('opensearch/people', array('action' => 'opensearch',
@@ -131,7 +129,6 @@ class Router
 
         // exceptional
 
-        $m->connect('main/openid', array('action' => 'openidlogin'));
         $m->connect('main/remote', array('action' => 'remotesubscribe'));
         $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
 
@@ -141,7 +138,7 @@ class Router
 
         // settings
 
-        foreach (array('profile', 'avatar', 'password', 'openid', 'im',
+        foreach (array('profile', 'avatar', 'password', 'im',
                        'email', 'sms', 'twitter', 'userdesign', 'other') as $s) {
             $m->connect('settings/'.$s, array('action' => $s.'settings'));
         }
@@ -434,7 +431,7 @@ class Router
         // user stuff
 
         foreach (array('subscriptions', 'subscribers',
-                       'nudge', 'xrds', 'all', 'foaf',
+                       'nudge', 'all', 'foaf',
                        'replies', 'inbox', 'outbox', 'microsummary') as $a) {
             $m->connect(':nickname/'.$a,
                         array('action' => $a),

diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
new file mode 100644 (file)
index 0000000..149a923
--- /dev/null
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Plugin for OpenID authentication and identity
+ *
+ * This class enables consumer support for OpenID, the distributed authentication
+ * and identity system.
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @link     http://openid.net/
+ */
+
+class OpenIDPlugin extends Plugin
+{
+    /**
+     * Initializer for the plugin.
+     */
+
+    function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Add OpenID-related paths to the router table
+     *
+     * Hook for RouterInitialized event.
+     *
+     * @return boolean hook return
+     */
+
+    function onRouterInitialized(&$m)
+    {
+        $m->connect('main/openid', array('action' => 'openidlogin'));
+        $m->connect('settings/openid', array('action' => 'openidsettings'));
+        $m->connect(':nickname/xrds',
+                    array('action' => 'xrds'),
+                    array('nickname' => '[a-zA-Z0-9]{1,64}'));
+        $m->connect('xrds', array('action' => 'publicxrds'));
+        $m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin'));
+        $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid'));
+
+        return true;
+    }
+}
\ No newline at end of file