From 98c45505d54629dfd267aef334bdb12ca1a740e2 Mon Sep 17 00:00:00 2001
From: CasN <cas@nuy.info>
Date: Mon, 13 Aug 2018 13:43:26 +0200
Subject: [PATCH] Extend search in manage_user_page.php

Search also for username and e-mail

Issue #12677
---
 config_defaults_inc.php |  6 +++++
 manage_user_page.php    | 49 ++++++++++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/config_defaults_inc.php b/config_defaults_inc.php
index 3211be2c9b..7a3cbd16cb 100644
--- a/config_defaults_inc.php
+++ b/config_defaults_inc.php
@@ -4876,3 +4876,9 @@
  * the attachment is linked to the note.  Or 0 for disabling this feature.
  */
 $g_issue_activity_note_attachments_seconds_threshold = 3;
+
+/**
+ * If a user submits a note with an attachments (with the specified # of seconds)
+ * the attachment is linked to the note.  Or 0 for disabling this feature.
+ */
+$g_issue_activity_note_attachments_seconds_threshold = 3;
diff --git a/manage_user_page.php b/manage_user_page.php
index e54936ac13..5b6e41f1a2 100644
--- a/manage_user_page.php
+++ b/manage_user_page.php
@@ -64,9 +64,14 @@
 $f_filter        = mb_strtoupper( gpc_get_string( 'filter', config_get( 'default_manage_user_prefix' ) ) );
 $f_page_number   = gpc_get_int( 'page_number', 1 );
 
-$f_findname      = gpc_get_string( 'findname', '' ); 
-if( $f_findname <> "" ) {
-	$f_filter = 'SEARCH';
+if( substr( $f_filter,0,6 ) === "SEARCH" ) {
+	$f_findname = trim( substr( $f_filter,6 ) );
+} else {
+	$f_findname = gpc_get_string( 'findname', '' ); 
+	if( $f_findname <> "" ) {
+		$f_filter = 'SEARCH';
+		$f_filter .= trim( $f_findname );
+	} 
 }
 
 if( !$f_save && !is_blank( gpc_get_cookie( $t_cookie_name, '' ) ) ) {
@@ -190,20 +195,41 @@
 $t_where_params = array();
 if( $f_filter === 'ALL' ) {
 	$t_where = '(1 = 1)';
-} else if( $f_filter === 'SEARCH' ) {
+} else if( substr( $f_filter,0,6 ) === 'SEARCH' ) {
 	$t_pos = strpos($f_findname, '-');
 	if( $t_pos ) {
-		$t_exclude = trim( substr( $f_findname, $t_pos+1 ) );
+		$t_exclude = trim( substr( $f_findname,$t_pos+1 ) );
 		$f_findname = trim( substr( $f_findname, 0,$t_pos-1 ) );
 		$t_where_params[] = '%' . $f_findname . '%';
-		$t_where = db_helper_like( 'realname' );
-		$t_where .= " AND NOT ";
+		$t_where = " ( ";
+		$t_where .= db_helper_like( 'realname' );
+		$t_where .= " OR ";
+		$t_where_params[] .= '%' . $f_findname . '%';
+		$t_where .= db_helper_like( 'username' );
+		$t_where .= " OR ";
+		$t_where_params[] .= '%' . $f_findname . '%';
+		$t_where .= db_helper_like( 'email' );
+		$t_where .= " ) AND NOT (";
 		$t_where_params[] = '%' . $t_exclude . '%';
 		$t_where .= db_helper_like( 'realname' );
+		$t_where .= " OR ";
+		$t_where_params[] .= '%' . $t_exclude . '%';
+		$t_where .= db_helper_like( 'username' );
+		$t_where .= " OR ";
+		$t_where_params[] .= '%' . $t_exclude . '%';
+		$t_where .= db_helper_like( 'email' );
+		$t_where .= " ) ";
 	} else {
-		$t_where_params[] = '%' . $f_findname . '%';
+		$t_where_params[] 	= '%' . $f_findname . '%';
 		$t_where = db_helper_like( 'realname' );
+		$t_where .= " OR ";
+		$t_where_params[] 	= '%' . $f_findname . '%';
+		$t_where .= db_helper_like( 'username' );
+		$t_where .= " OR ";
+		$t_where_params[] 	= '%' . $f_findname . '%';
+		$t_where .= db_helper_like( 'email' );
 	}
+
 } else if( $f_filter === 'UNUSED' ) {
 	$t_where = '(login_count = 0) AND ( date_created = last_visit )';
 } else if( $f_filter === 'NEW' ) {
@@ -379,13 +405,6 @@
 
 <div class="widget-toolbox padding-8 clearfix">
 	<div id="manage-user-edit-div" class="form-inline pull-left">
-		<form id="manage-user-edit-form" method="get" action="manage_user_edit_page.php" class="form-inline"
-			<?php # CSRF protection not required here - form does not result in modifications ?>>
-			<label class="inline" for="username"><?php echo lang_get( 'search' ) ?></label>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;			
-			<input id="username" type="text" name="username" class="input-sm" value="" />
-			<input type="submit" class="btn btn-primary btn-sm btn-white btn-round" value="<?php echo lang_get( 'manage_user' ) ?>" />
-		</form>
 		<form method="get" action="manage_user_page.php">
 			<?php # CSRF protection not required here - form does not result in modifications ?>
 			<label class="inline" for="findname"><?php echo lang_get( 'realname' ) ?></label>