From 59beff6b46fb7693812558eaf728ca3709e4b066 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 21 Aug 2009 16:45:42 -0400
Subject: 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
---
 lib/action.php         | 15 +++++----------
 lib/common.php         |  1 -
 lib/facebookaction.php |  9 ++-------
 3 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'lib')

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');
-- 
cgit v1.2.3-54-g00ecf