Added a configuration option to disable OpenID.

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 1bf37f28f4dfaec267926adfe32e61ec129f4a03..744aae7136a851d2604a6525706d5568898f5e29 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -21,72 +21,113 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidloginAction extends Action {
-
-    function handle($args) {
+class OpenidloginAction extends Action
+{
+    function handle($args)
+    {
         parent::handle($args);
-        if (common_logged_in()) {
-            common_user_error(_('Already logged in.'));
+        if (!common_config('openid', 'enabled')) {
+            common_redirect(common_local_url('login'));
+        } else 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->show_form(_('There was a problem with your session token. Try again, please.'), $openid_url);
+                $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->show_form($result, $openid_url);
+                $this->showForm($result, $openid_url);
             }
         } else {
             $openid_url = oid_get_last();
-            $this->show_form(null, $openid_url);
+            $this->showForm(null, $openid_url);
         }
     }
 
-    function get_instructions() {
-        return _('Login with an [OpenID](%%doc.openid%%) account.');
+    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 show_top($error=null) {
-        if ($error) {
-            common_element('div', array('class' => 'error'), $error);
+    function showPageNotice()
+    {
+        if ($this->error) {
+            $this->element('div', array('class' => 'error'), $this->error);
         } else {
-            $instr = $this->get_instructions();
+            $instr = $this->getInstructions();
             $output = common_markup_to_html($instr);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
         }
     }
 
-    function show_form($error=null, $openid_url) {
-        common_show_header(_('OpenID Login'), null, $error, array($this, 'show_top'));
+    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');
-        common_element_start('form', array('method' => 'post',
-                                           'id' => 'openidlogin',
+        $this->elementStart('form', array('method' => 'post',
+                                           'id' => 'form_openid_login',
+                                           'class' => 'form_settings',
                                            'action' => $formaction));
-        common_hidden('token', common_session_token());
-        common_input('openid_url', _('OpenID URL'),
-                     $openid_url,
+        $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'));
-        common_checkbox('rememberme', _('Remember me'), false,
+        $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!'));
-        common_submit('submit', _('Login'));
-        common_element_end('form');
-        common_show_footer();
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
+    function showLocalNav()
+    {
+        $nav = new LoginGroupNav($this);
+        $nav->show();
     }
 }