Skip to content

Commit

Permalink
Move course_code to c_id (885 / 2302)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ywarnier
ywarnier committed Apr 23, 2015
1 parent a6f4977 commit ef45b05
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 36 deletions.
8 changes: 4 additions & 4 deletions main/admin/session_import.php
View file
Expand Up @@ -318,8 +318,8 @@
$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);
}
Expand Down Expand Up @@ -384,8 +384,8 @@
$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);
Expand Down
10 changes: 3 additions & 7 deletions main/admin/subscribe_class2course.php
View file
Expand Up @@ -57,13 +57,9 @@
}
}
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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion main/admin/user_export.php
View file
Expand Up @@ -77,7 +77,7 @@
$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');
Expand Down
1 change: 1 addition & 0 deletions main/auth/courses_controller.php
View file
Expand Up @@ -338,6 +338,7 @@ public function unsubscribe_user_from_course($course_code, $search_term = null,
$message = get_lang('YouAreNowUnsubscribed');
}
$action = 'sortmycourses';
$error = '';
if (!empty($search_term)) {
$this->search_courses($search_term, $message, $error);
} else {
Expand Down
4 changes: 2 additions & 2 deletions main/course_info/infocours.php
View file
Expand Up @@ -56,7 +56,7 @@ function is_settings_editable() {
$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');

Expand Down Expand Up @@ -499,7 +499,7 @@ function 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
Expand Down
2 changes: 1 addition & 1 deletion main/exercice/hotspot_answers.as.php
View file
Expand Up @@ -92,7 +92,7 @@
$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.
Expand Down
8 changes: 4 additions & 4 deletions main/forum/forumfunction.inc.php
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion main/gradebook/lib/be/forumthreadlink.class.php
View file
Expand Up @@ -47,7 +47,7 @@ public function get_not_created_links()
.' 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);
Expand Down
3 changes: 2 additions & 1 deletion main/inc/lib/api.lib.php
View file
Expand Up @@ -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);

This comment has been minimized.

Sign in to view

Copy link
@jmontoyaa

jmontoyaa Apr 23, 2015

Member

El error era cuando $courseId = null

This comment has been minimized.

Sign in to view

Copy link
@jmontoyaa

jmontoyaa Apr 23, 2015

Member

Lo acabo de corregir
$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) {
Expand Down
33 changes: 18 additions & 15 deletions main/inc/lib/course.lib.php
View file
Expand Up @@ -329,7 +329,7 @@ public static function get_user_in_course_status($user_id, $course_code)
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)
)
);
Expand Down Expand Up @@ -757,7 +757,7 @@ public static function add_user_to_course($user_id, $course_code, $status = STUD

// 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');
Expand Down Expand Up @@ -1138,7 +1138,7 @@ public static function is_course_teacher($user_id, $course_code)

$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) {
Expand Down Expand Up @@ -1301,7 +1301,7 @@ public static function get_user_list_from_course_code(
$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);
Expand Down Expand Up @@ -2461,8 +2461,9 @@ public static function email_to_tutor($user_id, $courseId, $send_to_tutor_also =
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);
Expand Down Expand Up @@ -2849,6 +2850,7 @@ public static function update_course_extra_field_value($course_code, $fname, $fv
$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) {
Expand All @@ -2870,7 +2872,7 @@ public static function update_course_extra_field_value($course_code, $fname, $fv

$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);
Expand Down Expand Up @@ -2903,8 +2905,8 @@ public static function update_course_extra_field_value($course_code, $fname, $fv
}
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);
}
Expand Down Expand Up @@ -3141,7 +3143,7 @@ public static function subscribeCoursesToDrhManager($hr_manager_id, $courses_lis
$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++;
Expand Down Expand Up @@ -3308,13 +3310,14 @@ public static function is_special_course($course_code)

$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) {
Expand Down Expand Up @@ -4345,7 +4348,7 @@ public static function is_user_accepted_legal($user_id, $course_code, $session_i
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);
Expand All @@ -4357,7 +4360,7 @@ public static function is_user_accepted_legal($user_id, $course_code, $session_i
} 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);
Expand Down Expand Up @@ -4397,12 +4400,12 @@ public static function save_user_legal($user_id, $course_code, $session_id = nul
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);
}
}
Expand Down

0 comments on commit ef45b05

Please sign in to comment.