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

Replace id with real_id. Because "id" is the "course code" ...

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 8261c69bbb
commit 4935f93d77
18 changed files with 65 additions and 57 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. 2
      main/admin/session_course_user_list.php
  2. 3
      main/admin/session_list.php
  3. 4
      main/auth/courses_controller.php
  4. 2
      main/chat/chat_whoisonline.php
  5. 2
      main/gradebook/lib/GradebookUtils.php
  6. 2
      main/gradebook/lib/be/category.class.php
  7. 2
      main/gradebook/lib/be/evaluation.class.php
  8. 6
      main/gradebook/lib/be/exerciselink.class.php
  9. 2
      main/gradebook/lib/fe/displaygradebook.php
  10. 4
      main/inc/ajax/course.ajax.php
  11. 2
      main/inc/lib/api.lib.php
  12. 47
      main/inc/lib/auth.lib.php
  13. 29
      main/inc/lib/course.lib.php
  14. 2
      main/inc/lib/document.lib.php
  15. 4
      main/inc/lib/myspace.lib.php
  16. 2
      main/inc/lib/tracking.lib.php
  17. 2
      main/inc/lib/usermanager.lib.php
  18. 5
      main/webservices/registration.soap.php

2
main/admin/session_course_user_list.php
Unescape View File

@ -24,7 +24,7 @@ if (empty($id_session )) {
$course_code = Database::escape_string(trim($_GET['course_code']));
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$page = isset($_GET['page']) ? intval($_GET['page']) : null;
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;

3
main/admin/session_list.php
Unescape View File

@ -49,8 +49,9 @@ $courseId = isset($_GET['course_id']) ? $_GET['course_id'] : null;
if (!empty($courseId)) {
$courseInfo = api_get_course_info_by_id($courseId);
$parents = getParentsToString($courseInfo['categoryCode']);
$courseList[] = array('id' => $courseInfo['id'], 'text' => $parents.$courseInfo['title']);
$courseList[] = array('id' => $courseInfo['code'], 'text' => $parents.$courseInfo['title']);
}
$sessionFilter->addElement('select_ajax', 'course_name', get_lang('SearchCourse'), null, array('url' => $url, 'defaults' => $courseList));
$url = api_get_self();
$actions = '

4
main/auth/courses_controller.php
Unescape View File

@ -246,9 +246,9 @@ class CoursesController
public function change_course_category($course_code, $category_id)
{
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$result = $this->model->store_changecoursecategory($courseId, $category_id);
$result = $this->model->updateCourseCategory($courseId, $category_id);
$message = '';
if ($result) {
$message = get_lang('EditCourseCategorySucces');

2
main/chat/chat_whoisonline.php
Unescape View File

@ -56,7 +56,7 @@ if (!empty($course)) {
t1.user_id=t2.user_id AND
t3.user_id=t2.user_id AND
t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
t3.c_id = '".$courseInfo['id']."' AND
t3.c_id = '".$courseInfo['real_id']."' AND
t2.last_connection>'".$date_inter."' $extra_condition
ORDER BY username";
$result = Database::query($query);

2
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -954,7 +954,7 @@ class GradebookUtils
$current_session = api_get_session_id();
$courseCode = Database::escape_string($courseCode);
$courseInfo = api_get_course_info($courseCode);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if (!empty($current_session)) {
$sql = "SELECT user.user_id, user.username, lastname, firstname, official_code

2
main/gradebook/lib/be/category.class.php
Unescape View File

@ -776,7 +776,7 @@ class Category implements GradebookItem
$parent = Category::load($parent);
$code = $parent[0]->get_course_code();
$courseInfo = api_get_course_info($code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if (isset($code) && $code != '0') {
$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$sql .= ' AND user_id IN (

2
main/gradebook/lib/be/evaluation.class.php
Unescape View File

@ -442,7 +442,7 @@ class Evaluation implements GradebookItem
$parent = Category::load($parent);
$code = $parent[0]->get_course_code();
$courseInfo = api_get_course_info($code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if (isset($code) && $code != '0') {
$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);

6
main/gradebook/lib/be/exerciselink.class.php
Unescape View File

@ -305,10 +305,10 @@ class ExerciseLink extends AbstractLink
$user_id = api_get_user_id();
$course_code = $this->get_course_code();
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$status_user=api_get_status_of_user_in_course($user_id, $courseId);
$session_id =api_get_session_id();
$status_user = api_get_status_of_user_in_course($user_id, $courseId);
$session_id = api_get_session_id();
$url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$this->get_ref_id().'&type='.$this->get_type();
if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user!=1) {

2
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -304,7 +304,7 @@ class DisplayGradebook
$user_id = api_get_user_id();
$course_code = $my_category['course_code'];
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$status_user = api_get_status_of_user_in_course($user_id, $courseId);

4
main/inc/ajax/course.ajax.php
Unescape View File

@ -84,9 +84,9 @@ switch ($action) {
}
$results[] = array(
'id' => $courseInfo['id'],
'id' => $courseInfo['code'],
'text' => $title
);
);
}
echo json_encode($results);
} else {

2
main/inc/lib/api.lib.php
Unescape View File

@ -5350,7 +5350,7 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
$cid = Database::escape_string($cid);
$courseInfo = api_get_course_info($cid);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
global $is_platformAdmin;

47
main/inc/lib/auth.lib.php
Unescape View File

@ -168,18 +168,18 @@ class Auth
}
/**
* stores the changes in a course category (moving a course to a different course category)
* @param string $courseId
* stores the changes in a course category
* (moving a course to a different course category)
* @param int $courseId
* @param int Category id
* @return bool True if it success
*/
public function store_changecoursecategory($courseId, $newcategory)
public function updateCourseCategory($courseId, $newcategory)
{
$courseId = intval($courseId);
$newcategory = intval($newcategory);
$current_user = api_get_user_id();
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$max_sort_value = api_max_sort_value($newcategory, $current_user);
$sql = "UPDATE $TABLECOURSUSER SET
@ -239,24 +239,24 @@ class Auth
}
if (count($target_course) > 0 && count($source_course) > 0) {
$courseInfo = api_get_course_info($source_course['code']);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$sql = "UPDATE $TABLECOURSUSER
SET sort='" . $target_course['sort'] . "'
WHERE
c_id = '" . $courseId . "' AND
user_id = '" . $current_user_id . "' AND
relation_type<>" . COURSE_RELATION_TYPE_RRHH;
$result1 = Database::query($sql);
$sql = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "'
WHERE
c_id ='" . $courseId . "' AND
user_id='" . $current_user_id . "' AND
relation_type<>" . COURSE_RELATION_TYPE_RRHH;
$result2 = Database::query($sql);
$sql_update1 = "UPDATE $TABLECOURSUSER
SET sort='" . $target_course['sort'] . "'
WHERE
c_id = '" . $courseId . "' AND
user_id = '" . $current_user_id . "' AND
relation_type<>" . COURSE_RELATION_TYPE_RRHH;
$sql_update2 = "UPDATE $TABLECOURSUSER SET sort='" . $source_course['sort'] . "'
WHERE
c_id ='" . $courseId . "' AND
user_id='" . $current_user_id . "' AND
relation_type<>" . COURSE_RELATION_TYPE_RRHH;
$result1 = Database::query($sql_update2);
$result2 = Database::query($sql_update1);
if (Database::affected_rows($result1) && Database::affected_rows($result2)) {
$result = true;
}
@ -395,13 +395,16 @@ class Auth
$result = true;
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
// we check (once again) if the user is not course administrator
// because the course administrator cannot unsubscribe himself
// (s)he can only delete the course
$sql = "SELECT * FROM $tbl_course_user
WHERE user_id='" . $current_user_id . "' AND c_id ='" . $courseId . "' AND status='1' ";
WHERE
user_id='" . $current_user_id . "' AND
c_id ='" . $courseId . "' AND
status='1' ";
$result_check = Database::query($sql);
$number_of_rows = Database::num_rows($result_check);
if ($number_of_rows > 0) {

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

@ -323,7 +323,7 @@ class CourseManager
public static function get_user_in_course_status($user_id, $course_code)
{
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$result = Database::fetch_array(
Database::query(
@ -545,7 +545,7 @@ class CourseManager
$course_code = Database::escape_string($course_code);
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$courseCode = $courseInfo['code'];
$userCourseCategoryId = intval($userCourseCategoryId);
@ -1010,7 +1010,7 @@ class CourseManager
return false;
}
$courseId = intval($courseInfo['id']);
$courseId = intval($courseInfo['real_id']);
$table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT * FROM $table
@ -1051,7 +1051,7 @@ class CourseManager
$condition_course = '';
if (isset($course_code)) {
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$condition_course = ' AND c_id = ' . $courseId;
}
@ -1111,15 +1111,17 @@ class CourseManager
}
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$result = Database::query(
'SELECT status FROM ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) .
' WHERE c_id="' . $courseId . '" and user_id="' . $user_id . '"'
);
if (Database::num_rows($result) > 0) {
return Database::result($result, 0, 'status') == 1;
}
return false;
}
@ -1616,15 +1618,16 @@ class CourseManager
$course_code = Database::escape_string($course_code);
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$sql = 'SELECT DISTINCT count(*) as count FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
$where = array();
if (!empty($session_id)) {
$sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . ' as session_course_user
ON user.user_id = session_course_user.user_id
AND session_course_user.c_id = "' . $courseId . '"
AND session_course_user.session_id = ' . $session_id;
ON
user.user_id = session_course_user.user_id AND
session_course_user.c_id = "' . $courseId . '" AND
session_course_user.session_id = ' . $session_id;
$where[] = ' session_course_user.c_id IS NOT NULL ';
} else {
@ -1729,7 +1732,7 @@ class CourseManager
$session_id = intval($session_id);
$course_code = Database::escape_string($course_code);
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$students = array();
@ -3166,7 +3169,7 @@ class CourseManager
if (is_array($courses_list)) {
foreach ($courses_list as $course_code) {
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$sql = "INSERT IGNORE INTO $tbl_course_rel_user(c_id, user_id, status, relation_type)
VALUES('$courseId', $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')";
$result = Database::query($sql);
@ -4354,7 +4357,7 @@ class CourseManager
$session_id = intval($session_id);
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
// Course legal
$enabled = api_get_plugin_setting('courselegal', 'tool_enable');
@ -4415,7 +4418,7 @@ class CourseManager
$session_id = intval($session_id);
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if (empty($session_id)) {
$table = Database::get_main_table(TABLE_MAIN_COURSE_USER);

2
main/inc/lib/document.lib.php
Unescape View File

@ -3231,7 +3231,7 @@ class DocumentManager
$tbl_doc = Database::get_course_table(TABLE_DOCUMENT);
$tbl_item_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
$condition_session = " AND (session_id = '$session_id' OR id_session = '0' )";
$condition_session = " AND (session_id = '$session_id' OR session_id = '0' )";
$add_folder_filter = null;
if (!empty($filter_by_folder)) {

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

@ -1239,7 +1239,7 @@ class MySpace
{
$course_code = $row[0];
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
// the table header
$return = '<table class="data_table" style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
@ -2110,7 +2110,7 @@ class MySpace
while ($row_course = Database::fetch_row($res)) {
$course_code = $row_course[0];
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$avg_assignments_in_course = $avg_messages_in_course = $nb_students_in_course = $avg_progress_in_course = $avg_score_in_course = $avg_time_spent_in_course = $avg_score_in_exercise = 0;
// students directly subscribed to the course

2
main/inc/lib/tracking.lib.php
Unescape View File

@ -3494,7 +3494,7 @@ class Tracking
$now = api_get_utc_datetime();
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if ($session_id != 0) {
$inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user

2
main/inc/lib/usermanager.lib.php
Unescape View File

@ -4515,7 +4515,7 @@ class UserManager
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$table_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
$courseCode = $courseInfo['code'];
if ($session == 0 || is_null($session)) {

5
main/webservices/registration.soap.php
Unescape View File

@ -4286,13 +4286,14 @@ function WSUnsubscribeUserFromCourse($params) {
$course_code = $row_course[0];
$courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['id'];
$courseId = $courseInfo['real_id'];
if (empty($course_code)) {
$results[] = 0;
continue;
} else {
$sql = "SELECT code FROM $table_course WHERE code ='$course_code' AND visibility = '0'";
$sql = "SELECT code FROM $table_course
WHERE code ='$course_code' AND visibility = '0'";
$resul = Database::query($sql);
$r_check_code = Database::fetch_row($resul);
if (!empty($r_check_code[0])) {

Write Preview
Loading…
Cancel
Save