[geeklog-cvs] geeklog-1.3/public_html users.php,1.60,1.61

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv19062/public_html

Modified Files:
	users.php 
Log Message:
To request a new password, you can not enter either your username or your email address.


Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** users.php	5 May 2003 21:11:06 -0000	1.60
--- users.php	6 May 2003 10:31:02 -0000	1.61
***************
*** 573,577 ****
  *
  */
! function loginform()
  {
      global $_CONF, $LANG04;
--- 573,577 ----
  *
  */
! function loginform ($hide_forgotpw_link = false)
  {
      global $_CONF, $LANG04;
***************
*** 586,590 ****
      $user_templates->set_var('lang_username', $LANG04[2]);
      $user_templates->set_var('lang_password', $LANG04[4]);
!     $user_templates->set_var('lang_forgetpassword', $LANG04[25]);
      $user_templates->set_var('lang_login', $LANG04[80]);
      $user_templates->set_var('end_block', COM_endBlock());
--- 586,594 ----
      $user_templates->set_var('lang_username', $LANG04[2]);
      $user_templates->set_var('lang_password', $LANG04[4]);
!     if ($hide_forgotpw_link) {
!         $user_templates->set_var('lang_forgetpassword', '');
!     } else {
!         $user_templates->set_var('lang_forgetpassword', $LANG04[25]);
!     }
      $user_templates->set_var('lang_login', $LANG04[80]);
      $user_templates->set_var('end_block', COM_endBlock());
***************
*** 644,647 ****
--- 648,652 ----
      $user_templates->set_var('lang_instructions', $LANG04[26]);
      $user_templates->set_var('lang_username', $LANG04[2]);
+     $user_templates->set_var('lang_email', $LANG04[5]);
      $user_templates->set_var('lang_emailpassword', $LANG04[28]);
      $user_templates->set_var('end_block', COM_endBlock());
***************
*** 665,696 ****
      global $LANG04, $_CONF;
  	
! 	if (!empty($msg)) {
! 		$retval .= COM_startBlock($LANG04[21]) . $msg . COM_endBlock();
! 	}
! 	
! 	$retval .= COM_startBlock($LANG04[65])
! 		. '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
! 		. '<table border="0" cellspacing="0" cellpadding="3">' . LB
! 		. '<tr><td colspan="2">' . $LANG04[66] . '</td></tr>' . LB
! 		. '<tr><td align="right"><b>' . $LANG04[2] . ':</b></td><td><input type="text" size="16" name="loginname"></td></tr>' . LB
! 		. '<tr><td align="right"><b>' . $LANG04[4] . ':</b></td><td><input type="password" name="passwd" size="16"></td></tr>' . LB
! 		. '<tr><td align="center" colspan="2"><input type="submit" value="Login"></td></tr>' . LB
! 		. '</table></form>'
! 		. COM_endBlock();
! 	
! 	$retval .= COM_startBlock($LANG04[22])
! 		. '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
! 		. '<table border="0" cellspacing="0" cellpadding="3">' . LB
! 		. '<tr><td colspan="2">' . $LANG04[23] . '</td></tr>' . LB
! 		. '<tr><td align="right"><b>' . $LANG04[2] 
!         . ':</b></td><td><input type="text" size="16" maxlength="16" name="username"></td></tr>' . LB
! 		. '<tr><td align="right"><b>' . $LANG04[5] 
!         . ':</b></td><td><input type="text" size="16" maxlength="32" name="email"></td></tr>' . LB
! 		. '<tr><td align="center" class="warning" colspan="2">' . $LANG04[24] . '</td></tr>' . LB
! 		. '<tr><td align="center" colspan="2"><input type="hidden" name="mode" value="create"><input type="submit" value="'
!         . $LANG04[27] . '"></td></tr>' . LB 
!         . '</table></form>' 
!         . COM_endBlock();
! 	
  	$retval .= COM_startBlock($LANG04[25])
  		. '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
--- 670,685 ----
      global $LANG04, $_CONF;
  	
!     $retval = '';
! 
!     if (!empty ($msg)) {
!         $retval .= COM_startBlock ($LANG04[21]) . $msg . COM_endBlock ();
!     }
! 
!     $retval .= loginform (true);
! 
!     $retval .= newuserform ();
! 
!     $retval .= getpasswordform ();
! /*
  	$retval .= COM_startBlock($LANG04[25])
  		. '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
***************
*** 703,707 ****
  		. '</table></form>'
  		. COM_endBlock();
! 	
  	return $retval;
  }
--- 692,696 ----
  		. '</table></form>'
  		. COM_endBlock();
! */
  	return $retval;
  }
***************
*** 827,831 ****
                   . COM_siteFooter ();
      } else {
!         $display .= requestpassword ($HTTP_POST_VARS['username'], 1);
      }
      break;
--- 816,825 ----
                   . COM_siteFooter ();
      } else {
!         $username = $HTTP_POST_VARS['username'];
!         if (empty ($username) && !empty ($HTTP_POST_VARS['email'])) {
!             $username = DB_getItem ($_TABLES['users'], 'username',
!                                     "email = '{$HTTP_POST_VARS['email']}'");
!         }
!         $display .= requestpassword ($username, 55);
      }
      break;