chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replacing conflict between function names see BT#7027

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 7ed4109ba6
commit 95db82a5f7
1 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/user/user.php

6
main/user/user.php
Unescape View File

@ -419,14 +419,14 @@ function get_number_of_users() {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0); $a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
} }
foreach ($a_course_users as $user_id => $o_course_user) { foreach ($a_course_users as $user_id => $o_course_user) {
if ((isset($_GET['keyword']) && search_keyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) { if ((isset($_GET['keyword']) && searchUserKeyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
$counter++; $counter++;
} }
} }
return $counter; return $counter;
} }
function search_keyword($firstname, $lastname, $username, $official_code, $keyword) { function searchUserKeyword($firstname, $lastname, $username, $official_code, $keyword) {
if (api_strripos($firstname, $keyword) !== false || api_strripos($lastname, $keyword) !== false || api_strripos($username, $keyword) !== false || api_strripos($official_code, $keyword) !== false) { if (api_strripos($firstname, $keyword) !== false || api_strripos($lastname, $keyword) !== false || api_strripos($username, $keyword) !== false || api_strripos($official_code, $keyword) !== false) {
return true; return true;
} else { } else {
@ -491,7 +491,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id, $limit, $order_by); $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id, $limit, $order_by);
foreach ($a_course_users as $user_id => $o_course_user) { foreach ($a_course_users as $user_id => $o_course_user) {
if ((isset($_GET['keyword']) && search_keyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) { if ((isset($_GET['keyword']) && searchUserKeyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
$groups_name = GroupManager :: get_user_group_name($user_id); $groups_name = GroupManager :: get_user_group_name($user_id);
$temp = array(); $temp = array();

Write Preview
Loading…
Cancel
Save