[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.333,1.334 users.php,1.79,1.80

[dhaun at iowaoutdoors.org]

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

Modified Files:
	lib-common.php users.php 
Log Message:
Cosmetics and nitpicking ...


Index: users.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/users.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** users.php	15 May 2004 13:02:20 -0000	1.79
--- users.php	17 Jun 2004 11:15:29 -0000	1.80
***************
*** 830,834 ****
          $mypasswd = rand();
      }
!     if (!empty($passwd) && $mypasswd == md5($passwd)) {
          DB_change($_TABLES['users'],'pwrequestid',"NULL",'username',$loginname);
          $userdata = SESS_getUserData($loginname);
--- 830,834 ----
          $mypasswd = rand();
      }
!     if (!empty ($passwd) && !empty ($mypasswd) && ($mypasswd == md5($passwd))) {
          DB_change($_TABLES['users'],'pwrequestid',"NULL",'username',$loginname);
          $userdata = SESS_getUserData($loginname);
***************
*** 838,842 ****
  
          // Now that we handled session cookies, handle longterm cookie
!         if (!isset($HTTP_COOKIE_VARS[$_CONF["cookie_name"]]) || !isset($HTTP_COOKIE_VARS['password'])) {
              // Either their cookie expired or they are new
              $cooktime = COM_getUserCookieTimeout();
--- 838,842 ----
  
          // Now that we handled session cookies, handle longterm cookie
!         if (!isset($HTTP_COOKIE_VARS[$_CONF['cookie_name']]) || !isset($HTTP_COOKIE_VARS['password'])) {
              // Either their cookie expired or they are new
              $cooktime = COM_getUserCookieTimeout();

Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.333
retrieving revision 1.334
diff -C2 -d -r1.333 -r1.334
*** lib-common.php	7 Jun 2004 18:40:43 -0000	1.333
--- lib-common.php	17 Jun 2004 11:15:29 -0000	1.334
***************
*** 4097,4106 ****
  * Fetches a password for the given user
  *
! * @param        string      $loginname      username to get password for
! * @return   string     Password or ''
  *
  */
  
! function COM_getpassword( $loginname )
  {
      global $_TABLES, $LANG01;
--- 4097,4106 ----
  * Fetches a password for the given user
  *
! * @param    string  $loginname  username to get password for
! * @return   string              Password or ''
  *
  */
  
! function COM_getPassword( $loginname )
  {
      global $_TABLES, $LANG01;
***************
*** 4117,4123 ****
      else
      {
!         $tmp = $LANG01[32] . ': ' . $loginname;
          COM_errorLog( $tmp, 1 );
      }
  }
  
--- 4117,4125 ----
      else
      {
!         $tmp = $LANG01[32] . ": '" . $loginname . "'";
          COM_errorLog( $tmp, 1 );
      }
+ 
+     return '';
  }