Search only username using "=" and not like when searching users from other URLs see BT#3816

skala
Julio Montoya 14 years ago
parent ba23932454
commit 34d8ae4da4
  1. 12
      main/admin/user_list.php
  2. 2
      main/inc/lib/usermanager.lib.php

@ -883,8 +883,9 @@ if ($table->get_total_number_of_items() ==0) {
if (api_get_multiple_access_url() && isset($_REQUEST['keyword'])) { if (api_get_multiple_access_url() && isset($_REQUEST['keyword'])) {
$keyword = Database::escape_string($_REQUEST['keyword']); $keyword = Database::escape_string($_REQUEST['keyword']);
$conditions = array('firstname' => $keyword, 'lastname' => $keyword, 'username' => $keyword); //$conditions = array('firstname' => $keyword, 'lastname' => $keyword, 'username' => $keyword);
$user_list = UserManager::get_user_list_like($conditions, array(), false, ' OR '); $conditions = array('username' => $keyword);
$user_list = UserManager::get_user_list($conditions, array(), false, ' OR ');
if (!empty($user_list)) { if (!empty($user_list)) {
$extra_search_options = '<h3>'.get_lang('UsersFoundInOtherPortals').'</h3>'; $extra_search_options = '<h3>'.get_lang('UsersFoundInOtherPortals').'</h3>';
@ -898,9 +899,9 @@ if ($table->get_total_number_of_items() ==0) {
$column++; $column++;
} }
$row++; $row++;
$column=0;
foreach($user_list as $user) { foreach ($user_list as $user) {
$column = 0;
$access_info = UrlManager::get_access_url_from_user($user['user_id']); $access_info = UrlManager::get_access_url_from_user($user['user_id']);
$access_info_to_string = ''; $access_info_to_string = '';
$add_user = true; $add_user = true;
@ -912,7 +913,8 @@ if ($table->get_total_number_of_items() ==0) {
$access_info_to_string .= $url_info['url'].' '; $access_info_to_string .= $url_info['url'].' ';
} }
} }
if ($add_user) { if ($add_user) {
$row_table = array();
$row_table[] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') '; $row_table[] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
$row_table[] = $access_info_to_string; $row_table[] = $access_info_to_string;
$url = api_get_self().'?action=add_user_to_my_url&user_id='.$user['user_id'].'&sec_token='.$_SESSION['sec_token']; $url = api_get_self().'?action=add_user_to_my_url&user_id='.$user['user_id'].'&sec_token='.$_SESSION['sec_token'];

@ -617,7 +617,7 @@ class UserManager {
foreach ($conditions as $field => $value) { foreach ($conditions as $field => $value) {
$field = Database::escape_string($field); $field = Database::escape_string($field);
$value = Database::escape_string($value); $value = Database::escape_string($value);
$sql_query .= $field.' = '.$value; $sql_query .= "$field = '$value'";
} }
} }
if (count($order_by) > 0) { if (count($order_by) > 0) {

Loading…
Cancel
Save