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

Fixing function get_user_list_from_course_code() removing unused parameter

Browse Source
skala
Julio Montoya 14 years ago
parent 2dcc167b56
commit a94cac7509
9 changed files with 20 additions and 20 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. 4
      main/dropbox/dropbox_functions.inc.php
  2. 4
      main/inc/lib/attendance.lib.php
  3. 6
      main/inc/lib/course.lib.php
  4. 2
      main/survey/survey_invite.php
  5. 8
      main/user/subscribe_user.php
  6. 8
      main/user/user.php
  7. 2
      main/webservices/cm_webservice_course.php
  8. 2
      main/webservices/webservice_course.php
  9. 4
      main/wiki/wiki.inc.php

4
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -514,13 +514,13 @@ function display_add_form() {
if (api_get_session_id()) {
$complete_user_list_for_dropbox = array();
if (api_get_setting('dropbox_allow_student_to_student')=='true' || $_user['status'] != STUDENT) {
$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], true, api_get_session_id());
$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], api_get_session_id());
}
$complete_user_list2 = CourseManager::get_coach_list_from_course_code($course_info['code'], api_get_session_id());
$complete_user_list_for_dropbox = array_merge($complete_user_list_for_dropbox, $complete_user_list2);
} else {
if (api_get_setting('dropbox_allow_student_to_student') == 'true' || $_user['status'] != STUDENT) {
$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], false, api_get_session_id());
$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], api_get_session_id());
} else {
$complete_user_list_for_dropbox = CourseManager :: get_teacher_list_from_course_code($course_info['code'], false);
}

4
main/inc/lib/attendance.lib.php
Unescape View File

@ -406,9 +406,9 @@ class Attendance
$current_session_id = api_get_session_id();
$current_course_id = api_get_course_id();
if (!empty($current_session_id)) {
$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, true, $current_session_id,'','lastname');
$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, $current_session_id,'','lastname');
} else {
$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, false, 0, '','lastname');
$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, 0, '','lastname');
}
// get registered users inside current course
$a_users = array();

6
main/inc/lib/course.lib.php
Unescape View File

@ -1126,7 +1126,7 @@ class CourseManager {
* @param string $order_by the field to order the users by. Valid values are 'lastname', 'firstname', 'username', 'email', 'official_code' OR a part of a SQL statement that starts with ORDER BY ...
* @return array
*/
public static function get_user_list_from_course_code($course_code, $with_session = true, $session_id = 0, $limit = '', $order_by = '') {
public static function get_user_list_from_course_code($course_code, $session_id = 0, $limit = '', $order_by = '') {
// variable initialisation
$session_id = intval($session_id);
$course_code = Database::escape_string($course_code);
@ -1381,7 +1381,7 @@ class CourseManager {
$virtual_course_list = self::get_virtual_courses_linked_to_real_course($course_code);
//get users from real course
$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
$user_list = self::get_user_list_from_course_code($course_code, $session_id);
foreach ($user_list as $this_user) {
$complete_user_list[] = $this_user;
}
@ -1389,7 +1389,7 @@ class CourseManager {
//get users from linked courses
foreach ($virtual_course_list as $this_course) {
$course_code = $this_course['code'];
$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
$user_list = self::get_user_list_from_course_code($course_code, $session_id);
foreach ($user_list as $this_user) {
$complete_user_list[] = $this_user;
}

2
main/survey/survey_invite.php
Unescape View File

@ -93,7 +93,7 @@ $form = new FormValidator('publish_form', 'post', api_get_self().'?survey_id='.$
$form->addElement('header', '', $tool_name);
// Course users
$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], true, $_SESSION['id_session'], '', api_sort_by_first_name() ? 'ORDER BY firstname' : 'ORDER BY lastname');
$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], $_SESSION['id_session'], '', api_sort_by_first_name() ? 'ORDER BY firstname' : 'ORDER BY lastname');
$possible_users = array();
foreach ($complete_user_list as $index => & $user) {
$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);

8
main/user/subscribe_user.php
Unescape View File

@ -340,9 +340,9 @@ function get_number_of_users() {
// getting all the users of the course (to make sure that we do not display users that are already in the course)
if (!empty($_SESSION["id_session"])) {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
} else {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
}
foreach ($a_course_users as $user_id=>$course_user) {
$users_of_course[] = $course_user['user_id'];
@ -590,9 +590,9 @@ function get_user_data($from, $number_of_items, $column, $direction) {
// getting all the users of the course (to make sure that we do not display users that are already in the course)
if (!empty($_SESSION["id_session"])) {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
} else {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
}
foreach ($a_course_users as $user_id=>$course_user) {
$users_of_course[] = $course_user['user_id'];

8
main/user/user.php
Unescape View File

@ -454,10 +454,10 @@ if (CourseManager::has_virtual_courses_from_code($course_id, $user_id)) {
function get_number_of_users() {
$counter = 0;
if (!empty($_SESSION["id_session"])){
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
} else {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], false);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
}
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'])) {
@ -529,9 +529,9 @@ function get_user_data($from, $number_of_items, $column, $direction) {
}
if (!empty($_SESSION["id_session"])) {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session'], $limit, $order_by);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session'], $limit, $order_by);
} else {
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], false, 0, $limit, $order_by);
$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0, $limit, $order_by);
}
foreach ($a_course_users as $user_id => $o_course_user) {

2
main/webservices/cm_webservice_course.php
Unescape View File

@ -320,7 +320,7 @@ class WSCMCourse extends WSCM {
}
// Determining number of students registered in course
$user_list = CourseManager::get_user_list_from_course_code($course['code'], false);
$user_list = CourseManager::get_user_list_from_course_code($course['code']);
$course_tmp['number_students'] = count($user_list);
// Determining external course id

2
main/webservices/webservice_course.php
Unescape View File

@ -330,7 +330,7 @@ class WSCourse extends WS {
}
// Determining number of students registered in course
$user_list = CourseManager::get_user_list_from_course_code($course['code'], false);
$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
$course_tmp['number_students'] = count($user_list);
// Determining external course id - this code misses the external course id field name

4
main/wiki/wiki.inc.php
Unescape View File

@ -1843,11 +1843,11 @@ function auto_add_page_users($assignment_type) {
{
//extract course members
if(!empty($session_id)){
$a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $session_id);
$a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $session_id);
}
else
{
$a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
$a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
}
}
else

Write Preview
Loading…
Cancel
Save