From 2b79b4d21fa33844911f28b9e33ec958cbac3de9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 4 Aug 2009 06:19:56 -0400
Subject: Move OpenID-related files to OpenID plugin directory

As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
---
 actions/finishaddopenid.php | 185 --------------------------------------------
 1 file changed, 185 deletions(-)
 delete mode 100644 actions/finishaddopenid.php

(limited to 'actions/finishaddopenid.php')

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
deleted file mode 100644
index 32bceecfd..000000000
--- a/actions/finishaddopenid.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * Laconica, the distributed open-source microblogging tool
- *
- * Complete adding an OpenID
- *
- * 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  Settings
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-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);
-}
-
-require_once INSTALLDIR.'/lib/openid.php';
-
-/**
- * Complete adding an OpenID
- *
- * Handle the return from an OpenID verification
- *
- * @category Settings
- * @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/
- */
-
-class FinishaddopenidAction extends Action
-{
-    var $msg = null;
-
-    /**
-     * Handle the redirect back from OpenID confirmation
-     *
-     * Check to see if the user's logged in, and then try
-     * to use the OpenID login system.
-     *
-     * @param array $args $_REQUEST arguments
-     *
-     * @return void
-     */
-
-    function handle($args)
-    {
-        parent::handle($args);
-        if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
-        } else {
-            $this->tryLogin();
-        }
-    }
-
-    /**
-     * Try to log in using OpenID
-     *
-     * Check the OpenID for validity; potentially store it.
-     *
-     * @return void
-     */
-
-    function tryLogin()
-    {
-        $consumer =& oid_consumer();
-
-        $response = $consumer->complete(common_local_url('finishaddopenid'));
-
-        if ($response->status == Auth_OpenID_CANCEL) {
-            $this->message(_('OpenID authentication cancelled.'));
-            return;
-        } else if ($response->status == Auth_OpenID_FAILURE) {
-            // Authentication failed; display the error message.
-            $this->message(sprintf(_('OpenID authentication failed: %s'),
-                                   $response->message));
-        } else if ($response->status == Auth_OpenID_SUCCESS) {
-
-            $display   = $response->getDisplayIdentifier();
-            $canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
-              $response->endpoint->canonicalID : $display;
-
-            $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
-
-            if ($sreg_resp) {
-                $sreg = $sreg_resp->contents();
-            }
-
-            $cur =& common_current_user();
-
-            $other = oid_get_user($canonical);
-
-            if ($other) {
-                if ($other->id == $cur->id) {
-                    $this->message(_('You already have this OpenID!'));
-                } else {
-                    $this->message(_('Someone else already has this OpenID.'));
-                }
-                return;
-            }
-
-            // start a transaction
-
-            $cur->query('BEGIN');
-
-            $result = oid_link_user($cur->id, $canonical, $display);
-
-            if (!$result) {
-                $this->message(_('Error connecting user.'));
-                return;
-            }
-            if ($sreg) {
-                if (!oid_update_user($cur, $sreg)) {
-                    $this->message(_('Error updating profile'));
-                    return;
-                }
-            }
-
-            // success!
-
-            $cur->query('COMMIT');
-
-            oid_set_last($display);
-
-            common_redirect(common_local_url('openidsettings'), 303);
-        }
-    }
-
-    /**
-     * Show a failure message
-     *
-     * Something went wrong. Save the message, and show the page.
-     *
-     * @param string $msg Error message to show
-     *
-     * @return void
-     */
-
-    function message($msg)
-    {
-        $this->message = $msg;
-        $this->showPage();
-    }
-
-    /**
-     * Title of the page
-     *
-     * @return string title
-     */
-
-    function title()
-    {
-        return _('OpenID Login');
-    }
-
-    /**
-     * Show error message
-     *
-     * @return void
-     */
-
-    function showPageNotice()
-    {
-        if ($this->message) {
-            $this->element('p', 'error', $this->message);
-        }
-    }
-}
-- 
cgit v1.2.3-54-g00ecf