merge recent changes into HEAD

1 files changed, 11 insertions, 5 deletions

diff --git a/remind_password.php b/remind_password.php
index 7eef22b..e3635a9 100644
--- a/remind_password.php
+++ b/remind_password.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.4 2005/08/01 18:42:02 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.5 2005/12/26 12:27:13 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: remind_password.php,v 1.4 2005/08/01 18:42:02 squareing Exp $
+ * $Id: remind_password.php,v 1.5 2005/12/26 12:27:13 squareing Exp $
  * @package users
  * @subpackage functions
  */
@@ -25,7 +25,13 @@ if ($forgotPass != 'y') {
 	header( 'Location: '.BIT_ROOT_URL );
 	die;
 } elseif (isset($_REQUEST["remind"])) {
-	if( $userInfo = $gBitUser->getUserInfo( array( 'login' => $_REQUEST["username"] ) ) ) {
+	$userInfo = '';
+	$pLogin = trim( $_REQUEST["username"] );
+    if ( strlen ( $pLogin ) ) {
+		$loginCol = strpos( $pLogin, '@' ) ? 'email' : 'login';
+		$userInfo = $gBitUser->getUserInfo( array( $loginCol => $pLogin ) );
+	}
+	if( $userInfo ) {
 		if ( $gBitSystem->isFeatureActive( 'feature_clear_passwords' ) && !empty($userInfo['password']) ) {
 			$pass = $userInfo['password'];
 			$tmp['success'] = tra("A password reminder email has been sent ");
@@ -35,8 +41,8 @@ if ($forgotPass != 'y') {
 		}
 		$tmp['success'] .= tra("to the registered email address for")." " . $_REQUEST["username"] . ".";
 
-		$gBitSmarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
-		$gBitSmarty->assign('mail_user', $_REQUEST["username"]);
+		$gBitSmarty->assign('mail_site', $_SERVER["REMOTE_ADDR"]);
+		$gBitSmarty->assign('mail_user', $userInfo[$loginCol]);
 		$gBitSmarty->assign('mail_same', $gBitSystem->isFeatureActive( 'feature_clear_passwords' ));
 		$gBitSmarty->assign('mail_pass', $pass);
 		$mail_data = $gBitSmarty->fetch('bitpackage:users/password_reminder.tpl');