Admins can add users from other portals (if they use the search form in the user list) see BT#3816

skala
Julio Montoya 14 years ago
parent 2ed35d1b3b
commit 98331b748b
  1. 4
      main/admin/user_list.php
  2. 4
      main/inc/lib/usermanager.lib.php

@ -884,7 +884,7 @@ if ($table->get_total_number_of_items() ==0) {
if (api_get_multiple_access_url() && isset($_REQUEST['keyword'])) {
$keyword = Database::escape_string($_REQUEST['keyword']);
$conditions = array('firstname' => $keyword, 'lastname' => $keyword, 'username' => $keyword);
$user_list = UserManager::get_user_list_like($conditions);
$user_list = UserManager::get_user_list_like($conditions, array(), false, ' OR ');
if (!empty($user_list)) {
$extra_search_options = '<h3>'.get_lang('UsersFoundInOtherPortals').'</h3>';
@ -909,7 +909,7 @@ if ($table->get_total_number_of_items() ==0) {
if ($current_access_url_id == $url_info['access_url_id']) {
$add_user = false;
}
$access_info_to_string .= $url_info['url'];
$access_info_to_string .= $url_info['url'].' ';
}
}
if ($add_user) {

@ -650,7 +650,7 @@ class UserManager {
* @return array An array with all users of the platform.
* @todo optional course code parameter, optional sorting parameters...
*/
public static function get_user_list_like($conditions = array(), $order_by = array(), $simple_like = false) {
public static function get_user_list_like($conditions = array(), $order_by = array(), $simple_like = false, $condition = 'AND') {
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$return_array = array();
$sql_query = "SELECT * FROM $user_table";
@ -667,7 +667,7 @@ class UserManager {
}
}
if (!empty($temp_conditions)) {
$sql_query .= implode(' AND ', $temp_conditions);
$sql_query .= implode(' '.$condition.' ', $temp_conditions);
}
}
if (count($order_by) > 0) {

Loading…
Cancel
Save