[geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.654, 1.655 users.php, 1.157, 1.158

[Dirk Haun]

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

Modified Files:
	lib-common.php users.php 
Log Message:
Fixed option name: 'user_logging_method' -> 'user_login_method'


Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** users.php	18 Aug 2007 20:45:49 -0000	1.157
--- users.php	23 Sep 2007 19:20:40 -0000	1.158
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | users.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | users.php                                                                 |
***************
*** 615,619 ****
  
      // 3rd party remote authentification.
!     if ($_CONF['user_logging_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
          $select = '<select name="service"><option value="">' .
--- 615,619 ----
  
      // 3rd party remote authentification.
!     if ($_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
          $select = '<select name="service"><option value="">' .
***************
*** 642,646 ****
  
      // OpenID remote authentification.
!     if ($_CONF['user_logging_method']['openid'] && !$_CONF['usersubmission']) {
          $user_templates->set_file('openid_login', '../loginform_openid.thtml');
          $user_templates->set_var('lang_openid_login', $LANG01[128]);
--- 642,646 ----
  
      // 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]);
***************
*** 1005,1014 ****
          $status = SEC_authenticate($loginname, $passwd, $uid);
  
!     } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_logging_method']['3rdparty'] && ($service != '')) {
          /* Distributed Authentication */
          //pass $loginname by ref so we can change it ;-)
          $status = SEC_remoteAuthentication($loginname, $passwd, $service, $uid);
  
!     } elseif (($_CONF['usersubmission'] == 0) && $_CONF['user_logging_method']['openid'] && (isset($_GET['openid_login']) && ($_GET['openid_login'] == '1'))) {
          // Here we go with the handling of OpenID authentification.
  
--- 1005,1014 ----
          $status = SEC_authenticate($loginname, $passwd, $uid);
  
!     } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['3rdparty'] && ($service != '')) {
          /* Distributed Authentication */
          //pass $loginname by ref so we can change it ;-)
          $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.
  

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.654
retrieving revision 1.655
diff -C2 -d -r1.654 -r1.655
*** lib-common.php	17 Sep 2007 04:37:22 -0000	1.654
--- lib-common.php	23 Sep 2007 19:20:40 -0000	1.655
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-common.php                                                            |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-common.php                                                            |
***************
*** 2224,2228 ****
  
          // 3rd party remote authentification.
!         if( $_CONF['user_logging_method']['3rdparty'] && !$_CONF['usersubmission'] )
          {
              // Build select
--- 2224,2228 ----
  
          // 3rd party remote authentification.
!         if( $_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission'] )
          {
              // Build select
***************
*** 2256,2260 ****
  
          // OpenID remote authentification.
!         if ($_CONF['user_logging_method']['openid'] && !$_CONF['usersubmission']) {
              $login->set_file('openid_login', 'loginform_openid.thtml');
              $login->set_var('lang_openid_login', $LANG01[128]);
--- 2256,2260 ----
  
          // 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]);
***************
*** 3733,3737 ****
          return $fullname;
      }
!     else if(( $_CONF['user_logging_method']['3rdparty'] || $_CONF['user_logging_method']['openid'] ) && !empty( $remoteusername ))
      {
          if( !empty( $username ))
--- 3733,3737 ----
          return $fullname;
      }
!     else if(( $_CONF['user_login_method']['3rdparty'] || $_CONF['user_login_method']['openid'] ) && !empty( $remoteusername ))
      {
          if( !empty( $username ))
***************
*** 4479,4483 ****
          $byname .= ',fullname';
      }
!     if( $_CONF['user_logging_method']['openid'] || $_CONF['user_logging_method']['3rdparty'] )
      {
          $byname .= ',remoteusername,remoteservice';
--- 4479,4483 ----
          $byname .= ',fullname';
      }
!     if( $_CONF['user_login_method']['openid'] || $_CONF['user_login_method']['3rdparty'] )
      {
          $byname .= ',remoteusername,remoteservice';
***************
*** 4501,4505 ****
                  $fullname = $A['fullname'];
              }
!             if( $_CONF['user_logging_method']['openid'] || $_CONF['user_logging_method']['3rdparty'] )
              {
                  $username = COM_getDisplayName( $A['uid'], $A['username'],
--- 4501,4505 ----
                  $fullname = $A['fullname'];
              }
!             if( $_CONF['user_login_method']['openid'] || $_CONF['user_login_method']['3rdparty'] )
              {
                  $username = COM_getDisplayName( $A['uid'], $A['username'],