[geeklog-cvs] geeklog-1.3/public_html/admin auth.inc.php,1.18,1.19

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv27916/admin

Modified Files:
	auth.inc.php 
Log Message:
Cosmetics and nitpicking ...


Index: auth.inc.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/auth.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** auth.inc.php	28 Dec 2003 18:50:07 -0000	1.18
--- auth.inc.php	17 Jun 2004 11:15:29 -0000	1.19
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2004 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 43,47 ****
  
  if (!empty($loginname) && !empty($passwd)) {
!     $mypasswd = COM_getpassword($loginname);
  } else {
      srand((double)microtime()*1000000);
--- 43,47 ----
  
  if (!empty($loginname) && !empty($passwd)) {
!     $mypasswd = COM_getPassword($loginname);
  } else {
      srand((double)microtime()*1000000);
***************
*** 51,63 ****
  $display = '';
  
! if (!empty($passwd) && $mypasswd == md5($passwd)) {
!     $userdata = SESS_getUserData($loginname);
!     $_USER=$userdata;
!     $sessid = SESS_newSession($_USER['uid'], $REMOTE_ADDR, $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']);
!     SESS_setSessionCookie($sessid, $_CONF['session_cookie_timeout'], $_CONF['cookie_session'], $_CONF['cookie_path'], $_CONF['cookiedomain'], $_CONF['cookiesecure']);
  
!     // #Now that we handled session cookies, handle longterm cookie
  
!     if (!isset($HTTP_COOKIE_VARS[$_CONF["cookie_name"]])) {
  
          // Either their cookie expired or they are new
--- 51,65 ----
  $display = '';
  
! if (!empty ($passwd) && !empty ($mypasswd) && ($mypasswd == md5 ($passwd))) {
!     $_USER = SESS_getUserData ($loginname);
!     $sessid = SESS_newSession ($_USER['uid'], $REMOTE_ADDR,
!             $_CONF['session_cookie_timeout'], $_CONF['cookie_ip']);
!     SESS_setSessionCookie ($sessid, $_CONF['session_cookie_timeout'],
!             $_CONF['cookie_session'], $_CONF['cookie_path'],
!             $_CONF['cookiedomain'], $_CONF['cookiesecure']);
  
!     // Now that we handled session cookies, handle longterm cookie
  
!     if (!isset ($HTTP_COOKIE_VARS[$_CONF['cookie_name']])) {
  
          // Either their cookie expired or they are new