Merge commit 'dcostalis/econversation' into 0.8.x

[quix0rs-gnu-social.git] / lib / logingroupnav.php

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 285d60b30d74716f76d81d136bf6917d78e8ac43..919fd3db9c002e339b34582fb20b5b14d34f1801 100644 (file)
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -69,26 +69,28 @@ class LoginGroupNav extends Widget
 
     function show()
     {
-        # action => array('prompt', 'title')
-        $menu =
-          array('login' =>
-                array(_('Login'),
-                      _('Login with a username and password')),
-                'register' =>
-                array(_('Register'),
-                      _('Sign up for a new account')),
-                'openid' =>
-                array(_('OpenID'),
-                      _('Login or register with OpenID')));
+        // action => array('prompt', 'title')
+        $menu = array();
+
+        if (!common_config('site','openidonly')) {
+            $menu['login'] = array(_('Login'),
+                             _('Login with a username and password'));
+            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+                $menu['register'] = array(_('Register'),
+                                    _('Sign up for a new account'));
+            }
+        }
+        $menu['openidlogin'] = array(_('OpenID'),
+                               _('Login or register with OpenID'));
 
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         foreach ($menu as $menuaction => $menudesc) {
             $this->action->menuItem(common_local_url($menuaction),
-                                   $menudesc[0],
-                                   $menudesc[1],
-                                   $action_name === $menuaction);
+                                    $menudesc[0],
+                                    $menudesc[1],
+                                    $action_name === $menuaction);
         }
 
         $this->action->elementEnd('ul');