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

Move course_code to c_id (885 / 2302)

Browse Source
1.10.x
Yannick Warnier 10 years ago
parent a6f49770c2
commit ef45b057fe
10 changed files with 37 additions and 36 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. 8
      main/admin/session_import.php
  2. 10
      main/admin/subscribe_class2course.php
  3. 2
      main/admin/user_export.php
  4. 1
      main/auth/courses_controller.php
  5. 4
      main/course_info/infocours.php
  6. 2
      main/exercice/hotspot_answers.as.php
  7. 8
      main/forum/forumfunction.inc.php
  8. 2
      main/gradebook/lib/be/forumthreadlink.class.php
  9. 3
      main/inc/lib/api.lib.php
  10. 33
      main/inc/lib/course.lib.php

8
main/admin/session_import.php
Unescape View File

@ -318,8 +318,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$session_course_relation = SessionManager::relation_session_course_exist($session_id, $courseId);
if (!$session_course_relation) {
$sql_course = "INSERT INTO $tbl_session_course SET
c_id = '$courseId',
session_id='$session_id'";
c_id = $courseId,
session_id = $session_id";
$rs_course = Database::query($sql_course);
SessionManager::installCourse($id_session, $courseId);
}
@ -384,8 +384,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$courseId = $course_info['real_id'];
$sql_course = "INSERT INTO $tbl_session_course SET
c_id = '".$courseId."',
session_id='$session_id'";
c_id = $courseId,
session_id = $session_id";
$rs_course = Database::query($sql_course);
SessionManager::installCourse($id_session, $courseId);

10
main/admin/subscribe_class2course.php
Unescape View File

@ -57,13 +57,9 @@ if ($_POST['formSent'])
}
}
Display::display_normal_message(get_lang('ClassesSubscribed'));
}
else // remove classes from courses
{
foreach ($courses as $course_code)
{
foreach ($classes as $class_id)
{
} else {// remove classes from courses
foreach ($courses as $course_code) {
foreach ($classes as $class_id) {
ClassManager :: unsubscribe_from_course($class_id, $course_code);
}
}

2
main/admin/user_export.php
Unescape View File

@ -77,7 +77,7 @@ if ($form->validate()) {
$sql .= " FROM $user_table u, $course_user_table cu
WHERE
u.user_id = cu.user_id AND
cu.c_id = '$courseId' AND
cu.c_id = $courseId AND
cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
ORDER BY lastname,firstname";
$filename = 'export_users_'.$course_code.'_'.date('Y-m-d_H-i-s');

1
main/auth/courses_controller.php
Unescape View File

@ -338,6 +338,7 @@ class CoursesController
$message = get_lang('YouAreNowUnsubscribed');
}
$action = 'sortmycourses';
$error = '';
if (!empty($search_term)) {
$this->search_courses($search_term, $message, $error);
} else {

4
main/course_info/infocours.php
Unescape View File

@ -56,7 +56,7 @@ $tbl_admin = Database:: get_main_table(TABLE_MAIN_ADMIN);
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
$s_select_course_tutor_name = "SELECT tutor_name FROM $tbl_course WHERE code='$course_code'";
$s_select_course_tutor_name = "SELECT tutor_name FROM $tbl_course WHERE id = $courseId";
$q_tutor = Database::query($s_select_course_tutor_name);
$s_tutor = Database::result($q_tutor, 0, 'tutor_name');
@ -499,7 +499,7 @@ if ($form->validate() && is_settings_editable()) {
legal = '".$updateValues['legal']."',
activate_legal = '".$activeLegal."',
registration_code = '".$updateValues['course_registration_password']."'
WHERE code = '".$course_code."'";
WHERE id = $courseId";
Database::query($sql);
// Insert/Updates course_settings table

2
main/exercice/hotspot_answers.as.php
Unescape View File

@ -92,7 +92,7 @@ if(isset($_SESSION['exerciseResultCoordinates']) && $from_db==0) {
$sql = "SELECT hotspot_coordinate
FROM $tbl_track_e_hotspot
WHERE hotspot_question_id = $questionId AND
hotspot_course_code = '$course_code' AND
c_id = $course_id AND
hotspot_exe_id = $exe_id
ORDER by hotspot_id";
$rs = @Database::query($sql); // don't output error because we are in Flash execution.

8
main/forum/forumfunction.inc.php
Unescape View File

@ -2048,9 +2048,9 @@ function get_thread_users_qualify($thread_id)
AND qualify.thread_id = '".Database::escape_string($thread_id)."'
AND post.thread_id = '".Database::escape_string($thread_id)."'
AND course_user.status not in('1')
AND course_code = '".$course_code."' AND
qualify.c_id = $course_id AND
post.c_id = $course_id
AND course_user.c_id = $course_id
AND qualify.c_id = $course_id
AND post.c_id = $course_id
$orderby ";
}
$result = Database::query($sql);
@ -2119,7 +2119,7 @@ function get_thread_users_not_qualify($thread_id)
AND course_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
AND post.thread_id = '".Database::escape_string($thread_id)."'
AND course_user.status not in('1')
AND course_code = '".$course_code."' AND post.c_id = $course_id $orderby";
AND course_user.c_id = $course_id AND post.c_id = $course_id $orderby";
}
$result = Database::query($sql);

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

@ -47,7 +47,7 @@ class ForumThreadLink extends AbstractLink
.' forum_thread WHERE thread_id NOT IN'
.' (SELECT ref_id FROM '.$tbl_grade_links
.' WHERE type = '.LINK_FORUM_THREAD
." AND course_code = '".Database::escape_string($this->get_course_code())."'"
." AND c_id = ".intval($this->course_id)
.') AND forum_thread.session_id='.api_get_session_id().'';
$result = Database::query($sql);

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

@ -1708,13 +1708,14 @@ function api_get_course_info($course_code = null, $strict = false)
{
if (!empty($course_code)) {
$course_code = Database::escape_string($course_code);
$courseId = api_get_course_int_id($course_code);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$sql = "SELECT course.*, course_category.code faCode, course_category.name faName
FROM $course_table
LEFT JOIN $course_cat_table
ON course.category_code = course_category.code
WHERE course.code = '$course_code'";
WHERE course.id = $courseId";
$result = Database::query($sql);
$_course = array();
if (Database::num_rows($result) > 0) {

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

@ -329,7 +329,7 @@ class CourseManager
Database::query(
"SELECT status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
WHERE
c_id = '" . $courseId. "' AND
c_id = $courseId AND
user_id = " . intval($user_id)
)
);
@ -757,7 +757,7 @@ class CourseManager
// Check in advance whether subscription is allowed or not for this course.
$sql = "SELECT code, visibility FROM $course_table
WHERE code = '$course_code' AND subscribe = '" . SUBSCRIBE_NOT_ALLOWED . "'";
WHERE id = $courseId AND subscribe = '" . SUBSCRIBE_NOT_ALLOWED . "'";
if (Database::num_rows(Database::query($sql)) > 0) {
if ($debug) {
error_log('Subscription is not allowed for this course');
@ -1138,7 +1138,7 @@ class CourseManager
$result = Database::query(
'SELECT status FROM ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) .
' WHERE c_id="' . $courseId . '" and user_id="' . $user_id . '"'
' WHERE c_id = ' . $courseId . ' AND user_id = ' . $user_id . ''
);
if (Database::num_rows($result) > 0) {
@ -1301,7 +1301,7 @@ class CourseManager
$sessionCondition = " session_course_user.session_id IN ('$sessionIdListTostring') ";
}
$courseCondition = " course.code = '".$course_code."' ";
$courseCondition = " course.id = $courseId";
if (!empty($courseCodeList)) {
$courseCodeListForSession = array_map(array('Database', 'escape_string'), $courseCodeList);
$courseCodeListForSession = implode('","', $courseCodeListForSession);
@ -2461,8 +2461,9 @@ class CourseManager
return false;
}
$course_code = Database::escape_string($course_code);
$information = self::get_course_information($course_code);
$courseId = intval($courseId);
$information = api_get_course_info_by_id($courseId);
$course_code = $information['code'];
$courseId = $information['id'];
$student = api_get_user_info($user_id);
@ -2849,6 +2850,7 @@ class CourseManager
$t_cf = Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
$fname = Database::escape_string($fname);
$course_code = Database::escape_string($course_code);
$courseId = api_get_course_int_id($course_code);
$fvalues = '';
if (is_array($fvalue)) {
foreach ($fvalue as $val) {
@ -2870,7 +2872,7 @@ class CourseManager
$tms = time();
$sqlcfv = "SELECT * FROM $t_cfv
WHERE course_code = '$course_code' AND field_id = '" . $rowcf['id'] . "'
WHERE c_id = $courseId AND field_id = '" . $rowcf['id'] . "'
ORDER BY id";
$rescfv = Database::query($sqlcfv);
$n = Database::num_rows($rescfv);
@ -2903,8 +2905,8 @@ class CourseManager
}
return true;
} else {
$sqli = "INSERT INTO $t_cfv (course_code,field_id,field_value,tms) " .
"VALUES ('$course_code'," . $rowcf['id'] . ",'$fvalues',FROM_UNIXTIME($tms))";
$sqli = "INSERT INTO $t_cfv (c_id, course_code,field_id,field_value,tms) " .
"VALUES ($courseId, '$course_code'," . $rowcf['id'] . ",'$fvalues',FROM_UNIXTIME($tms))";
$resi = Database::query($sqli);
return ($resi ? true : false);
}
@ -3141,7 +3143,7 @@ class CourseManager
$courseInfo = api_get_course_info($course_code);
$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 . "')";
VALUES($courseId, $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')";
$result = Database::query($sql);
if (Database::affected_rows($result)) {
$affected_rows++;
@ -3308,13 +3310,14 @@ class CourseManager
$is_special = false;
$course_code = Database::escape_string($course_code);
$courseId = api_get_course_int_id($course_code);
$sql = "SELECT course_code
FROM $tbl_course_field_value tcfv
INNER JOIN $tbl_course_field tcf ON tcfv.field_id = tcf.id
WHERE
tcf.field_variable = 'special_course' AND
tcfv.field_value = 1 AND
course_code='$course_code'";
c_id = $courseId";
$result = Database::query($sql);
$num_rows = Database::num_rows($result);
if ($num_rows > 0) {
@ -4345,7 +4348,7 @@ class CourseManager
if (empty($session_id)) {
$table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "SELECT legal_agreement FROM $table
WHERE user_id = $user_id AND c_id = '$courseId' ";
WHERE user_id = $user_id AND c_id = $courseId ";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$result = Database::fetch_array($result);
@ -4357,7 +4360,7 @@ class CourseManager
} else {
$table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$sql = "SELECT legal_agreement FROM $table
WHERE user_id = $user_id AND c_id ='$courseId' AND session_id = $session_id";
WHERE user_id = $user_id AND c_id = $courseId AND session_id = $session_id";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$result = Database::fetch_array($result);
@ -4397,12 +4400,12 @@ class CourseManager
if (empty($session_id)) {
$table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$sql = "UPDATE $table SET legal_agreement = '1'
WHERE user_id = $user_id AND c_id = '$courseId' ";
WHERE user_id = $user_id AND c_id = $courseId ";
Database::query($sql);
} else {
$table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$sql = "UPDATE $table SET legal_agreement = '1'
WHERE user_id = $user_id AND c_id = '$courseId' AND session_id = $session_id";
WHERE user_id = $user_id AND c_id = $courseId AND session_id = $session_id";
Database::query($sql);
}
}

Write Preview
Loading…
Cancel
Save