From 7dc3a90d1252137859a687e32313ea569dcf8796 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Thu, 13 Aug 2009 22:18:06 +0800
Subject: Added a configuration option to disable OpenID.

If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.

If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
---
 lib/accountsettingsaction.php | 4 ++++
 lib/action.php                | 3 ++-
 lib/common.php                | 8 ++++++++
 lib/logingroupnav.php         | 6 ++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 4ab50abce..1a21d871e 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -126,6 +126,10 @@ class AccountSettingsNav extends Widget
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         foreach ($menu as $menuaction => $menudesc) {
+            if ($menuaction == 'openidsettings' &&
+                !common_config('openid', 'enabled')) {
+                continue;
+            }
             $this->action->menuItem(common_local_url($menuaction),
 				    $menudesc[0],
 				    $menudesc[1],
diff --git a/lib/action.php b/lib/action.php
index 1bdc4daea..092a0ec9a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -443,7 +443,8 @@ class Action extends HTMLOutputter // lawsuit
                     }
                     $this->menuItem(common_local_url('login'),
                                     _('Login'), _('Login to the site'), false, 'nav_login');
-                } else {
+                }
+                if (common_config('openid', 'enabled')) {
                     $this->menuItem(common_local_url('openidlogin'),
                                     _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
                 }
diff --git a/lib/common.php b/lib/common.php
index f26155e70..3fc047af9 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -170,6 +170,8 @@ $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' =>
@@ -371,6 +373,12 @@ 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;
+}
+
 // XXX: how many of these could be auto-loaded on use?
 
 require_once 'Validate.php';
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 919fd3db9..2fb1828d6 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -80,8 +80,10 @@ class LoginGroupNav extends Widget
                                     _('Sign up for a new account'));
             }
         }
-        $menu['openidlogin'] = array(_('OpenID'),
-                               _('Login or register with OpenID'));
+        if (common_config('openid', 'enabled')) {
+            $menu['openidlogin'] = array(_('OpenID'),
+                                   _('Login or register with OpenID'));
+        }
 
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
-- 
cgit v1.2.3-54-g00ecf


From 75a0a3e18b001454ab4844bc63d4052faf502138 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Sat, 15 Aug 2009 00:17:00 +0800
Subject: Fixed OpenID appearing in primary nav when OpenID is enabled but not
 OpenID-only

---
 lib/action.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index 092a0ec9a..1bdc4daea 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -443,8 +443,7 @@ class Action extends HTMLOutputter // lawsuit
                     }
                     $this->menuItem(common_local_url('login'),
                                     _('Login'), _('Login to the site'), false, 'nav_login');
-                }
-                if (common_config('openid', 'enabled')) {
+                } else {
                     $this->menuItem(common_local_url('openidlogin'),
                                     _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
                 }
-- 
cgit v1.2.3-54-g00ecf