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

20 files changed, 32 insertions, 78 deletions

diff --git a/README b/README
index 53ed0a0fe..ab25b9f3f 100644
--- a/README
+++ b/README
@@ -968,8 +968,6 @@ closed: If set to 'true', will disallow registration on your site.
 	the service, *then* set this variable to 'true'.
 inviteonly: If set to 'true', will only allow registration if the user
 	    was invited by an existing user.
-openidonly: If set to 'true', will only allow registrations and logins
-	    through OpenID.
 private: If set to 'true', anonymous users will be redirected to the
          'login' page. Also, API methods that normally require no
          authentication will require it. Note that this does not turn
diff --git a/actions/all.php b/actions/all.php
index 38aee65b6..82394922b 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -108,9 +108,7 @@ class AllAction extends ProfileAction
             }
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                                $this->user->nickname);
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 3c41a5c70..725c1f1e3 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -67,11 +67,7 @@ class ConfirmaddressAction extends Action
         parent::handle($args);
         if (!common_logged_in()) {
             common_set_returnto($this->selfUrl());
-            if (!common_config('site', 'openidonly')) {
-                common_redirect(common_local_url('login'));
-            } else {
-                common_redirect(common_local_url('openidlogin'));
-            }
+            common_redirect(common_local_url('login'));
             return;
         }
         $code = $this->trimmed('code');
diff --git a/actions/favorited.php b/actions/favorited.php
index a3d1a5e20..156c7a700 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -153,8 +153,7 @@ class FavoritedAction extends Action
             $message .= _('Be the first to add a notice to your favorites by clicking the fave button next to any notice you like.');
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and be the first to add a notice to your favorites!'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+            $message .= _('Why not [register an account](%%action.register%%) and be the first to add a notice to your favorites!');
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index 7437166e6..c50466ce6 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -82,8 +82,7 @@ class GroupsearchAction extends SearchAction
                 $message = _('If you can\'t find the group you\'re looking for, you can [create it](%%action.newgroup%%) yourself.');
             }
             else {
-                $message = sprintf(_('Why not [register an account](%%%%action.%s%%%%) and [create the group](%%%%action.newgroup%%%%) yourself!'),
-                                   (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+                $message = _('Why not [register an account](%%action.register%%) and [create the group](%%action.newgroup%%) yourself!');
             }
             $this->elementStart('div', 'guide');
             $this->raw(common_markup_to_html($message));
diff --git a/actions/invite.php b/actions/invite.php
index bdc0d34cb..26c951ed2 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -235,7 +235,7 @@ class InviteAction extends CurrentUserDesignAction
                         common_root_url(),
                         $personal,
                         common_local_url('showstream', array('nickname' => $user->nickname)),
-                        common_local_url((!common_config('site', 'openidonly')) ? 'register' : 'openidlogin', array('code' => $invite->code)));
+                        common_local_url('register', array('code' => $invite->code)));
 
         mail_send($recipients, $headers, $body);
     }
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 90b3309cf..49b473d9e 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -121,9 +121,7 @@ class NoticesearchAction extends SearchAction
                 $message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
             else {
-                $message = sprintf(_('Why not [register an account](%%%%action.%s%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'),
-                                   (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                                   urlencode($q));
+                $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to  [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
 
             $this->elementStart('div', 'guide');
diff --git a/actions/public.php b/actions/public.php
index b68b2ff79..15bedb711 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -178,8 +178,7 @@ class PublicAction extends Action
         }
         else {
             if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
-                $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and be the first to post!'),
-                                    (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+                $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
             }
 	}
 
@@ -226,11 +225,9 @@ class PublicAction extends Action
     function showAnonymousMessage()
     {
         if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
-            $m = sprintf(_('This is %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                           'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
-                           '[Join now](%%%%action.%s%%%%) to share notices about yourself with friends, family, and colleagues! ' .
-                           '([Read more](%%%%doc.help%%%%))'),
-                         (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+	    $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+                  'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
+                  '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
         } else {
             $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                    'based on the Free Software [Laconica](http://laconi.ca/) tool.');
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index a2772869d..e9f33d58b 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -72,8 +72,7 @@ class PublictagcloudAction extends Action
             $message .= _('Be the first to post one!');
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and be the first to post one!'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+            $message .= _('Why not [register an account](%%action.register%%) and be the first to post one!');
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 90499bbe2..353717beb 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -97,13 +97,11 @@ class RemotesubscribeAction extends Action
         if ($this->err) {
             $this->element('div', 'error', $this->err);
         } else {
-            $inst = sprintf(_('To subscribe, you can [login](%%%%action.%s%%%%),' .
-                              ' or [register](%%%%action.%s%%%%) a new ' .
-                              ' account. If you already have an account ' .
-                              ' on a [compatible microblogging site](%%doc.openmublog%%), ' .
-                              ' enter your profile URL below.'),
-                            (!common_config('site','openidonly')) ? 'login' : 'openidlogin',
-                            (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+            $inst = _('To subscribe, you can [login](%%action.login%%),' .
+                      ' or [register](%%action.register%%) a new ' .
+                      ' account. If you already have an account ' .
+                      ' on a [compatible microblogging site](%%doc.openmublog%%), ' .
+                      ' enter your profile URL below.');
             $output = common_markup_to_html($inst);
             $this->elementStart('div', 'instructions');
             $this->raw($output);
diff --git a/actions/replies.php b/actions/replies.php
index fcfc3a272..47e01e279 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -192,9 +192,7 @@ class RepliesAction extends OwnerDesignAction
             }
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                                $this->user->nickname);
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 91287cc96..5be997306 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -196,9 +196,7 @@ class ShowfavoritesAction extends OwnerDesignAction
             }
         }
         else {
-            $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Why not [register an account](%%%%action.%s%%%%) and then post something interesting they would add to their favorites :)'),
-                               $this->user->nickname,
-                               (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+            $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to their favorites :)'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/showgroup.php b/actions/showgroup.php
index b0cc1dbc7..c3471c195 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -450,9 +450,8 @@ class ShowgroupAction extends GroupDesignAction
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
                 'short messages about their life and interests. '.
-                '[Join now](%%%%action.%s%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
-                     $this->group->nickname,
-                     (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+                '[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
+                     $this->group->nickname);
         } else {
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
diff --git a/actions/showstream.php b/actions/showstream.php
index 3f603d64f..cd5d4bb70 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -358,9 +358,7 @@ class ShowstreamAction extends ProfileAction
             }
         }
         else {
-            $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'),
-                                (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                                $this->user->nickname);
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
@@ -389,10 +387,8 @@ class ShowstreamAction extends ProfileAction
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                  'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
-                 '[Join now](%%%%action.%s%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
-                 $this->user->nickname,
-                 (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
-                 $this->user->nickname);
+                 '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
+                 $this->user->nickname, $this->user->nickname);
         } else {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                  'based on the Free Software [Laconica](http://laconi.ca/) tool. '),
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 404738012..66ac00fb1 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -111,9 +111,7 @@ class SubscribersAction extends GalleryAction
             }
         }
         else {
-            $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.%s%%%%) and be the first?'),
-                               $this->user->nickname,
-                               (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
+            $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 3e7be9747..cc8bfdaea 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -63,11 +63,7 @@ class UserauthorizationAction extends Action
                 /* Go log in, and then come back. */
                 common_set_returnto($_SERVER['REQUEST_URI']);
 
-                if (!common_config('site', 'openidonly')) {
-                    common_redirect(common_local_url('login'));
-                } else {
-                    common_redirect(common_local_url('openidlogin'));
-                }
+                common_redirect(common_local_url('login'));
                 return;
             }
 
diff --git a/config.php.sample b/config.php.sample
index e8cbf76d5..7877df716 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -38,8 +38,6 @@ $config['site']['path'] = 'laconica';
 // $config['site']['closed'] = true;
 // Only allow registration for people invited by another user
 // $config['site']['inviteonly'] = true;
-// Only allow registrations and logins through OpenID
-// $config['site']['openidonly'] = true;
 // Make the site invisible to  non-logged-in users
 // $config['site']['private'] = true;
 
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');