[geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.681, 1.682 users.php, 1.163, 1.164

[Dirk Haun]

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

Modified Files:
	lib-common.php users.php 
Log Message:
Allow disabling the standard login and forcing users to use remote authentication instead (loosely based on a patch by Jessica Blank)


Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** users.php	20 Feb 2008 20:07:59 -0000	1.163
--- users.php	24 Feb 2008 10:55:49 -0000	1.164
***************
*** 626,631 ****
      if ($_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
!         $select = '<select name="service"><option value="">' .
!                         $_CONF['site_name'] . '</option>';
          if (is_dir($_CONF['path_system'].'classes/authentication/')) {
  
--- 626,633 ----
      if ($_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
!         $select = '<select name="service">';
!         if ($_CONF['user_login_method']['standard']) {
!             $select .= '<option value="">' .  $_CONF['site_name'] . '</option>';
!         }
          if (is_dir($_CONF['path_system'].'classes/authentication/')) {
  
***************
*** 1041,1045 ****
      $uid = '';
      if (!empty($loginname) && !empty($passwd) && empty($service)) {
!         $status = SEC_authenticate($loginname, $passwd, $uid);
  
      } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['3rdparty'] && ($service != '')) {
--- 1043,1051 ----
      $uid = '';
      if (!empty($loginname) && !empty($passwd) && empty($service)) {
!         if (empty($service) && $_CONF['user_login_method']['standard']) {
!             $status = SEC_authenticate($loginname, $passwd, $uid);
!         } else {
!             $status = -1;
!         }
  
      } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['3rdparty'] && ($service != '')) {

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.681
retrieving revision 1.682
diff -C2 -d -r1.681 -r1.682
*** lib-common.php	24 Feb 2008 08:54:51 -0000	1.681
--- lib-common.php	24 Feb 2008 10:55:49 -0000	1.682
***************
*** 2358,2363 ****
          {
              // Build select
!             $select = '<select name="service" id="service"><option value="">' .
!                             $_CONF['site_name'] . '</option>';
              if( is_dir( $_CONF['path_system'] . 'classes/authentication/' ))
              {
--- 2358,2366 ----
          {
              // Build select
!             $select = '<select name="service" id="service">';
!             if ($_CONF['user_login_method']['standard']) {
!                 $select .= '<option value="">' . $_CONF['site_name']
!                         . '</option>';
!             }
              if( is_dir( $_CONF['path_system'] . 'classes/authentication/' ))
              {