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

Fix extra field users list + format code

Browse Source
pull/3213/head
Julio Montoya 6 years ago
parent e54d88ee9d
commit 55b13d0a01
1 changed files with 41 additions and 40 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. 81
      main/user/user.php

81
main/user/user.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
@ -9,9 +10,8 @@
* *
* @author Roan Embrechts * @author Roan Embrechts
* @author Julio Montoya, Several fixes * @author Julio Montoya, Several fixes
*
* @package chamilo.user
*/ */
$use_anonymous = true; $use_anonymous = true;
require_once __DIR__.'/../inc/global.inc.php'; require_once __DIR__.'/../inc/global.inc.php';
$current_course_tool = TOOL_USER; $current_course_tool = TOOL_USER;
@ -37,7 +37,7 @@ $_user = api_get_user_info();
$courseCode = $course_info['code']; $courseCode = $course_info['code'];
$courseId = $course_info['real_id']; $courseId = $course_info['real_id'];
$type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT; $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT;
$canEditUsers = api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' || api_is_platform_admin(); $canEditUsers = api_get_setting('allow_user_course_subscription_by_course_admin') === 'true' || api_is_platform_admin();
// Can't auto unregister from a session // Can't auto unregister from a session
if (!empty($sessionId)) { if (!empty($sessionId)) {
@ -659,11 +659,10 @@ if (!empty($_GET['keyword']) && !empty($_GET['submit'])) {
echo '<br/>'.get_lang('SearchResultsFor').' <span style="font-style: italic ;"> '.$keyword_name.' </span><br>'; echo '<br/>'.get_lang('SearchResultsFor').' <span style="font-style: italic ;"> '.$keyword_name.' </span><br>';
} }
if (!isset($origin) || $origin != 'learnpath') { if (!isset($origin) || $origin !== 'learnpath') {
Display::display_footer(); Display::display_footer();
} }
/* Helper functions for the users lists in course */
/** /**
* Get the users to display on the current page. * Get the users to display on the current page.
*/ */
@ -673,7 +672,7 @@ function get_number_of_users()
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$courseCode = api_get_course_id(); $courseCode = api_get_course_id();
$active = isset($_GET['active']) ? $_GET['active'] : null; $active = isset($_GET['active']) ? $_GET['active'] : null;
$type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT; $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT;
if (empty($sessionId)) { if (empty($sessionId)) {
$status = $type; $status = $type;
@ -686,7 +685,7 @@ function get_number_of_users()
} }
if (!empty($sessionId)) { if (!empty($sessionId)) {
$a_course_users = CourseManager::get_user_list_from_course_code( $users = CourseManager::get_user_list_from_course_code(
$courseCode, $courseCode,
$sessionId, $sessionId,
null, null,
@ -701,7 +700,7 @@ function get_number_of_users()
$active $active
); );
} else { } else {
$a_course_users = CourseManager::get_user_list_from_course_code( $users = CourseManager::get_user_list_from_course_code(
$courseCode, $courseCode,
0, 0,
null, null,
@ -717,14 +716,14 @@ function get_number_of_users()
); );
} }
foreach ($a_course_users as $o_course_user) { foreach ($users as $user) {
if (( if ((
isset($_GET['keyword']) && isset($_GET['keyword']) &&
searchUserKeyword( searchUserKeyword(
$o_course_user['firstname'], $user['firstname'],
$o_course_user['lastname'], $user['lastname'],
$o_course_user['username'], $user['username'],
$o_course_user['official_code'], $user['official_code'],
$_GET['keyword'] $_GET['keyword']
) )
) || !isset($_GET['keyword']) || empty($_GET['keyword']) ) || !isset($_GET['keyword']) || empty($_GET['keyword'])
@ -753,9 +752,9 @@ function searchUserKeyword($firstname, $lastname, $username, $official_code, $ke
api_strripos($official_code, $keyword) !== false api_strripos($official_code, $keyword) !== false
) { ) {
return true; return true;
} else {
return false;
} }
return false;
} }
/** /**
@ -772,7 +771,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
{ {
global $is_western_name_order; global $is_western_name_order;
global $extraFields; global $extraFields;
$type = isset($_REQUEST['type']) ? intval($_REQUEST['type']) : STUDENT; $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT;
$course_info = api_get_course_info(); $course_info = api_get_course_info();
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$course_code = $course_info['code']; $course_code = $course_info['code'];
@ -832,7 +831,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
} }
} }
$a_course_users = CourseManager :: get_user_list_from_course_code( $users = CourseManager :: get_user_list_from_course_code(
$course_code, $course_code,
$sessionId, $sessionId,
$limit, $limit,
@ -847,14 +846,14 @@ function get_user_data($from, $number_of_items, $column, $direction)
$active $active
); );
foreach ($a_course_users as $user_id => $o_course_user) { foreach ($users as $user_id => $userData) {
if (( if ((
isset($_GET['keyword']) && isset($_GET['keyword']) &&
searchUserKeyword( searchUserKeyword(
$o_course_user['firstname'], $userData['firstname'],
$o_course_user['lastname'], $userData['lastname'],
$o_course_user['username'], $userData['username'],
$o_course_user['official_code'], $userData['official_code'],
$_GET['keyword'] $_GET['keyword']
) )
) || !isset($_GET['keyword']) || empty($_GET['keyword']) ) || !isset($_GET['keyword']) || empty($_GET['keyword'])
@ -871,35 +870,35 @@ function get_user_data($from, $number_of_items, $column, $direction)
$photo = Display::img($userInfo['avatar_small'], $userInfo['complete_name'], [], false); $photo = Display::img($userInfo['avatar_small'], $userInfo['complete_name'], [], false);
$temp[] = $user_id; $temp[] = $user_id;
$temp[] = $photo; $temp[] = $photo;
$temp[] = $o_course_user['official_code']; $temp[] = $userData['official_code'];
if ($is_western_name_order) { if ($is_western_name_order) {
$temp[] = $o_course_user['firstname']; $temp[] = $userData['firstname'];
$temp[] = $o_course_user['lastname']; $temp[] = $userData['lastname'];
} else { } else {
$temp[] = $o_course_user['lastname']; $temp[] = $userData['lastname'];
$temp[] = $o_course_user['firstname']; $temp[] = $userData['firstname'];
} }
$temp[] = $o_course_user['username']; $temp[] = $userData['username'];
// Groups. // Groups.
$temp[] = implode(', ', $groupsNameListParsed); $temp[] = implode(', ', $groupsNameListParsed);
// Status // Status
$default_status = get_lang('Student'); $default_status = get_lang('Student');
if ((isset($o_course_user['status_rel']) && $o_course_user['status_rel'] == 1) || if ((isset($userData['status_rel']) && $userData['status_rel'] == 1) ||
(isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2) (isset($userData['status_session']) && $userData['status_session'] == 2)
) { ) {
$default_status = get_lang('CourseManager'); $default_status = get_lang('CourseManager');
} elseif (isset($o_course_user['is_tutor']) && $o_course_user['is_tutor'] == 1) { } elseif (isset($userData['is_tutor']) && $userData['is_tutor'] == 1) {
$default_status = get_lang('Tutor'); $default_status = get_lang('Tutor');
} }
$temp[] = $default_status; $temp[] = $default_status;
// Active // Active
$temp[] = $o_course_user['active']; $temp[] = $userData['active'];
$extraFieldOption = new ExtraFieldOption('user'); $extraFieldOption = new ExtraFieldOption('user');
$extraFieldValue = new ExtraFieldValue('user'); $extraFieldValue = new ExtraFieldValue('user');
@ -920,14 +919,16 @@ function get_user_data($from, $number_of_items, $column, $direction)
} else { } else {
$temp[] = $data['value']; $temp[] = $data['value'];
} }
} else {
$temp[] = '';
} }
} }
} }
// User id for actions // User id for actions
$temp[] = $user_id; $temp[] = $user_id;
$temp['is_tutor'] = isset($o_course_user['is_tutor']) ? $o_course_user['is_tutor'] : ''; $temp['is_tutor'] = isset($userData['is_tutor']) ? $userData['is_tutor'] : '';
$temp['user_status_in_course'] = isset($o_course_user['status_rel']) ? $o_course_user['status_rel'] : ''; $temp['user_status_in_course'] = isset($userData['status_rel']) ? $userData['status_rel'] : '';
} else { } else {
$userInfo = api_get_user_info($user_id); $userInfo = api_get_user_info($user_id);
$userPicture = $userInfo['avatar']; $userPicture = $userInfo['avatar'];
@ -936,17 +937,17 @@ function get_user_data($from, $number_of_items, $column, $direction)
$temp[] = ''; $temp[] = '';
$temp[] = $photo; $temp[] = $photo;
$temp[] = $o_course_user['official_code']; $temp[] = $userData['official_code'];
if ($is_western_name_order) { if ($is_western_name_order) {
$temp[] = $o_course_user['firstname']; $temp[] = $userData['firstname'];
$temp[] = $o_course_user['lastname']; $temp[] = $userData['lastname'];
} else { } else {
$temp[] = $o_course_user['lastname']; $temp[] = $userData['lastname'];
$temp[] = $o_course_user['firstname']; $temp[] = $userData['firstname'];
} }
$temp[] = $o_course_user['username']; $temp[] = $userData['username'];
// Group. // Group.
$temp[] = implode(', ', $groupsNameListParsed); $temp[] = implode(', ', $groupsNameListParsed);

Write Preview
Loading…
Cancel
Save