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_session by session_id and course_code by c_id where relevant due to doctrine merge

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent a6ecec06c1
commit d3ada5c29e
5 changed files with 26 additions and 24 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
      plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
  2. 19
      plugin/buycourses/src/buy_course.lib.php
  3. 14
      plugin/buycourses/src/function.php
  4. 9
      plugin/dashboard/block_daily/block_daily.class.php
  5. 6
      plugin/resubscription/src/HookResubscription.php

2
plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
Unescape View File

@ -1321,7 +1321,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$sql = "SELECT s.id FROM $tSession AS s
INNER JOIN $tSessionFieldValues AS sfv ON s.id = sfv.session_id
INNER JOIN $tSessionField AS sf ON sfv.field_id = sf.id
INNER JOIN $tSessionUser AS su ON s.id = su.id_session
INNER JOIN $tSessionUser AS su ON s.id = su.session_id
WHERE
sf.field_variable = 'is_induction_session' AND
su.relation_type = 0 AND

19
plugin/buycourses/src/buy_course.lib.php
Unescape View File

@ -22,17 +22,18 @@ function sync()
$sql = "UPDATE $tableBuySessionRelCourse SET sync = 0";
Database::query($sql);
$sql = "SELECT id_session, course_code, nbr_users FROM $tableSessionRelCourse";
$sql = "SELECT session_id, c_id, nbr_users FROM $tableSessionRelCourse";
$res = Database::query($sql);
while ($row = Database::fetch_assoc($res)) {
$sql = "SELECT 1 FROM $tableBuySessionRelCourse WHERE id_session='" . $row['id_session'] . "';";
$sql = "SELECT 1 FROM $tableBuySessionRelCourse WHERE id_session=" . $row['session_id'];
$result = Database::query($sql);
if (Database::affected_rows($result) > 0) {
$sql = "UPDATE $tableBuySessionRelCourse SET sync = 1 WHERE id_session='" . $row['id_session'] . "';";
$sql = "UPDATE $tableBuySessionRelCourse SET sync = 1 WHERE id_session=" . $row['session_id'];
Database::query($sql);
} else {
$courseCode = api_get_course_info_by_id($row['c_id'])['code'];
$sql = "INSERT INTO $tableBuySessionRelCourse (id_session, course_code, nbr_users, sync)
VALUES ('" . $row['id_session'] . "', '" . $row['course_code'] . "', '" . $row['nbr_users'] . "', 1);";
VALUES (" . $row['session_id'] . ", '" . $courseCode . "', " . $row['nbr_users'] . ", 1);";
Database::query($sql);
}
}
@ -177,9 +178,9 @@ function userSessionList()
//check teacher
$sql = "SELECT lastname, firstname
FROM course_rel_user a, user b
WHERE a.course_code='" . $row['code'] . "'
WHERE a.c_id='" . $row['id'] . "'
AND a.role<>'' AND a.role<>'NULL'
AND a.user_id=b.user_id;";
AND a.user_id=b.id;";
$tmp = Database::query($sql);
$rowTmp = Database::fetch_assoc($tmp);
$row['teacher'] = $rowTmp['firstname'] . ' ' . $rowTmp['lastname'];
@ -196,7 +197,7 @@ function userSessionList()
//check if the user is enrolled in the current session
if ($currentUserId > 0) {
$sql = "SELECT 1 FROM $tableSessionRelUser
WHERE id_session ='".$rowSession['session_id']."' AND
WHERE session_id ='".$rowSession['session_id']."' AND
user_id = $currentUserId";
$result = Database::query($sql);
if (Database::affected_rows($result) > 0) {
@ -505,9 +506,9 @@ function sessionInfo($code)
//check teacher
$sql = "SELECT lastname, firstname
FROM course_rel_user a, user b
WHERE a.course_code='".$row['code']."'
WHERE a.c_id='".$row['id']."'
AND a.role<>'' AND a.role<>'NULL'
AND a.user_id=b.user_id;";
AND a.user_id=b.id;";
$tmp = Database::query($sql);
$rowTmp = Database::fetch_assoc($tmp);
$row['teacher'] = $rowTmp['firstname'].' '.$rowTmp['lastname'];

14
plugin/buycourses/src/function.php
Unescape View File

@ -100,9 +100,9 @@ if ($_REQUEST['tab'] == 'sessions_filter') {
//check teacher
$sql = "SELECT lastname, firstname
FROM course_rel_user a, user b
WHERE a.course_code='" . $row['code'] . "'
WHERE a.c_id=" . $row['id'] . "
AND a.role<>'' AND a.role<>'NULL'
AND a.user_id=b.user_id;";
AND a.user_id=b.id;";
$tmp = Database::query($sql);
$rowTmp = Database::fetch_assoc($tmp);
$row['teacher'] = $rowTmp['firstname'] . ' ' . $rowTmp['lastname'];
@ -264,10 +264,10 @@ if ($_REQUEST['tab'] == 'courses_filter') {
//Check teacher
$sql = "SELECT lastname, firstname
FROM $tableCourseRelUser a, $tableUser b
WHERE a.course_code = '" . $row['code'] . "'
WHERE a.c_id = " . $row['id'] . "
AND a.role <> ''
AND a.role IS NOT NULL
AND a.user_id = b.user_id;";
AND a.user_id = b.id;";
$tmp = Database::query($sql);
$rowTmp = Database::fetch_assoc($tmp);
@ -275,7 +275,7 @@ if ($_REQUEST['tab'] == 'courses_filter') {
//Check if the student is enrolled
if (isset($_SESSION['_user']) || $_SESSION['_user']['user_id'] != '') {
$sql = "SELECT 1 FROM $tableCourseRelUser
WHERE course_code = '" . $row['code'] . "'
WHERE c_id = " . $row['id'] . "
AND user_id = " . intval($_SESSION['_user']['user_id']) . ";";
$tmp = Database::query($sql);
@ -288,8 +288,8 @@ if ($_REQUEST['tab'] == 'courses_filter') {
$row['enrolled'] = "NO";
}
// Check img
if (file_exists("../../../courses/" . $row['code'] . "/course-pic85x85.png")) {
$row['course_img'] = "courses/" . $row['code'] . "/course-pic85x85.png";
if (file_exists(api_get_path(SYS_COURSE_PATH) . $row['directory'] . "/course-pic85x85.png")) {
$row['course_img'] = "courses/" . $row['directory'] . "/course-pic85x85.png";
} else {
$row['course_img'] = "main/img/without_picture.png";
}

9
plugin/dashboard/block_daily/block_daily.class.php
Unescape View File

@ -165,8 +165,9 @@ class BlockDaily extends Block
foreach ($courses as $row_course) {
$score = null;
$course_code = $row_course['code'];
$course_info = api_get_course_info($course_code);
$courseId = $row_course['c_id'];
$course_info = api_get_course_info_by_id($courseId);
$course_code = $course_info['code'];
if (empty($course_info)) {
continue;
}
@ -189,7 +190,7 @@ class BlockDaily extends Block
$attendance['done'] = $row['attendance_qualify_max'];
$attendance['id'] = $row['id'];
//$attendance['name'] = $row['name'];
$attendance['course_code'] = $course_code;
$attendance['course_code'] = $course_info['code'];
if ($attendance['done'] != '0') {
$attendances[] = '<a href="' . api_get_path(WEB_PATH).'main/attendance/index.php?cidReq=' . $attendance['course_code'] . '&action=attendance_sheet_print&attendance_id=' . $attendance['id'] . $param_gradebook . '">' . Display::return_icon('printmgr.gif', get_lang('Print')).'</a>';
@ -204,7 +205,7 @@ class BlockDaily extends Block
// Number of students
$sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.course_code='$course_code'";
WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.c_id=$courseId";
$rs = Database::query($sql);
$users = array();
while ($row = Database::fetch_array($rs)) {

6
plugin/resubscription/src/HookResubscription.php
Unescape View File

@ -63,7 +63,7 @@ class HookResubscription extends HookObserver implements HookResubscribeObserver
$userSessionCourses = array();
foreach ($userSessions as $userSession) {
$userSessionCourseResult = Database::select(
'course_code',
'c_id',
Database::get_main_table(TABLE_MAIN_SESSION_COURSE),
array(
'where' => array(
@ -96,8 +96,8 @@ class HookResubscription extends HookObserver implements HookResubscribeObserver
// Check if current course code matches with one of the users
foreach ($currentSessionCourseResult as $currentSessionCourse) {
if (isset($userSessionCourses[$currentSessionCourse['course_code']])) {
$endDate = $userSessionCourses[$currentSessionCourse['course_code']];
if (isset($userSessionCourses[$currentSessionCourse['c_id']])) {
$endDate = $userSessionCourses[$currentSessionCourse['c_id']];
$resubscriptionDate = gmdate($limitDateFormat, strtotime($endDate." +$resubscriptionOffset"));
$icon = Display::return_icon('students.gif', get_lang('Student'));
$canResubscribeFrom = sprintf(get_plugin_lang('CanResubscribeFromX', 'resubscription'), $resubscriptionDate);

Write Preview
Loading…
Cancel
Save