summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:45:42 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 16:45:42 -0400
commit59beff6b46fb7693812558eaf728ca3709e4b066 (patch)
tree3a178e7e1a68ce1390d4e6178000f744b38e68b6 /lib
parentbacef32aaca791ec5e25bd951094baec0b41df28 (diff)
Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183f10359cc53d597913a878f53e23719. This functionality will need to be rewritten to work with the new OpenIDPlugin. Conflicts: index.php lib/logingroupnav.php
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php15
-rw-r--r--lib/common.php1
-rw-r--r--lib/facebookaction.php9
3 files changed, 7 insertions, 18 deletions
diff --git a/lib/action.php b/lib/action.php
index 4d724fba5..ebd722719 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -439,17 +439,12 @@ class Action extends HTMLOutputter // lawsuit
_('Logout'), _('Logout from the site'), false, 'nav_logout');
}
else {
- if (!common_config('site', 'openidonly')) {
- if (!common_config('site', 'closed')) {
- $this->menuItem(common_local_url('register'),
- _('Register'), _('Create an account'), false, 'nav_register');
- }
- $this->menuItem(common_local_url('login'),
- _('Login'), _('Login to the site'), false, 'nav_login');
- } else {
- $this->menuItem(common_local_url('openidlogin'),
- _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
+ if (!common_config('site', 'closed')) {
+ $this->menuItem(common_local_url('register'),
+ _('Register'), _('Create an account'), false, 'nav_register');
}
+ $this->menuItem(common_local_url('login'),
+ _('Login'), _('Login to the site'), false, 'nav_login');
}
$this->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help'), _('Help me!'), false, 'nav_help');
diff --git a/lib/common.php b/lib/common.php
index 7b0afce51..62cf5640d 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -111,7 +111,6 @@ $config =
'broughtbyurl' => null,
'closed' => false,
'inviteonly' => false,
- 'openidonly' => false,
'private' => false,
'ssl' => 'never',
'sslserver' => null,
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 4edd3a077..1e0b2bda7 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -253,13 +253,8 @@ class FacebookAction extends Action
$this->elementStart('dd');
$this->elementStart('p');
$this->text(sprintf($loginmsg_part1, common_config('site', 'name')));
- if (!common_config('site', 'openidonly')) {
- $this->element('a',
- array('href' => common_local_url('register')), _('Register'));
- } else {
- $this->element('a',
- array('href' => common_local_url('openidlogin')), _('Register'));
- }
+ $this->element('a',
+ array('href' => common_local_url('register')), _('Register'));
$this->text($loginmsg_part2);
$this->elementEnd('p');
$this->elementEnd('dd');