From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Sep 2009 14:19:01 +0000 (-0700)
Subject: Merge branch '0.8.x' of git://gitorious.org/laconica/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d635a0685df324d75e66d1f28dae4223c77a0875;p=quix0rs-gnu-social.git

Merge branch '0.8.x' of git://gitorious.org/laconica/mainline into 0.9.x
---

d635a0685df324d75e66d1f28dae4223c77a0875
diff --cc plugins/OpenID/openidlogin.php
index 07c82db3e1,0000000000..29e89234e9
mode 100644,000000..100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@@ -1,131 -1,0 +1,137 @@@
 +<?php
 +/*
 + * 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
 + * 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/>.
 + */
 +
 +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 +
 +require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 +
 +class OpenidloginAction extends Action
 +{
 +    function handle($args)
 +    {
 +        parent::handle($args);
 +        if (common_is_real_login()) {
 +            $this->clientError(_('Already logged in.'));
 +        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 +            $openid_url = $this->trimmed('openid_url');
 +
 +            # CSRF protection
 +            $token = $this->trimmed('token');
 +            if (!$token || $token != common_session_token()) {
 +                $this->showForm(_('There was a problem with your session token. Try again, please.'), $openid_url);
 +                return;
 +            }
 +
 +            $rememberme = $this->boolean('rememberme');
 +
 +            common_ensure_session();
 +
 +            $_SESSION['openid_rememberme'] = $rememberme;
 +
 +            $result = oid_authenticate($openid_url,
 +                                       'finishopenidlogin');
 +
 +            if (is_string($result)) { # error message
 +                unset($_SESSION['openid_rememberme']);
 +                $this->showForm($result, $openid_url);
 +            }
 +        } else {
 +            $openid_url = oid_get_last();
 +            $this->showForm(null, $openid_url);
 +        }
 +    }
 +
 +    function getInstructions()
 +    {
 +        if (common_logged_in() && !common_is_real_login() &&
 +            common_get_returnto()) {
 +            // rememberme logins have to reauthenticate before
 +            // changing any profile settings (cookie-stealing protection)
 +            return _('For security reasons, please re-login with your ' .
 +                     '[OpenID](%%doc.openid%%) ' .
 +                     'before changing your settings.');
 +        } else {
 +            return _('Login with an [OpenID](%%doc.openid%%) account.');
 +        }
 +    }
 +
 +    function showPageNotice()
 +    {
 +        if ($this->error) {
 +            $this->element('div', array('class' => 'error'), $this->error);
 +        } else {
 +            $instr = $this->getInstructions();
 +            $output = common_markup_to_html($instr);
 +            $this->elementStart('div', 'instructions');
 +            $this->raw($output);
 +            $this->elementEnd('div');
 +        }
 +    }
 +
++    function showScripts()
++    {
++        parent::showScripts();
++        $this->autofocus('openid_url');
++    }
++
 +    function title()
 +    {
 +        return _('OpenID Login');
 +    }
 +
 +    function showForm($error=null, $openid_url)
 +    {
 +        $this->error = $error;
 +        $this->openid_url = $openid_url;
 +        $this->showPage();
 +    }
 +
 +    function showContent() {
 +        $formaction = common_local_url('openidlogin');
 +        $this->elementStart('form', array('method' => 'post',
 +                                           'id' => 'form_openid_login',
 +                                           'class' => 'form_settings',
 +                                           'action' => $formaction));
 +        $this->elementStart('fieldset');
 +        $this->element('legend', null, _('OpenID login'));
 +        $this->hidden('token', common_session_token());
 +
 +        $this->elementStart('ul', 'form_data');
 +        $this->elementStart('li');
 +        $this->input('openid_url', _('OpenID URL'),
 +                     $this->openid_url,
 +                     _('Your OpenID URL'));
 +        $this->elementEnd('li');
 +        $this->elementStart('li', array('id' => 'settings_rememberme'));
 +        $this->checkbox('rememberme', _('Remember me'), false,
 +                        _('Automatically login in the future; ' .
 +                           'not for shared computers!'));
 +        $this->elementEnd('li');
 +        $this->elementEnd('ul');
 +        $this->submit('submit', _('Login'));
 +        $this->elementEnd('fieldset');
 +        $this->elementEnd('form');
 +    }
 +
 +    function showLocalNav()
 +    {
 +        $nav = new LoginGroupNav($this);
 +        $nav->show();
 +    }
 +}
diff --cc plugins/OpenID/openidsettings.php
index 104ea8d889,0000000000..3ad46f5f57
mode 100644,000000..100644
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@@ -1,234 -1,0 +1,240 @@@
 +<?php
 +/**
 + * StatusNet, the distributed open-source microblogging tool
 + *
 + * Settings for 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   StatusNet
 + * @author    Evan Prodromou <evan@status.net>
 + * @copyright 2008-2009 StatusNet, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link      http://status.net/
 + */
 +
 +if (!defined('STATUSNET') && !defined('LACONICA')) {
 +    exit(1);
 +}
 +
 +require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 +require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 +
 +/**
 + * Settings for OpenID
 + *
 + * Lets users add, edit and delete OpenIDs from their account
 + *
 + * @category Settings
 + * @package  StatusNet
 + * @author   Evan Prodromou <evan@status.net>
 + * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link     http://status.net/
 + */
 +
 +class OpenidsettingsAction extends AccountSettingsAction
 +{
 +    /**
 +     * Title of the page
 +     *
 +     * @return string Page title
 +     */
 +
 +    function title()
 +    {
 +        return _('OpenID settings');
 +    }
 +
 +    /**
 +     * Instructions for use
 +     *
 +     * @return string Instructions for use
 +     */
 +
 +    function getInstructions()
 +    {
 +        return _('[OpenID](%%doc.openid%%) lets you log into many sites' .
 +                 ' with the same user account.'.
 +                 ' Manage your associated OpenIDs from here.');
 +    }
 +
++    function showScripts()
++    {
++        parent::showScripts();
++        $this->autofocus('openid_url');
++    }
++
 +    /**
 +     * Show the form for OpenID management
 +     *
 +     * We have one form with a few different submit buttons to do different things.
 +     *
 +     * @return void
 +     */
 +
 +    function showContent()
 +    {
 +        $user = common_current_user();
 +
 +        $this->elementStart('form', array('method' => 'post',
 +                                          'id' => 'form_settings_openid_add',
 +                                          'class' => 'form_settings',
 +                                          'action' =>
 +                                          common_local_url('openidsettings')));
 +        $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
 +        $this->element('legend', null, _('Add OpenID'));
 +        $this->hidden('token', common_session_token());
 +        $this->element('p', 'form_guide',
 +                       _('If you want to add an OpenID to your account, ' .
 +                         'enter it in the box below and click "Add".'));
 +        $this->elementStart('ul', 'form_data');
 +        $this->elementStart('li');
 +        $this->element('label', array('for' => 'openid_url'),
 +                       _('OpenID URL'));
 +        $this->element('input', array('name' => 'openid_url',
 +                                      'type' => 'text',
 +                                      'id' => 'openid_url'));
 +        $this->elementEnd('li');
 +        $this->elementEnd('ul');
 +        $this->element('input', array('type' => 'submit',
 +                                      'id' => 'settings_openid_add_action-submit',
 +                                      'name' => 'add',
 +                                      'class' => 'submit',
 +                                      'value' => _('Add')));
 +        $this->elementEnd('fieldset');
 +        $this->elementEnd('form');
 +
 +        $oid = new User_openid();
 +
 +        $oid->user_id = $user->id;
 +
 +        $cnt = $oid->find();
 +
 +        if ($cnt > 0) {
 +
 +            $this->element('h2', null, _('Remove OpenID'));
 +
 +            if ($cnt == 1 && !$user->password) {
 +
 +                $this->element('p', 'form_guide',
 +                               _('Removing your only OpenID '.
 +                                 'would make it impossible to log in! ' .
 +                                 'If you need to remove it, '.
 +                                 'add another OpenID first.'));
 +
 +                if ($oid->fetch()) {
 +                    $this->elementStart('p');
 +                    $this->element('a', array('href' => $oid->canonical),
 +                                   $oid->display);
 +                    $this->elementEnd('p');
 +                }
 +
 +            } else {
 +
 +                $this->element('p', 'form_guide',
 +                               _('You can remove an OpenID from your account '.
 +                                 'by clicking the button marked "Remove".'));
 +                $idx = 0;
 +
 +                while ($oid->fetch()) {
 +                    $this->elementStart('form',
 +                                        array('method' => 'POST',
 +                                              'id' => 'form_settings_openid_delete' . $idx,
 +                                              'class' => 'form_settings',
 +                                              'action' =>
 +                                              common_local_url('openidsettings')));
 +                    $this->elementStart('fieldset');
 +                    $this->hidden('token', common_session_token());
 +                    $this->element('a', array('href' => $oid->canonical),
 +                                   $oid->display);
 +                    $this->element('input', array('type' => 'hidden',
 +                                                  'id' => 'openid_url'.$idx,
 +                                                  'name' => 'openid_url',
 +                                                  'value' => $oid->canonical));
 +                    $this->element('input', array('type' => 'submit',
 +                                                  'id' => 'remove'.$idx,
 +                                                  'name' => 'remove',
 +                                                  'class' => 'submit remove',
 +                                                  'value' => _('Remove')));
 +                    $this->elementEnd('fieldset');
 +                    $this->elementEnd('form');
 +                    $idx++;
 +                }
 +            }
 +        }
 +    }
 +
 +    /**
 +     * Handle a POST request
 +     *
 +     * Muxes to different sub-functions based on which button was pushed
 +     *
 +     * @return void
 +     */
 +
 +    function handlePost()
 +    {
 +        // CSRF protection
 +        $token = $this->trimmed('token');
 +        if (!$token || $token != common_session_token()) {
 +            $this->showForm(_('There was a problem with your session token. '.
 +                              'Try again, please.'));
 +            return;
 +        }
 +
 +        if ($this->arg('add')) {
 +            $result = oid_authenticate($this->trimmed('openid_url'),
 +                                       'finishaddopenid');
 +            if (is_string($result)) { // error message
 +                $this->showForm($result);
 +            }
 +        } else if ($this->arg('remove')) {
 +            $this->removeOpenid();
 +        } else {
 +            $this->showForm(_('Something weird happened.'));
 +        }
 +    }
 +
 +    /**
 +     * Handles a request to remove an OpenID from the user's account
 +     *
 +     * Validates input and, if everything is OK, deletes the OpenID.
 +     * Reloads the form with a success or error notification.
 +     *
 +     * @return void
 +     */
 +
 +    function removeOpenid()
 +    {
 +        $openid_url = $this->trimmed('openid_url');
 +
 +        $oid = User_openid::staticGet('canonical', $openid_url);
 +
 +        if (!$oid) {
 +            $this->showForm(_('No such OpenID.'));
 +            return;
 +        }
 +        $cur = common_current_user();
 +        if (!$cur || $oid->user_id != $cur->id) {
 +            $this->showForm(_('That OpenID does not belong to you.'));
 +            return;
 +        }
 +        $oid->delete();
 +        $this->showForm(_('OpenID removed.'), true);
 +        return;
 +    }
 +}