summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--actions/login.php2
-rw-r--r--config.php.sample3
-rw-r--r--lib/common.php8
-rw-r--r--plugins/OpenID/finishopenidlogin.php4
-rw-r--r--plugins/OpenID/openidlogin.php4
-rw-r--r--plugins/OpenID/openidsettings.php6
7 files changed, 3 insertions, 32 deletions
diff --git a/README b/README
index ccdd9e674..53ed0a0fe 100644
--- 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 e09fdc76b..f5a658bf5 100644
--- 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 0fc5163b7..e8cbf76d5 100644
--- 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 067a5a2a6..7b0afce51 100644
--- 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 87fc3881e..bc0d2d66c 100644
--- 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 76f573b9f..3d968c56e 100644
--- 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 57389903d..26bf64836 100644
--- 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',