Fixes #13993: Support search by email in manage users page

vboctor · vboctor · commit 16c85ffff757 · 2012-03-02T20:46:43.000-08:00
- Search by email, if no match by username.
- Use the label 'Search' instead of 'Username' for the text field.
diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php
@@ -36,8 +36,12 @@
 	} else {
 		$t_user_id = user_get_id_by_name( $f_username );
 		if ( $t_user_id === false ) {
-			error_parameters( $f_username );
-			trigger_error( ERROR_USER_BY_NAME_NOT_FOUND, ERROR );
+			# If we can't find the user by name, attempt to find by email.
+			$t_user_id = user_get_id_by_email( $f_username );
+			if ( $t_user_id === false ) {
+				error_parameters( $f_username );
+				trigger_error( ERROR_USER_BY_NAME_NOT_FOUND, ERROR );
+			}
 		}
 	}
 
diff --git a/manage_user_page.php b/manage_user_page.php
@@ -348,7 +348,7 @@
 	<br />
 	<form method="get" action="manage_user_edit_page.php">
 	<?php # CSRF protection not required here - form does not result in modifications ?>
-		<?php echo lang_get( 'username' ) ?>
+		<?php echo lang_get( 'search' ) ?>
 		<input type="text" name="username" value="" />
 		<input type="submit" class="button" value="<?php echo lang_get( 'manage_user' ) ?>" />
 	</form>

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,12 @@`
`36`	`36`	`} else {`
`37`	`37`	`$t_user_id = user_get_id_by_name( $f_username );`
`38`	`38`	`if ( $t_user_id === false ) {`
`39`		`- error_parameters( $f_username );`
`40`		`- trigger_error( ERROR_USER_BY_NAME_NOT_FOUND, ERROR );`
	`39`	`+ # If we can't find the user by name, attempt to find by email.`
	`40`	`+ $t_user_id = user_get_id_by_email( $f_username );`
	`41`	`+ if ( $t_user_id === false ) {`
	`42`	`+ error_parameters( $f_username );`
	`43`	`+ trigger_error( ERROR_USER_BY_NAME_NOT_FOUND, ERROR );`
	`44`	`+ }`
`41`	`45`	`}`
`42`	`46`	`}`
`43`	`47`