[geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.706, 1.707 users.php, 1.168, 1.169

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv16447/public_html

Modified Files:
	lib-common.php users.php 
Log Message:
Disable OpenID login when new registrations are disabled


Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** users.php	4 Jul 2008 15:26:45 -0000	1.168
--- users.php	4 Jul 2008 15:59:19 -0000	1.169
***************
*** 659,663 ****
  
      // OpenID remote authentification.
!     if ($_CONF['user_login_method']['openid'] && !$_CONF['usersubmission']) {
          $user_templates->set_file('openid_login', '../loginform_openid.thtml');
          $user_templates->set_var('lang_openid_login', $LANG01[128]);
--- 659,664 ----
  
      // OpenID remote authentification.
!     if ($_CONF['user_login_method']['openid'] && ($_CONF['usersubmission'] == 0)
!             && !$_CONF['disable_new_user_registration']) {
          $user_templates->set_file('openid_login', '../loginform_openid.thtml');
          $user_templates->set_var('lang_openid_login', $LANG01[128]);
***************
*** 1061,1065 ****
          $status = SEC_remoteAuthentication($loginname, $passwd, $service, $uid);
  
!     } elseif (($_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['openid'] && (isset($_GET['openid_login']) && ($_GET['openid_login'] == '1'))) {
          // Here we go with the handling of OpenID authentification.
  
--- 1062,1069 ----
          $status = SEC_remoteAuthentication($loginname, $passwd, $service, $uid);
  
!     } elseif ($_CONF['user_login_method']['openid'] &&
!             ($_CONF['usersubmission'] == 0) &&
!             !$_CONF['disable_new_user_registration'] &&
!             (isset($_GET['openid_login']) && ($_GET['openid_login'] == '1'))) {
          // Here we go with the handling of OpenID authentification.
  

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.706
retrieving revision 1.707
diff -C2 -d -r1.706 -r1.707
*** lib-common.php	4 Jul 2008 15:14:28 -0000	1.706
--- lib-common.php	4 Jul 2008 15:59:18 -0000	1.707
***************
*** 2372,2376 ****
  
          // OpenID remote authentification.
!         if ($_CONF['user_login_method']['openid'] && !$_CONF['usersubmission']) {
              $login->set_file('openid_login', 'loginform_openid.thtml');
              $login->set_var('lang_openid_login', $LANG01[128]);
--- 2372,2376 ----
  
          // OpenID remote authentification.
!         if ($_CONF['user_login_method']['openid'] && ($_CONF['usersubmission'] == 0) && !$_CONF['disable_new_user_registration']) {
              $login->set_file('openid_login', 'loginform_openid.thtml');
              $login->set_var('lang_openid_login', $LANG01[128]);