Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x

diff --combined config.php.sample
index c2dcf85169dc71541452646bd430f27ba59d3520,42d42cf86fd222bac72e39d56310d6891d08372e..8b4b777f2206218abfa02ed560e817af0b094625
--- 1/config.php.sample
--- 2/config.php.sample
+++ b/config.php.sample
@@@ -38,6 -38,8 +38,8 @@@ $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;
  
@@@ -182,10 -184,6 +184,10 @@@ $config['sphinx']['port'] = 3312
  //
  // $config['twitterbridge']['enabled'] = true;
  
 +// Twitter OAuth settings
 +// $config['twitter']['consumer_key']    = 'YOURKEY';
 +// $config['twitter']['consumer_secret'] = 'YOURSECRET';
 +
  // Edit throttling. Off by default. If turned on, you can only post 20 notices
  // every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
  // real users without getting uncontrollable floods from spammers or runaway bots.

diff --combined lib/common.php
index 645ae8c3442c5f2aa58b5ddaba0d1f80a79072a8,bf078378d33c0af1cef61667882ea3d81844f0ac..f26155e70eddc67aa94619d2dbaea04477a53d17
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -109,6 -109,7 +109,7 @@@ $config 
                'broughtbyurl' => null,
                'closed' => false,
                'inviteonly' => false,
+               'openidonly' => false,
                'private' => false,
                'ssl' => 'never',
                'sslserver' => null,
@@@ -194,9 -195,6 +195,9 @@@
          'integration' =>
          array('source' => 'Laconica', # source attribute for Twitter
                'taguri' => $_server.',2009'), # base for tag URIs
 +      'twitter' =>
 +      array('consumer_key'    => null,
 +            'consumer_secret' => null),
          'memcached' =>
          array('enabled' => false,
                'server' => 'localhost',