|
|
@ -108,8 +108,7 @@ function search_users($needle,$type) { |
|
|
|
$order_clause; |
|
|
|
$order_clause; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
global $_configuration; |
|
|
|
if (api_is_multiple_url_enabled()) { |
|
|
|
if ($_configuration['multiple_access_urls']) { |
|
|
|
|
|
|
|
$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
|
|
$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
|
|
$access_url_id = api_get_current_access_url_id(); |
|
|
|
$access_url_id = api_get_current_access_url_id(); |
|
|
|
if ($access_url_id != -1) { |
|
|
|
if ($access_url_id != -1) { |
|
|
@ -128,7 +127,6 @@ function search_users($needle,$type) { |
|
|
|
AND '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user.user_id<>"'.$user_anonymous.'"'.$cond_user_id. |
|
|
|
AND '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user.user_id<>"'.$user_anonymous.'"'.$cond_user_id. |
|
|
|
$order_clause; |
|
|
|
$order_clause; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -163,8 +161,7 @@ function search_users($needle,$type) { |
|
|
|
$xajax->processRequests(); |
|
|
|
$xajax->processRequests(); |
|
|
|
|
|
|
|
|
|
|
|
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); |
|
|
|
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); |
|
|
|
$htmlHeadXtra[] = ' |
|
|
|
$htmlHeadXtra[] = '<script> |
|
|
|
<script type="text/javascript"> |
|
|
|
|
|
|
|
function add_user (code, content) { |
|
|
|
function add_user (code, content) { |
|
|
|
// document.getElementById("user_to_add").value = ""; |
|
|
|
// document.getElementById("user_to_add").value = ""; |
|
|
|
//document.getElementById("ajax_list_users_single").innerHTML = ""; |
|
|
|
//document.getElementById("ajax_list_users_single").innerHTML = ""; |
|
|
@ -227,12 +224,10 @@ if ($_POST['form_sent']) { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$nosessionUsersList = $sessionUsersList = array(); |
|
|
|
$nosessionUsersList = $sessionUsersList = array(); |
|
|
|
$ajax_search = $add_type == 'unique' ? true : false; |
|
|
|
$ajax_search = $add_type == 'unique' ? true : false; |
|
|
|
global $_configuration; |
|
|
|
|
|
|
|
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; |
|
|
|
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; |
|
|
|
|
|
|
|
|
|
|
|
if ($ajax_search) { |
|
|
|
if ($ajax_search) { |
|
|
@ -242,7 +237,7 @@ if ($ajax_search) { |
|
|
|
ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id ". |
|
|
|
ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id ". |
|
|
|
$order_clause; |
|
|
|
$order_clause; |
|
|
|
|
|
|
|
|
|
|
|
if ($_configuration['multiple_access_urls']) { |
|
|
|
if (api_is_multiple_url_enabled()) { |
|
|
|
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
|
|
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
|
|
$access_url_id = api_get_current_access_url_id(); |
|
|
|
$access_url_id = api_get_current_access_url_id(); |
|
|
|
if ($access_url_id != -1){ |
|
|
|
if ($access_url_id != -1){ |
|
|
@ -263,7 +258,6 @@ if ($ajax_search) { |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$friends = SocialManager::get_friends(api_get_user_id()); |
|
|
|
$friends = SocialManager::get_friends(api_get_user_id()); |
|
|
|
|
|
|
|
|
|
|
|
$suggest_friends = false; |
|
|
|
$suggest_friends = false; |
|
|
|
|
|
|
|
|
|
|
|
if (!$friends) { |
|
|
|
if (!$friends) { |
|
|
@ -284,10 +278,11 @@ if ($ajax_search) { |
|
|
|
} |
|
|
|
} |
|
|
|
if (is_array($Users) && count($Users) > 0 ) { |
|
|
|
if (is_array($Users) && count($Users) > 0 ) { |
|
|
|
foreach ($Users as $user) { |
|
|
|
foreach ($Users as $user) { |
|
|
|
if($user['group_id'] != $group_id) |
|
|
|
if ($user['group_id'] != $group_id) { |
|
|
|
$nosessionUsersList[$user['user_id']] = $user; |
|
|
|
$nosessionUsersList[$user['user_id']] = $user; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//deleting anonymous users |
|
|
|
//deleting anonymous users |
|
|
|
$user_anonymous = api_get_anonymous_id(); |
|
|
|
$user_anonymous = api_get_anonymous_id(); |
|
|
|