Revert "Added a configuration option to disable OpenID."

This reverts commit 7dc3a90d1252137859a687e32313ea569dcf8796.

Conflicts:

	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php

diff --git a/README b/README
index ccdd9e674e7ddfd7966fe4f0c404b17aeedd38c0..53ed0a0fe4266b46888a6574cd0744fdeacdbc64 100644 (file)
--- a/README
+++ b/README
@@ -1200,14 +1200,6 @@ For configuring invites.
 
 enabled: Whether to allow users to send invites. Default true.
 
-openid
-------
-
-For configuring OpenID.
-
-enabled: Whether to allow users to register and login using OpenID. Default
-        true.
-
 tag
 ---
 

diff --git a/actions/login.php b/actions/login.php
index e09fdc76b49d4f82b48de852c57de65a2cd9d4ca..f5a658bf503b2bf3f49a46de4b6bed6a6363a053 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -247,7 +247,7 @@ class LoginAction extends Action
             return _('For security reasons, please re-enter your ' .
                      'user name and password ' .
                      'before changing your settings.');
-        } else if (common_config('openid', 'enabled')) {
+        } else {
             return _('Login with your username and password. ' .
                      'Don\'t have a username yet? ' .
                      '[Register](%%action.register%%) a new account.');

diff --git a/config.php.sample b/config.php.sample
index 0fc5163b7af4a26e2bda33d215dcbc77c9f2ded0..e8cbf76d54228efbcd2337d9c0cbf12efbea629f 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -99,9 +99,6 @@ $config['sphinx']['port'] = 3312;
 // $config['xmpp']['public'][] = 'someindexer@example.net';
 // $config['xmpp']['debug'] = false;
 
-// Disable OpenID
-// $config['openid']['enabled'] = false;
-
 // Turn off invites
 // $config['invite']['enabled'] = false;
 

diff --git a/lib/common.php b/lib/common.php
index 067a5a2a61bafcdfb8a6cb42c7078e1dcf58298b..7b0afce51f2f040c08e426fe8e04820758da0f1e 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -175,8 +175,6 @@ $config =
               'host' => null, # only set if != server
               'debug' => false, # print extra debug info
               'public' => array()), # JIDs of users who want to receive the public stream
-        'openid' =>
-        array('enabled' => true),
         'invite' =>
         array('enabled' => true),
         'sphinx' =>
@@ -383,12 +381,6 @@ if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db']
     $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini';
 }
 
-// Ignore openidonly if OpenID is disabled
-
-if (!$config['openid']['enabled']) {
-    $config['site']['openidonly'] = false;
-}
-
 function __autoload($cls)
 {
     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 87fc3881e2835c51f168a0e13ddc449b2ea9beb3..bc0d2d66c398e68f6f8949f75765653c165b8ec6 100644 (file)
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -30,9 +30,7 @@ class FinishopenidloginAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        if (!common_config('openid', 'enabled')) {
-            common_redirect(common_local_url('login'));
-        } else if (common_is_real_login()) {
+        if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $token = $this->trimmed('token');

diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 76f573b9f52f8429d7d6972aa4101bec4619c1c9..3d968c56e21404e622fa923fb781334f20097803 100644 (file)
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -26,9 +26,7 @@ class OpenidloginAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        if (!common_config('openid', 'enabled')) {
-            common_redirect(common_local_url('login'));
-        } else if (common_is_real_login()) {
+        if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $openid_url = $this->trimmed('openid_url');

diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index 57389903d1230864fbf1eee9e9cf174723c9be54..26bf6483660823175c87367fe44ad9d08aa0f16f 100644 (file)
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -82,12 +82,6 @@ class OpenidsettingsAction extends AccountSettingsAction
 
     function showContent()
     {
-        if (!common_config('openid', 'enabled')) {
-            $this->element('div', array('class' => 'error'),
-                           _('OpenID is not available.'));
-            return;
-        }
-
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',