Replace id_session with session_id.

1.10.x
Julio Montoya 11 years ago
parent a2aec24456
commit 51fa68d4cb
  1. 2
      main/admin/access_url_check_user_session.php
  2. 24
      main/admin/add_courses_to_session.php
  3. 35
      main/admin/add_users_to_session.php
  4. 2
      main/admin/course_list.php
  5. 12
      main/admin/ldap_synchro.php
  6. 6
      main/admin/resume_session.php
  7. 15
      main/admin/session_course_edit.php
  8. 6
      main/admin/session_course_list.php
  9. 26
      main/admin/session_course_user.php
  10. 10
      main/admin/session_course_user_list.php
  11. 4
      main/admin/session_export.php
  12. 8
      main/admin/session_import.php
  13. 26
      main/admin/special_exports.php
  14. 14
      main/admin/user_move_stats.php
  15. 15
      main/chat/chat_whoisonline.php
  16. 8
      main/coursecopy/classes/CourseBuilder.class.php
  17. 2
      main/coursecopy/classes/CourseRestorer.class.php
  18. 20
      main/document/downloadfolder.inc.php
  19. 26
      main/forum/forumfunction.inc.php
  20. 4
      main/gradebook/lib/GradebookUtils.php
  21. 6
      main/gradebook/lib/be/result.class.php
  22. 2
      main/inc/lib/AnnouncementEmail.php
  23. 14
      main/inc/lib/add_courses_to_session_functions.lib.php
  24. 4
      main/inc/lib/agenda.lib.php
  25. 52
      main/inc/lib/api.lib.php
  26. 48
      main/inc/lib/course.lib.php
  27. 2
      main/inc/lib/display.lib.php
  28. 4
      main/inc/lib/document.lib.php
  29. 2
      main/inc/lib/fileDisplay.lib.php
  30. 4
      main/inc/lib/login.lib.php
  31. 10
      main/inc/lib/myspace.lib.php
  32. 62
      main/inc/lib/sessionmanager.lib.php
  33. 49
      main/inc/lib/tracking.lib.php
  34. 36
      main/inc/lib/usermanager.lib.php
  35. 10
      main/inc/local.inc.php
  36. 2
      main/mySpace/reussite.php
  37. 5
      main/social/group_invitation.php
  38. 2
      main/tracking/userLog.php
  39. 2
      main/tracking/userlogCSV.php
  40. 197
      main/user/add_users_to_session.php
  41. 24
      main/user/resume_session.php
  42. 2
      main/user/user.php
  43. 2
      main/work/work.lib.php
  44. 8
      plugin/advanced_subscription/cron/notify_by_mail.php
  45. 6
      plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
  46. 8
      plugin/buycourses/src/buy_course.lib.php
  47. 4
      plugin/buycourses/src/function.php
  48. 2
      tests/scripts/detect_deleted_visible_documents.php
  49. 2
      whoisonlinesession.php

@ -73,7 +73,7 @@ foreach($session_list as $session_item) {
ON u.user_id = su.user_id AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
LEFT OUTER JOIN $table_access_url_user uu
ON (uu.user_id = u.user_id)
WHERE su.id_session = $session_id AND $access_where
WHERE su.session_id = $session_id AND $access_where
$order_clause";
$result = Database::query($sql);

@ -115,24 +115,25 @@ $ajax_search = $add_type == 'unique' ? true : false;
$nosessionCourses = $sessionCourses = array();
if ($ajax_search) {
$sql="SELECT course.id, code, title, visual_code, id_session
$sql="SELECT course.id, code, title, visual_code, session_id
FROM $tbl_course course
INNER JOIN $tbl_session_rel_course session_rel_course
ON course.id = session_rel_course.c_id
AND session_rel_course.id_session = ".intval($sessionId)."
ON
course.id = session_rel_course.c_id AND
session_rel_course.session_id = ".intval($sessionId)."
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
if (api_is_multiple_url_enabled()) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sql="SELECT course.id, code, title, visual_code, id_session
$sql="SELECT course.id, code, title, visual_code, session_id
FROM $tbl_course course
INNER JOIN $tbl_session_rel_course session_rel_course
ON course.id = session_rel_course.c_id
AND session_rel_course.id_session = ".intval($sessionId)."
AND session_rel_course.session_id = ".intval($sessionId)."
INNER JOIN $tbl_course_rel_access_url url_course ON (url_course.c_id = course.id)
WHERE access_url_id = $access_url_id
WHERE access_url_id = $access_url_id
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
}
}
@ -144,25 +145,26 @@ if ($ajax_search) {
$sessionCourses[$course['id']] = $course ;
}
} else {
$sql = "SELECT course.id, code, title, visual_code, id_session
$sql = "SELECT course.id, code, title, visual_code, session_id
FROM $tbl_course course
LEFT JOIN $tbl_session_rel_course session_rel_course
ON
course.id = session_rel_course.c_id AND
session_rel_course.id_session = ".intval($sessionId)."
session_rel_course.session_id = ".intval($sessionId)."
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
if (api_is_multiple_url_enabled()) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sql="SELECT course.id, code, title, visual_code, id_session
$sql="SELECT course.id, code, title, visual_code, session_id
FROM $tbl_course course
LEFT JOIN $tbl_session_rel_course session_rel_course
ON
course.id = session_rel_course.c_id AND
session_rel_course.id_session = ".intval($sessionId)."
INNER JOIN $tbl_course_rel_access_url url_course ON (url_course.c_id = course.id)
session_rel_course.session_id = ".intval($sessionId)."
INNER JOIN $tbl_course_rel_access_url url_course
ON (url_course.c_id = course.id)
WHERE access_url_id = $access_url_id
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
}

@ -333,7 +333,7 @@ if (isset($_configuration['order_user_list_by_official_code']) &&
}
if ($ajax_search) {
$sql = "SELECT user_id, lastname, firstname, username, id_session, official_code
$sql = "SELECT user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
@ -346,7 +346,7 @@ if ($ajax_search) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session, official_code
$sql="SELECT u.user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
@ -432,7 +432,7 @@ if ($ajax_search) {
$order_clause = " AND u.creator_id = " . api_get_user_id() . $order_clause;
}
if ($use_extra_fields) {
$sql = "SELECT user_id, lastname, firstname, username, id_session, official_code
$sql = "SELECT user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
@ -440,9 +440,8 @@ if ($ajax_search) {
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$where_filter AND u.status<>".DRH." AND u.status<>6
$order_clause";
} else {
$sql = "SELECT user_id, lastname, firstname, username, id_session, official_code
$sql = "SELECT user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
@ -455,13 +454,14 @@ if ($ajax_search) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT u.user_id, lastname, firstname, username, id_session, official_code
$sql = "SELECT u.user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type <> ".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
INNER JOIN $tbl_user_rel_access_url url_user
ON (url_user.user_id = u.user_id)
WHERE access_url_id = $access_url_id $where_filter AND u.status<>".DRH." AND u.status<>6
$order_clause";
}
@ -483,7 +483,7 @@ if ($ajax_search) {
unset($users); //clean to free memory
//filling the correct users in list
$sql="SELECT user_id, lastname, firstname, username, id_session, official_code
$sql="SELECT user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
@ -495,17 +495,18 @@ if ($ajax_search) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
$sql = "SELECT u.user_id, lastname, firstname, username, session_id, official_code
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
}
}
$result = Database::query($sql);
$users = Database::store_result($result,'ASSOC');
foreach ($users as $uid => $user) {

@ -182,7 +182,7 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
c.visual_code
FROM $course_table c
INNER JOIN $session_rel_course r ON c.code = r.course_code
INNER JOIN $session s ON r.id_session = s.id
INNER JOIN $session s ON r.session_id = s.id
";
if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {

@ -125,7 +125,7 @@ foreach($Sessions as $session){
}
// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
$result=Database::query("SELECT id, course_code FROM $tbl_session_rel_course WHERE id_session='$id_session'");
$result=Database::query("SELECT id, course_code FROM $tbl_session_rel_course WHERE session_id='$id_session'");
$CourseList=array();
while($row=Database::fetch_array($result)) {
$CourseList[]= $row['id'];
@ -138,13 +138,13 @@ foreach($Sessions as $session){
VALUES('$id_session','$enreg_course','$enreg_user')";
Database::query($sql);
}
$sql = "SELECT COUNT(id_user) as nbUsers " .
$sql = "SELECT COUNT(user_id) as nbUsers " .
"FROM $tbl_session_rel_course_rel_user " .
"WHERE id_session='$id_session' AND c_id='$enreg_course'";
"WHERE session_id='$id_session' AND c_id='$enreg_course'";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
WHERE id_session='$id_session' AND c_id = '$enreg_course'";
WHERE session_id='$id_session' AND c_id = '$enreg_course'";
Database::query($sql);
}
// On ajoute la relation entre l'utilisateur et la session
@ -153,9 +153,9 @@ foreach($Sessions as $session){
"VALUES('$id_session','$enreg_user')";
Database::query($sql);
}
$sql = "SELECT COUNT(id_user) as nbUsers " .
$sql = "SELECT COUNT(user_id) as nbUsers " .
"FROM $tbl_session_rel_user " .
"WHERE id_session='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";

@ -298,7 +298,7 @@ if ($session['nbr_courses'] == 0) {
ON (c.id = sc.c_id)
WHERE
sc.c_id = c.id AND
id_session='$sessionId'
session_id='$sessionId'
$orderBy";
$result = Database::query($sql);
@ -316,7 +316,7 @@ if ($session['nbr_courses'] == 0) {
srcru.user_id = sru.session_id AND
srcru.c_id = '".intval($course['id'])."' AND
sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND
srcru.id_session = '".intval($sessionId)."'";
srcru.session_id = '".intval($sessionId)."'";
$rs = Database::query($sql);
$course['nbr_users'] = Database::result($rs, 0, 0);
@ -327,7 +327,7 @@ if ($session['nbr_courses'] == 0) {
FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE
session_rcru.id_user = user.user_id AND
session_rcru.id_session = '".intval($sessionId)."' AND
session_rcru.session_id = '".intval($sessionId)."' AND
session_rcru.c_id ='".intval($course['id'])."' AND
session_rcru.status=2";
$rs = Database::query($sql);

@ -28,9 +28,9 @@ $tool_name = $course_info['name'];
$sql = "SELECT s.name, c.title
FROM $tbl_session_course sc,$tbl_session s,$tbl_course c
WHERE
sc.id_session=s.id AND
sc.session_id=s.id AND
sc.c_id = c.id AND
sc.id_session='$id_session' AND
sc.session_id='$id_session' AND
sc.c_id ='".$courseId."'";
$result = Database::query($sql);
@ -49,9 +49,9 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$formSent = 1;
// get all tutor by course_code in the session
$sql = "SELECT id_user
$sql = "SELECT user_id
FROM $tbl_session_rel_course_rel_user
WHERE id_session = '$id_session' AND c_id = '".$courseId."' AND status = 2";
WHERE session_id = '$id_session' AND c_id = '".$courseId."' AND status = 2";
$rs_coachs = Database::query($sql);
$coachs_course_session = array();
@ -84,16 +84,15 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
header('Location: '.Security::remove_XSS($_GET['page']).'?id_session='.$id_session);
exit();
}
} else {
$sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user
WHERE id_session = '$id_session' AND c_id = '".$courseId."' AND status = 2 ";
$sql = "SELECT user_id FROM $tbl_session_rel_course_rel_user
WHERE session_id = '$id_session' AND c_id = '".$courseId."' AND status = 2 ";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
while ($infos = Database::fetch_array($rs)) {
$arr_infos[] = $infos['id_user'];
$arr_infos[] = $infos['user_id'];
}
}
}

@ -43,9 +43,9 @@ if ($action == 'delete') {
}
$idChecked = $my_temp;
$idChecked="'".implode("','", $idChecked)."'";
$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND c_id IN($idChecked)");
$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
$nbr_affected_rows=Database::affected_rows($result);
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND c_id IN($idChecked)");
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
}
header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
@ -56,7 +56,7 @@ $limit = 20;
$from = $page * $limit;
$sql = "SELECT code, title, nbr_users FROM $tbl_session_rel_course, $tbl_course
WHERE c_id = id AND id_session='$id_session'
WHERE c_id = id AND session_id='$id_session'
ORDER BY $sort LIMIT $from,".($limit+1);
$result=Database::query($sql);
$Courses=Database::store_result($result);

@ -63,10 +63,10 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
LEFT JOIN $tbl_session_rel_course session_rel_course
ON course.id = session_rel_course.c_id
INNER JOIN $tbl_session_rel_course_rel_user as srcru
ON (srcru.id_session = session_rel_course.id_session)
ON (srcru.session_id = session_rel_course.session_id)
WHERE
id_user = $id_user AND
session_rel_course.id_session = $id_session";
session_rel_course.session_id = $id_session";
$rs = Database::query($sql);
$existingCourses = Database::store_result($rs);
@ -85,11 +85,11 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if(!$exists) {
$enreg_course = Database::escape_string($enreg_course);
$sql_delete = "DELETE FROM $tbl_session_rel_course_rel_user
WHERE id_user='".$id_user."' AND course_code='".$enreg_course."' AND id_session=$id_session";
WHERE id_user='".$id_user."' AND course_code='".$enreg_course."' AND session_id=$id_session";
$result = Database::query($sql_delete);
if (Database::affected_rows($result)) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE id_session='$id_session' AND course_code='$enreg_course'";
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE session_id='$id_session' AND course_code='$enreg_course'";
Database::query($sql_update);
}
}
@ -98,11 +98,13 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
//$sql_insert_rel_course= "INSERT INTO $tbl_session_rel_course(id_session,course_code, id_coach) VALUES('$id_session','$enreg_course','$id_coach')";
if (!in_array($existingCourse['code'], $CourseList)){
$existingCourse = Database::escape_string($existingCourse['code']);
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$existingCourse','$id_user')";
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,course_code,id_user)
VALUES ('$id_session','$existingCourse','$id_user')";
$result = Database::query($sql_insert);
if (Database::affected_rows($result)) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1 WHERE id_session='$id_session' AND course_code='$existingCourse'";
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1
WHERE session_id='$id_session' AND course_code='$existingCourse'";
Database::query($sql_update);
}
@ -126,14 +128,16 @@ echo '<legend>'.$tool_name.': '.$session_info['name'].' - '.$user_info['complete
$nosessionCourses = $sessionCourses = array();
// actual user
$sql = "SELECT code, title, visual_code, srcru.id_session
$sql = "SELECT code, title, visual_code, srcru.session_id
FROM $tbl_course course inner JOIN $tbl_session_rel_course_rel_user as srcru
ON course.code = srcru.course_code WHERE srcru.id_user = $id_user AND id_session = $id_session";
ON course.id = srcru.c_id
WHERE srcru.user_id = $id_user AND session_id = $id_session";
//all
$sql_all="SELECT code, title, visual_code, src.id_session " .
"FROM $tbl_course course inner JOIN $tbl_session_rel_course as src " .
"ON course.code = src.course_code AND id_session = $id_session";
$sql_all="SELECT code, title, visual_code, src.session_id
FROM $tbl_course course
INNER JOIN $tbl_session_rel_course as src
ON course.id = src.c_id AND session_id = $id_session";
$result=Database::query($sql);
$Courses=Database::store_result($result);

@ -44,9 +44,9 @@ if (is_array($idChecked)) {
$sql = "SELECT s.name, c.title
FROM $tbl_session_rel_course src
INNER JOIN $tbl_session s ON s.id = src.id_session
INNER JOIN $tbl_session s ON s.id = src.session_id
INNER JOIN $tbl_course c ON c.id = src.c_id
WHERE src.id_session='$id_session' AND src.c_id='$courseId' ";
WHERE src.session_id='$id_session' AND src.c_id='$courseId' ";
$result = Database::query($sql);
if (!list($session_name,$course_title) = Database::fetch_row($result)) {
@ -62,11 +62,11 @@ switch ($action) {
}
if (!empty($idChecked)) {
$sql = "DELETE FROM $tbl_session_rel_course_rel_user
WHERE id_session='$id_session' AND c_id='".$courseId."' AND id_user IN($idChecked)";
WHERE session_id='$id_session' AND c_id='".$courseId."' AND id_user IN($idChecked)";
$result = Database::query($sql);
$nbr_affected_rows = Database::affected_rows($result);
$sql = "UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows
WHERE id_session='$id_session' AND c_id='".$courseId."'";
WHERE session_id='$id_session' AND c_id='".$courseId."'";
Database::query($sql);
}
header('Location: '.api_get_self().'?id_session='.$id_session.'&course_code='.urlencode($course_code).'&sort='.$sort);
@ -88,7 +88,7 @@ $sql = "SELECT DISTINCT
FROM $tbl_session_rel_user s
INNER JOIN $tbl_user u ON (u.user_id=s.user_id)
LEFT JOIN $tbl_session_rel_course_rel_user scru
ON (s.session_id = scru.id_session AND s.user_id = scru.user_id AND scru.c_id = '".$courseId."' )
ON (s.session_id = scru.session_id AND s.user_id = scru.user_id AND scru.c_id = '".$courseId."' )
WHERE s.session_id='$id_session'
ORDER BY $sort $direction
LIMIT $from,".($limit+1);

@ -160,7 +160,7 @@ if ($_POST['formSent']) {
FROM $tbl_course c
INNER JOIN $tbl_session_course_user sc
ON c.id = sc.c_id
AND sc.id_session = '".$row['id']."'";
AND sc.session_id = '".$row['id']."'";
$rsCourses = Database::query($sql);
@ -174,7 +174,7 @@ if ($_POST['formSent']) {
ON u.user_id = scu.id_user
WHERE
scu.c_id = '{$rowCourses['c_id']}' AND
scu.id_session = '".$row['id']."' AND
scu.session_id = '".$row['id']."' AND
scu.status = 2 ";
$rs_coachs = Database::query($sql);

@ -321,7 +321,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if (!$session_course_relation) {
$sql_course = "INSERT INTO $tbl_session_course SET
c_id = '$courseId',
id_session='$session_id'";
session_id='$session_id'";
$rs_course = Database::query($sql_course);
SessionManager::installCourse($id_session, $courseId);
}
@ -336,7 +336,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
id_user='$coach_id',
c_id = '$courseId',
id_session = '$session_id',
session_id = '$session_id',
status = 2 ";
$rs_coachs = Database::query($sql);
} else {
@ -387,7 +387,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$sql_course = "INSERT INTO $tbl_session_course SET
c_id = '".$courseId."',
id_session='$session_id'";
session_id='$session_id'";
$rs_course = Database::query($sql_course);
SessionManager::installCourse($id_session, $courseId);
@ -402,7 +402,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
id_user='$coach_id',
c_id = $courseId,
id_session = '$session_id',
session_id = '$session_id',
status = 2 ";
$rs_coachs = Database::query($sql);
} else {

@ -232,15 +232,16 @@ function fullexportspecial(){
while ($rows_course_file = Database::fetch_assoc($query)) {
$rows_course_file['path'];
$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
PCLZIP_OPT_ADD_PATH, $_course['directory'],
PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory']."/document".$FileZip['PATH_REMOVE']
);
PCLZIP_OPT_ADD_PATH, $_course['directory'],
PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory']."/document".$FileZip['PATH_REMOVE']
);
}
//Add tem to the zip file session course
$code_course = $_course['code'];
$sql_session = "SELECT id, name, course_code FROM $tbl_session_course
INNER JOIN $tbl_session ON id_session = id
WHERE course_code = '$code_course' ";
$sql_session = "SELECT id, name, c_id
FROM $tbl_session_course
INNER JOIN $tbl_session ON session_id = id
WHERE course_code = '$code_course' ";
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session_id = $rows_session['id'];
@ -255,21 +256,22 @@ function fullexportspecial(){
$query_session_doc = Database::query($sql_session_doc);
while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) {
$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'],
PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
);
PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
);
}
}
}
$name = rename_zip($FileZip);
if($name === false){
if ($name === false){
$export = false;
return false;
}else{
} else {
$export = true;
return $name;
}
}else{
} else {
Display::display_error_message(get_lang('ErrorMsgSpecialExport')); //main API
$export = false;
return false;

@ -583,9 +583,9 @@ $htmlHeadXtra[] = '<script type="text/javascript">
function get_courses_list_by_user_id_based_in_exercises($user_id) {
$TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$user_id = intval($user_id);
//$sql = "SELECT DISTINCT exe_user_id, c_id, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id GROUP BY exe_user_id, c_id ORDER by exe_user_id, c_id ASC";
$sql = "SELECT DISTINCT exe_user_id, c_id, session_id as id_session
FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id ORDER by exe_user_id, c_id ASC";
$sql = "SELECT DISTINCT exe_user_id, c_id, session_id
FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id
ORDER by exe_user_id, c_id ASC";
$res = Database::query($sql);
$course_list = array();
@ -652,22 +652,22 @@ if (!empty($user_list)) {
$new_course_list = array();
foreach ($course_list_registered as $course_reg) {
if (empty($course_reg['id_session'])) {
$course_reg['id_session'] = 0;
if (empty($course_reg['session_id'])) {
$course_reg['session_id'] = 0;
}
// Recover the code for historical reasons. If it can be proven
// that the code can be safely replaced by c_id in the following
// PHP code, feel free to do so
$courseInfo = api_get_course_info_by_id($course_reg['c_id']);
$course_reg['code'] = $courseInfo['code'];
$new_course_list[] = $course_reg['code'].'_'.$course_reg['id_session'];
$new_course_list[] = $course_reg['code'].'_'.$course_reg['session_id'];
}
$course_list = get_courses_list_by_user_id_based_in_exercises($user_id);
if (is_array($course_list) && !empty($course_list)) {
foreach ($course_list as $my_course) {
$key = $my_course['code'].'_'.$my_course['id_session'];
$key = $my_course['code'].'_'.$my_course['session_id'];
if (!in_array($key, $new_course_list)) {
$my_course['not_registered'] = 1;

@ -67,7 +67,7 @@ if (!empty($course)) {
WHERE
t2.c_id = $course_id AND
t1.user_id=t2.user_id AND t3.id_user=t2.user_id AND
t3.id_session = '".$session_id."' AND
t3.session_id = '".$session_id."' AND
t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
$result = Database::query($query);
while ($learner = Database::fetch_array($result)) {
@ -88,12 +88,13 @@ if (!empty($course)) {
$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email
FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3
WHERE
t2.c_id = $course_id AND
t1.user_id=t2.user_id
AND t3.id_user=t2.user_id AND t3.status=2
AND t3.id_session = '".$session_id."'
AND t3.course_code = '".$_course['sysCode']."'
AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
t2.c_id = $course_id AND
t1.user_id=t2.user_id
AND t3.id_user=t2.user_id AND t3.status=2
AND t3.session_id = '".$session_id."'
AND t3.c_id = '".$course_id."'
AND t2.last_connection>'".$date_inter."' $extra_condition
ORDER BY username";
$result = Database::query($query);
$course_coaches = array();

@ -1297,9 +1297,11 @@ class CourseBuilder
$this->course->encoding = api_get_system_encoding(
); //current platform encoding
$code_course = $_course['code'];
$sql_session = "SELECT id, name, course_code FROM $tbl_session_course
INNER JOIN $tbl_session ON id_session = id
WHERE course_code = '$code_course' ";
$courseId = $_course['real_id'];
$sql_session = "SELECT id, name, c_id
FROM $tbl_session_course
INNER JOIN $tbl_session ON session_id = id
WHERE c_id = '$courseId' ";
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session = new CourseSession(

@ -198,7 +198,7 @@ class CourseRestorer
$condition_session = "";
if (!empty($session_id)) {
$condition_session = " , id_session='".intval($session_id)."'";
$condition_session = " , session_id ='".intval($session_id)."'";
}
foreach ($this->course->resources as $type => $resources) {

@ -89,7 +89,7 @@ function fixDocumentNameCallback($p_event, &$p_header)
$documentNameFixed = DocumentManager::undoFixDocumentName(
$documentData['path'],
$documentData['c_id'],
$documentData['id_session'],
$documentData['session_id'],
$documentData['to_group_id']
);
@ -112,7 +112,7 @@ if (api_is_allowed_to_edit()) {
}
$querypath = Database::escape_string($querypath);
// Search for all files that are not deleted => visibility != 2
$sql = "SELECT path, id_session, docs.id, props.to_group_id, docs.c_id
$sql = "SELECT path, session_id, docs.id, props.to_group_id, docs.c_id
FROM $doc_table AS docs INNER JOIN $prop_table AS props
ON
docs.id = props.ref AND
@ -123,7 +123,7 @@ if (api_is_allowed_to_edit()) {
docs.filetype = 'file' AND
props.visibility <> '2' AND
props.to_group_id = ".$groupId." AND
props.id_session IN ('0', '$sessionId') AND
props.session_id IN ('0', '$sessionId') AND
docs.c_id = ".$courseId." ";
$sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
@ -143,7 +143,7 @@ if (api_is_allowed_to_edit()) {
strpos($not_deleted_file['path'], 'shared_folder') > 0
) {
if (!empty($sessionId)) {
if ($not_deleted_file['id_session'] != $sessionId) {
if ($not_deleted_file['session_id'] != $sessionId) {
continue;
}
}
@ -174,7 +174,7 @@ if (api_is_allowed_to_edit()) {
1st: Get all files that are visible in the given path
*/
$querypath = Database::escape_string($querypath);
$sql = "SELECT path, id_session, docs.id, props.to_group_id, docs.c_id
$sql = "SELECT path, session_id, docs.id, props.to_group_id, docs.c_id
FROM $doc_table AS docs INNER JOIN $prop_table AS props
ON
docs.id = props.ref AND
@ -185,7 +185,7 @@ if (api_is_allowed_to_edit()) {
docs.path LIKE '".$querypath."/%' AND
props.visibility = '1' AND
docs.filetype = 'file' AND
props.id_session IN ('0', '$sessionId') AND
props.session_id IN ('0', '$sessionId') AND
props.to_group_id = ".$groupId;
$sql.= DocumentManager::getSessionFolderFilters($querypath, $sessionId);
@ -199,7 +199,7 @@ if (api_is_allowed_to_edit()) {
strpos($all_visible_files['path'], 'shared_folder') > 0
) {
if (!empty($sessionId)) {
if ($all_visible_files['id_session'] != $sessionId) {
if ($all_visible_files['session_id'] != $sessionId) {
continue;
}
}
@ -209,7 +209,7 @@ if (api_is_allowed_to_edit()) {
}
// 2nd: Get all folders that are invisible in the given path
$sql = "SELECT path, id_session, docs.id, props.to_group_id, docs.c_id
$sql = "SELECT path, session_id, docs.id, props.to_group_id, docs.c_id
FROM $doc_table AS docs INNER JOIN $prop_table AS props
ON
docs.id = props.ref AND
@ -219,7 +219,7 @@ if (api_is_allowed_to_edit()) {
props.tool = '".TOOL_DOCUMENT."' AND
docs.path LIKE '".$querypath."/%' AND
props.visibility <> '1' AND
props.id_session IN ('0', '$sessionId') AND
props.session_id IN ('0', '$sessionId') AND
docs.filetype = 'folder'";
$query2 = Database::query($sql);
@ -241,7 +241,7 @@ if (api_is_allowed_to_edit()) {
props.tool ='".TOOL_DOCUMENT."' AND
docs.path LIKE '".$invisible_folders['path']."/%' AND
docs.filetype ='file' AND
props.id_session IN ('0', '$sessionId') AND
props.session_id IN ('0', '$sessionId') AND
props.visibility ='1'";
$query3 = Database::query($sql);
// Add tem to an array

@ -1402,7 +1402,7 @@ function get_forums(
ON (
threads.thread_id=item_properties.ref AND
threads.c_id = item_properties.c_id AND
threads.session_id = item_properties.id_session
threads.session_id = item_properties.session_id
)
WHERE
item_properties.visibility=1 AND
@ -1418,7 +1418,7 @@ function get_forums(
posts.visible=1 AND
posts.thread_id=threads.thread_id AND
threads.thread_id=item_properties.ref AND
threads.session_id = item_properties.id_session AND
threads.session_id = item_properties.session_id AND
item_properties.visibility=1 AND
item_properties.tool='".TOOL_FORUM_THREAD."' AND
threads.c_id = $course_id AND
@ -1451,7 +1451,7 @@ function get_forums(
ON (
threads.thread_id=item_properties.ref AND
threads.c_id = item_properties.c_id AND
threads.session_id = item_properties.id_session
threads.session_id = item_properties.session_id
)
WHERE
item_properties.visibility<>2 AND
@ -1465,7 +1465,7 @@ function get_forums(
WHERE
posts.thread_id=threads.thread_id AND
threads.thread_id=item_properties.ref AND
threads.session_id = item_properties.id_session AND
threads.session_id = item_properties.session_id AND
item_properties.visibility=1 AND
item_properties.tool='".TOOL_FORUM_THREAD."' AND
posts.c_id = $course_id AND
@ -1794,7 +1794,7 @@ function get_posts($thread_id)
/*
* INNER JOIN $tableItemProperty i
ON i.ref = posts.post_id AND i.c_id = posts.c_id*
i.id_session = $sessionId
i.session_id = $sessionId
*/
if (api_is_allowed_to_edit(null, true)) {
$sql = "SELECT * FROM $table_posts posts
@ -1915,13 +1915,13 @@ function get_thread_users_details($thread_id)
$sql = "SELECT DISTINCT user.user_id, user.lastname, user.firstname, thread_id
FROM $t_posts , $t_users user, $t_session_rel_user session_rel_user_rel_course
WHERE poster_id = user.user_id AND
user.user_id = session_rel_user_rel_course.id_user AND
user.user_id = session_rel_user_rel_course.user_id AND
session_rel_user_rel_course.status<>'2' AND
session_rel_user_rel_course.id_user NOT IN ($user_to_avoid) AND
session_rel_user_rel_course.user_id NOT IN ($user_to_avoid) AND
thread_id = ".intval($thread_id)." AND
id_session = ".api_get_session_id()." AND
session_id = ".api_get_session_id()." AND
c_id = $course_id AND
course_code = '".$course_code."' $orderby ";
session_rel_user_rel_course.c_id = '".$course_id."' $orderby ";
} else {
$sql = "SELECT DISTINCT user.user_id, user.lastname, user.firstname, thread_id
FROM $t_posts , $t_users user, $t_course_user course_user
@ -1931,7 +1931,7 @@ function get_thread_users_details($thread_id)
AND thread_id = ".intval($thread_id)."
AND course_user.status NOT IN('1') AND
c_id = $course_id AND
course_code = '".$course_code."' $orderby";
session_rel_user_rel_course.c_id = '".$course_id."' $orderby";
}
$result = Database::query($sql);
@ -1979,7 +1979,7 @@ function get_thread_users_qualify($thread_id)
AND session_rel_user_rel_course.id_user NOT IN ($user_to_avoid)
AND qualify.thread_id = '".Database::escape_string($thread_id)."'
AND post.thread_id = '".Database::escape_string($thread_id)."'
AND id_session = '".api_get_session_id()."'
AND session_id = '".api_get_session_id()."'
AND course_code = '".$course_code."' AND
qualify.c_id = $course_id AND
post.c_id = $course_id
@ -2058,7 +2058,7 @@ function get_thread_users_not_qualify($thread_id)
AND session_rel_user_rel_course.status<>'2'
AND session_rel_user_rel_course.id_user NOT IN ($user_to_avoid)
AND post.thread_id = '".Database::escape_string($thread_id)."'
AND id_session = '".api_get_session_id()."'
AND session_id = '".api_get_session_id()."'
AND course_code = '".$course_code."' AND post.c_id = $course_id $orderby ";
} else {
$sql = "SELECT DISTINCT user.user_id, user.lastname, user.firstname, post.thread_id
@ -3839,7 +3839,7 @@ function display_forum_search_results($search_term)
AND posts.thread_id = threads.thread_id
AND item_property.ref = threads.thread_id
AND item_property.visibility = 1
AND item_property.id_session = $session_id
AND item_property.session_id = $session_id
AND posts.visible = 1
AND item_property.tool = '".TOOL_FORUM_THREAD."'
AND ".implode(' AND ', $search_restriction)."

@ -962,8 +962,8 @@ class GradebookUtils
WHERE
scru.id_user=user.user_id AND
scru.status=0 AND
scru.course_code='$courseCode' AND
id_session ='$current_session'
scru.c_id='$courseId' AND
session_id ='$current_session'
$order_clause
";
} else {

@ -98,12 +98,12 @@ class Result
$sql_course_rel_user = '';
if ($sessionId) {
$sql = 'SELECT course_code, id_user as user_id, status
$sql = 'SELECT c_id, id_user as user_id, status
FROM ' . $tbl_session_rel_course_user . '
WHERE
status=0 AND
course_code="' . api_get_course_id() . '" AND
id_session=' . $sessionId;
c_id="' . api_get_course_int_id() . '" AND
session_id=' . $sessionId;
} else {
$sql = 'SELECT c_id, user_id, status
FROM ' . $tbl_course_rel_course . '

@ -126,7 +126,7 @@ class AnnouncementEmail
c_id = $course_id AND
tool = '$tool' AND
ref = $id AND
id_session = {$this->session_id} ";
session_id = {$this->session_id} ";
$rs = Database::query($sql);
while ($row = Database::fetch_array($rs, 'ASSOC')) {

@ -29,8 +29,8 @@ class AddCourseToSession
if (!empty($id_session)) {
$id_session = intval($id_session);
// check course_code from session_rel_course table
$sql = 'SELECT course_code FROM '.$tbl_session_rel_course.'
WHERE id_session = '.$id_session;
$sql = 'SELECT c_id FROM '.$tbl_session_rel_course.'
WHERE session_id = '.$id_session;
$res = Database::query($sql);
$course_codes = '';
if (Database::num_rows($res) > 0) {
@ -39,17 +39,17 @@ class AddCourseToSession
}
$course_codes = substr($course_codes,0,(strlen($course_codes)-1));
$cond_course_code = ' AND course.code NOT IN('.$course_codes.') ';
$cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
}
}
if ($type=='single') {
// search users where username or firstname or lastname begins likes $needle
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.id_session
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.session_id
FROM '.$tbl_course.' course
LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
ON course.code = session_rel_course.course_code
AND session_rel_course.id_session = '.intval($id_session).'
AND session_rel_course.session_id = '.intval($id_session).'
WHERE
course.visual_code LIKE "'.$needle.'%" OR
course.title LIKE "'.$needle.'%"';
@ -68,11 +68,11 @@ class AddCourseToSession
if ($access_url_id != -1){
if ($type=='single') {
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.id_session
$sql = 'SELECT course.code, course.visual_code, course.title, session_rel_course.session_id
FROM '.$tbl_course.' course
LEFT JOIN '.$tbl_session_rel_course.' session_rel_course
ON course.code = session_rel_course.course_code
AND session_rel_course.id_session = '.intval($id_session).'
AND session_rel_course.session_id = '.intval($id_session).'
INNER JOIN '.$tbl_course_rel_access_url.' url_course
ON (url_course.c_id = course.id)
WHERE

@ -1196,7 +1196,7 @@ class Agenda
ref = $eventId AND
ip.visibility = '1' AND
ip.c_id = $courseId AND
ip.id_session = $sessionId
ip.session_id = $sessionId
";
$result = Database::query($sql);
@ -1333,7 +1333,7 @@ class Agenda
agenda.c_id = $course_id AND
ip.c_id = $course_id AND
agenda.session_id = $session_id AND
ip.id_session = $session_id
ip.session_id = $session_id
";
}

@ -2389,7 +2389,7 @@ function api_get_coachs_from_course($session_id = 0, $courseId = '')
FROM $tbl_user u, $tbl_session_course_user scu
WHERE
u.user_id = scu.id_user AND
scu.id_session = '$session_id' AND
scu.session_id = '$session_id' AND
scu.c_id = '$courseId' AND
scu.status = 2";
$rs = Database::query($sql);
@ -2710,12 +2710,12 @@ function api_is_course_session_coach($user_id, $course_code, $session_id)
$sql = "SELECT DISTINCT id
FROM $session_table
INNER JOIN $session_rel_course_rel_user_table session_rc_ru
ON session.id = session_rc_ru.id_session
ON session.id = session_rc_ru.session_id
WHERE
session_rc_ru.id_user = '".$user_id."' AND
session_rc_ru.course_code = '$course_code' AND
session_rc_ru.status = 2 AND
session_rc_ru.id_session = '$session_id'";
session_rc_ru.session_id = '$session_id'";
$result = Database::query($sql);
return Database::num_rows($result) > 0;
}
@ -2756,11 +2756,11 @@ function api_is_coach($session_id = 0, $courseId = null, $check_student_view = t
$sql = "SELECT DISTINCT s.id, name, date_start, date_end
FROM $session_table s
INNER JOIN $session_rel_course_rel_user_table session_rc_ru
ON session_rc_ru.id_session = s.id AND session_rc_ru.id_user = '".$userId."'
ON session_rc_ru.session_id = s.id AND session_rc_ru.id_user = '".$userId."'
WHERE
session_rc_ru.c_id = '$courseId' AND
session_rc_ru.status = 2 AND
session_rc_ru.id_session = '$session_id'";
session_rc_ru.session_id = '$session_id'";
$result = Database::query($sql);
$sessionIsCoach = Database::store_result($result);
}
@ -3490,8 +3490,8 @@ function api_get_item_visibility($_course, $tool, $id, $session = 0)
c_id = $course_id AND
tool = '$tool' AND
ref = $id AND
(id_session = $session OR id_session = 0)
ORDER BY id_session DESC, lastedit_date DESC
(session_id = $session OR session_id = 0)
ORDER BY session_id DESC, lastedit_date DESC
LIMIT 1";
$res = Database::query($sql);
@ -3552,7 +3552,7 @@ function api_item_property_delete(
c_id = $courseId AND
tool = '$tool' AND
ref = $itemId AND
id_session = $sessionId
session_id = $sessionId
$userCondition
$groupCondition
";
@ -3644,7 +3644,7 @@ function api_item_property_update(
// Set filters for $to_user_id and $to_group_id, with priority for $to_user_id
$condition_session = '';
if (!empty($session_id)) {
$condition_session = " AND id_session = '$session_id' ";
$condition_session = " AND session_id = '$session_id' ";
}
$filter = " c_id = $course_id AND tool='$tool' AND ref='$item_id' $condition_session ";
@ -3680,12 +3680,12 @@ function api_item_property_update(
$visibility = '2';
if (!empty($session_id)) {
// Check whether session id already exist into itemp_properties for updating visibility or add it.
$sql = "SELECT id_session FROM $TABLE_ITEMPROPERTY
$sql = "SELECT session_id FROM $TABLE_ITEMPROPERTY
WHERE
c_id = $course_id AND
tool = '$tool' AND
ref='$item_id' AND
id_session = '$session_id'";
session_id = '$session_id'";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$sql = "UPDATE $TABLE_ITEMPROPERTY
@ -3693,10 +3693,10 @@ function api_item_property_update(
lastedit_date = '$time',
lastedit_user_id = '$user_id',
visibility = '$visibility',
id_session = '$session_id' $set_type
session_id = '$session_id' $set_type
WHERE $filter";
} else {
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, session_id)
VALUES ($course_id, '$tool','$item_id','$time', '$user_id', '$time', '$lastedit_type','$user_id', '$to_value', '$visibility', '$start_visible','$end_visible', '$session_id')";
}
} else {
@ -3713,12 +3713,12 @@ function api_item_property_update(
$visibility = '1';
if (!empty($session_id)) {
// Check whether session id already exist into item_properties for updating visibility or add it.
$sql = "SELECT id_session FROM $TABLE_ITEMPROPERTY
$sql = "SELECT session_id FROM $TABLE_ITEMPROPERTY
WHERE
c_id = $course_id AND
tool = '$tool' AND
ref = '$item_id' AND
id_session = '$session_id'";
session_id = '$session_id'";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$sql = "UPDATE $TABLE_ITEMPROPERTY
@ -3727,10 +3727,10 @@ function api_item_property_update(
lastedit_date='$time',
lastedit_user_id = '$user_id',
visibility='$visibility',
id_session = '$session_id' $set_type
session_id = '$session_id' $set_type
WHERE $filter";
} else {
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, session_id)
VALUES ($course_id, '$tool', '$item_id', '$time', '$user_id', '$time', '$lastedit_type', '$user_id', '$to_value', '$visibility', '$start_visible', '$end_visible', '$session_id')";
}
} else {
@ -3747,12 +3747,12 @@ function api_item_property_update(
$visibility = '0';
if (!empty($session_id)) {
// Check whether session id already exist into item_properties for updating visibility or add it
$sql = "SELECT id_session FROM $TABLE_ITEMPROPERTY
$sql = "SELECT session_id FROM $TABLE_ITEMPROPERTY
WHERE
c_id = $course_id AND
tool = '$tool' AND
ref='$item_id' AND
id_session = '$session_id'";
session_id = '$session_id'";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$sql = "UPDATE $TABLE_ITEMPROPERTY
@ -3761,10 +3761,10 @@ function api_item_property_update(
lastedit_date = '$time',
lastedit_user_id='$user_id',
visibility = '$visibility',
id_session = '$session_id' $set_type
session_id = '$session_id' $set_type
WHERE $filter";
} else {
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, id_session)
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool, ref, insert_date, insert_user_id, lastedit_date, lastedit_type, lastedit_user_id,$to_field, visibility, start_visible, end_visible, session_id)
VALUES ($course_id, '$tool', '$item_id', '$time', '$user_id', '$time', '$lastedit_type', '$user_id', '$to_value', '$visibility', '$start_visible', '$end_visible', '$session_id')";
}
} else {
@ -3790,7 +3790,7 @@ function api_item_property_update(
$result = Database::query($sql);
// Insert if no entries are found (can only happen in case of $lastedit_type switch is 'default').
if (Database::affected_rows($result) == 0) {
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type, lastedit_user_id, $to_field, visibility, start_visible, end_visible, id_session)
$sql = "INSERT INTO $TABLE_ITEMPROPERTY (c_id, tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type, lastedit_user_id, $to_field, visibility, start_visible, end_visible, session_id)
VALUES ($course_id, '$tool', '$item_id', '$time', '$user_id', '$time', '$lastedit_type', '$user_id', '$to_value', '$visibility', '$start_visible', '$end_visible', '$session_id')";
$res = Database::query($sql);
if (!$res) {
@ -3814,7 +3814,7 @@ function api_get_item_property_by_tool($tool, $course_code, $session_id = null)
// Definition of tables.
$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$session_id = intval($session_id);
$session_condition = ' AND id_session = '.$session_id;
$session_condition = ' AND session_id = '.$session_id;
$course_id = $course_info['real_id'];
$sql = "SELECT * FROM $item_property_table
@ -3853,7 +3853,7 @@ function api_get_item_property_list_by_tool_by_user(
// Definition of tables.
$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$session_condition = ' AND id_session = '.$session_id;
$session_condition = ' AND session_id = '.$session_id;
$sql = "SELECT * FROM $item_property_table
WHERE
insert_user_id = $userId AND
@ -3978,7 +3978,7 @@ function api_get_item_property_info($course_id, $tool, $ref, $session_id = 0)
c_id = $course_id AND
tool = '$tool' AND
ref = $ref AND
id_session = $session_id ";
session_id = $session_id ";
$rs = Database::query($sql);
$row = array();
@ -5440,7 +5440,7 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
FROM
$tbl_session as session
INNER JOIN $tbl_session_course
ON session_rel_course.id_session = session.id
ON session_rel_course.session_id = session.id
AND session_rel_course.course_code = '$cid'
LIMIT 1";

@ -445,7 +445,7 @@ class CourseManager
// Delete in table session_rel_course_rel_user
$sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
WHERE id_session ='" . $session_id . "' AND
WHERE session_id ='" . $session_id . "' AND
c_id = '" . $course_id . "' AND
id_user IN ($user_ids)";
Database::query($sql);
@ -453,7 +453,7 @@ class CourseManager
foreach ($user_list as $uid) {
// check if a user is register in the session with other course
$sql = "SELECT id_user FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
WHERE id_session='$session_id' AND id_user='$uid'";
WHERE session_id='$session_id' AND id_user='$uid'";
$rs = Database::query($sql);
if (Database::num_rows($rs) == 0) {
@ -486,7 +486,7 @@ class CourseManager
// number of users by session and course
$sql = "UPDATE " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE) . "
SET nbr_users = '$count'
WHERE id_session = '$session_id' AND c_id = '$course_id'";
WHERE session_id = '$session_id' AND c_id = '$course_id'";
Database::query($sql);
} else {
@ -1162,7 +1162,7 @@ class CourseManager
// A user?
if (Database::num_rows(Database::query("SELECT id_user
FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
WHERE id_session='" . $session_id . "'
WHERE session_id='" . $session_id . "'
AND id_user='$user_id'"))
) {
return true;
@ -1171,7 +1171,7 @@ class CourseManager
// A course coach?
if (Database::num_rows(Database::query("SELECT id_user
FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
WHERE id_session='" . $session_id . "'
WHERE session_id='" . $session_id . "'
AND id_user = '$user_id' AND status = 2
AND course_code='$course_code'"))
) {
@ -1260,7 +1260,7 @@ class CourseManager
$sql = 'SELECT DISTINCT
user.user_id,
session_course_user.status as status_session,
id_session,
session_id,
user.*,
course.*,
session.name as session_name
@ -1269,10 +1269,10 @@ class CourseManager
$sql = " SELECT COUNT(user.user_id) as count";
}
$sessionCondition = " session_course_user.id_session = $session_id";
$sessionCondition = " session_course_user.session_id = $session_id";
if (!empty($sessionIdList)) {
$sessionIdListTostring = implode("','", array_map('intval', $sessionIdList));
$sessionCondition = " session_course_user.id_session IN ('$sessionIdListTostring') ";
$sessionCondition = " session_course_user.session_id IN ('$sessionIdListTostring') ";
}
$courseCondition = " course.code = '".$course_code."' AND ";
@ -1289,7 +1289,7 @@ class CourseManager
$courseCondition
$sessionCondition
INNER JOIN $course_table course ON session_course_user.c_id = course.id
INNER JOIN $sessionTable session ON session_course_user.id_session = session.id
INNER JOIN $sessionTable session ON session_course_user.session_id = session.id
";
$where[] = ' session_course_user.c_id IS NOT NULL ';
@ -1429,7 +1429,7 @@ class CourseManager
$user_info['status_session'] = $user['status_session'];
}
$sessionId = isset($user['id_session']) ? $user['id_session'] : 0;
$sessionId = isset($user['session_id']) ? $user['session_id'] : 0;
$course_code = isset($user['code']) ? $user['code'] : null;
if ($add_reports) {
@ -1623,7 +1623,7 @@ class CourseManager
$sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . ' as session_course_user
ON user.user_id = session_course_user.id_user
AND session_course_user.c_id = "' . $courseId . '"
AND session_course_user.id_session = ' . $session_id;
AND session_course_user.session_id = ' . $session_id;
$where[] = ' session_course_user.c_id IS NOT NULL ';
} else {
@ -1677,7 +1677,7 @@ class CourseManager
// We get the coach for the given course in a given session.
$sql = 'SELECT id_user FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
' WHERE id_session="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
$rs = Database::query($sql);
while ($user = Database::fetch_array($rs)) {
$user_info = api_get_user_info($user['id_user']);
@ -1771,7 +1771,7 @@ class CourseManager
}
if ($session_id != 0) {
$sql_query .= ' AND scu.id_session = ' . $session_id;
$sql_query .= ' AND scu.session_id = ' . $session_id;
}
if (!$includeInvitedUsers) {
@ -1888,7 +1888,7 @@ class CourseManager
FROM $tbl_user u, $tbl_session_course_user scu
WHERE
u.user_id = scu.id_user AND
scu.id_session = '$session_id' AND
scu.session_id = '$session_id' AND
scu.c_id = '$courseId' AND
scu.status = 2";
$rs = Database::query($sql);
@ -2573,14 +2573,14 @@ class CourseManager
if (!empty($with_special_courses)) {
$sql = "SELECT DISTINCT(course.code), course.id as real_id
FROM " . $tbl_course_user . " course_rel_user
LEFT JOIN " . $tbl_course . " course
ON course.id = course_rel_user.c_id
LEFT JOIN " . $tbl_user_course_category . " user_course_category
ON course_rel_user.user_course_cat = user_course_category.id
WHERE $with_special_courses
GROUP BY course.code
ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
FROM " . $tbl_course_user . " course_rel_user
LEFT JOIN " . $tbl_course . " course
ON course.id = course_rel_user.c_id
LEFT JOIN " . $tbl_user_course_category . " user_course_category
ON course_rel_user.user_course_cat = user_course_category.id
WHERE $with_special_courses
GROUP BY course.code
ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC";
$rs_special_course = Database::query($sql);
if (Database::num_rows($rs_special_course) > 0) {
while ($result_row = Database::fetch_array($rs_special_course)) {
@ -2700,7 +2700,7 @@ class CourseManager
$sql = "SELECT id_user
FROM $tbl_session_course_user
WHERE
id_session = '$session_id' AND
session_id = '$session_id' AND
c_id = '$courseId' AND
status = 2
";
@ -3284,7 +3284,7 @@ class CourseManager
$tableSessionRelCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$orderBy = ' ORDER BY position';
$extraInnerJoin = " INNER JOIN $tableSessionRelCourse src
ON (c.code = src.course_code AND id_session = $sessionId) ";
ON (c.code = src.course_code AND session_id = $sessionId) ";
}
}

@ -1358,7 +1358,7 @@ class Display
// Special hack for work tool, which is called student_publication in c_tool and work in c_item_property :-/ BT#7104
" AND (ctt.name = tet.tool OR (ctt.name = 'student_publication' AND tet.tool = 'work')) ".
" AND ctt.visibility = '1' ".
" AND tet.lastedit_user_id != $user_id AND tet.id_session = '".$course_info['id_session']."'
" AND tet.lastedit_user_id != $user_id AND tet.session_id = '".$course_info['id_session']."'
ORDER BY tet.lastedit_date";
$res = Database::query($sql);

@ -565,7 +565,7 @@ class DocumentManager
docs.size,
docs.readonly,
docs.session_id,
last.id_session item_property_session_id,
last.session_id item_property_session_id,
last.lastedit_date,
last.visibility,
last.insert_user_id
@ -2924,7 +2924,7 @@ class DocumentManager
if (isset($session_id)) {
$session_id = intval($session_id);
$session_condition = " AND props.id_session='" . $session_id . "' ";
$session_condition = " AND props.session_id='" . $session_id . "' ";
}
$sql = "SELECT SUM(size)

@ -196,7 +196,7 @@ function get_total_folder_size($path, $can_see_invisible = false)
$session_id,
true,
true,
'props.id_session'
'props.session_id'
);
$visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');

@ -560,10 +560,10 @@ class Login
//Session coach, session admin, course coach admin
$sql = "SELECT session.id_coach, session_admin_id, session_rcru.id_user
FROM $tbl_session session, $tbl_session_course_user session_rcru
WHERE session_rcru.id_session = session.id AND
WHERE session_rcru.session_id = session.id AND
session_rcru.course_code = '$_cid' AND
session_rcru.id_user = '$user_id' AND
session_rcru.id_session = $session_id AND
session_rcru.session_id = $session_id AND
session_rcru.status = 2";
$result = Database::query($sql);

@ -1591,7 +1591,7 @@ class MySpace
$sql = "SELECT * FROM $tbl_course AS c
INNER JOIN $tbl_session_rel_course AS sc
ON sc.course_code = c.code
WHERE sc.id_session = '".$session_id."';";
WHERE sc.session_id = '".$session_id."';";
$result = Database::query($sql);
while ($row = Database::fetch_object($result)) {
$courseCode = $row->code;
@ -1605,7 +1605,7 @@ class MySpace
FROM $tbl_user AS u
INNER JOIN $tbl_session_rel_course_rel_user AS scu
ON u.user_id = scu.id_user
WHERE scu.id_session = '".$session_id."' AND scu.course_code = '".$courseCode."';";
WHERE scu.session_id = '".$session_id."' AND scu.course_code = '".$courseCode."';";
$result_users = Database::query($sql);
$time_spent = 0;
$progress = 0;
@ -1751,7 +1751,7 @@ class MySpace
$sql = "SELECT * FROM $tbl_course AS c
INNER JOIN $tbl_session_rel_course AS sc
ON sc.course_code = c.code
WHERE sc.id_session = '".$session_id."';";
WHERE sc.session_id = '".$session_id."';";
$result = Database::query($sql);
while ($row = Database::fetch_object($result)) {
$courseInfo = api_get_course_info($row->code);
@ -1763,7 +1763,7 @@ class MySpace
$sql = "SELECT user_id FROM $tbl_user AS u
INNER JOIN $tbl_session_rel_course_rel_user AS scu
ON u.user_id = scu.id_user
WHERE scu.id_session = '".$session_id."' AND scu.course_code = '".$row->code."';";
WHERE scu.session_id = '".$session_id."' AND scu.course_code = '".$row->code."';";
$result_users = Database::query($sql);
$time_spent = 0;
$progress = 0;
@ -2305,7 +2305,7 @@ class MySpace
$sql_select = " SELECT u.user_id FROM $tbl_session_rel_course_rel_user rel INNER JOIN $table_user u
ON (rel.id_user=u.user_id)
WHERE
rel.id_session='$id_session' AND
rel.session_id='$id_session' AND
u.status='5' AND
u.username ='$username' AND
rel.course_code='$enreg_course'";

@ -285,7 +285,7 @@ class SessionManager
";
$extraJoin = " INNER JOIN $tbl_session_rel_user sru
ON sru.id_session = s.id ";
ON sru.session_id = s.id ";
}
$today = api_get_utc_datetime();
@ -314,7 +314,7 @@ class SessionManager
if (strpos($where_condition, 'c.id')) {
$table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tableCourse = Database::get_main_table(TABLE_MAIN_COURSE);
$courseCondition = " INNER JOIN $table course_rel_session ON (s.id = course_rel_session.id_session)
$courseCondition = " INNER JOIN $table course_rel_session ON (s.id = course_rel_session.session_id)
INNER JOIN $tableCourse c ON (course_rel_session.c_id = c.id)
";
}
@ -401,7 +401,7 @@ class SessionManager
";
$extraJoin = " INNER JOIN $tbl_session_rel_user sru
ON sru.id_session = s.id ";
ON sru.session_id = s.id ";
}
if (api_is_allowed_to_edit() && !api_is_platform_admin()) {
@ -436,7 +436,7 @@ class SessionManager
if (strpos($options['where'], 'c.id')) {
$table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tableCourse = Database::get_main_table(TABLE_MAIN_COURSE);
$courseCondition = " INNER JOIN $table course_rel_session ON (s.id = course_rel_session.id_session)
$courseCondition = " INNER JOIN $table course_rel_session ON (s.id = course_rel_session.session_id)
INNER JOIN $tableCourse c ON (course_rel_session.c_id = c.id)
";
}
@ -871,7 +871,7 @@ class SessionManager
$queryVariables[] = $sessionId;
$sql = "SELECT
u.user_id, u.lastname, u.firstname, u.username,
u.email, s.c_id, s.id_session
u.email, s.c_id, s.session_id
FROM $session_course_user s
INNER JOIN $user u
ON u.user_id = s.id_user
@ -879,7 +879,7 @@ class SessionManager
} else {
$sql = "SELECT
u.user_id, u.lastname, u.firstname, u.username,
u.email, s.c_id, s.id_session
u.email, s.c_id, s.session_id
FROM $session_course_user s
INNER JOIN $user u ON u.user_id = s.id_user
$where $order $limit";
@ -2520,7 +2520,7 @@ class SessionManager
INNER JOIN $user_table u ON s.id_coach = u.user_id
INNER JOIN $table_access_url_rel_session ar ON ar.session_id = s.id
LEFT JOIN $session_category_table sc ON s.session_category_id = sc.id
LEFT JOIN $session_course_table sco ON (sco.id_session = s.id)
LEFT JOIN $session_course_table sco ON (sco.session_id = s.id)
INNER JOIN $course_table c ON sco.c_id = c.id
WHERE ar.access_url_id = $access_url_id ";
@ -2753,7 +2753,7 @@ class SessionManager
if (api_is_multiple_url_enabled()) {
$sql = "SELECT id_session
FROM $tbl_session_rel_user s
INNER JOIN $tbl_session_rel_access_url a ON (a.session_id = s.id_session)
INNER JOIN $tbl_session_rel_access_url a ON (a.session_id = s.session_id)
WHERE
id_user = $userId AND
relation_type=" . SESSION_RELATION_TYPE_RRHH . " AND
@ -2816,11 +2816,11 @@ class SessionManager
$select = " SELECT * ";
if (api_is_multiple_url_enabled()) {
$sql = " $select FROM $tbl_session s
INNER JOIN $tbl_session_rel_user sru ON (sru.id_session = s.id)
INNER JOIN $tbl_session_rel_user sru ON (sru.session_id = s.id)
LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE
sru.id_user = '$userId' AND
sru.id_session = '$sessionId' AND
sru.session_id = '$sessionId' AND
sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "' AND
access_url_id = " . api_get_current_access_url_id() . "
";
@ -2828,9 +2828,9 @@ class SessionManager
$sql = "$select FROM $tbl_session s
INNER JOIN $tbl_session_rel_user sru
ON
sru.id_session = s.id AND
sru.session_id = s.id AND
sru.id_user = '$userId' AND
sru.id_session = '$sessionId' AND
sru.session_id = '$sessionId' AND
sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'
";
}
@ -2941,7 +2941,7 @@ class SessionManager
switch ($status) {
case DRH:
$sessionQuery = "SELECT sru.id_session
$sessionQuery = "SELECT sru.session_id
FROM
$tbl_session_rel_user sru
WHERE
@ -2950,14 +2950,14 @@ class SessionManager
break;
case COURSEMANAGER:
$courseSessionQuery = "
SELECT scu.id_session as id
SELECT scu.session_id as id
FROM $tbl_session_rel_course_rel_user scu
WHERE (scu.status = 2 AND scu.id_user = $userId)";
$whereConditions = " OR (s.id_coach = $userId) ";
break;
default:
$sessionQuery = "SELECT sru.id_session
$sessionQuery = "SELECT sru.session_id
FROM
$tbl_session_rel_user sru
WHERE
@ -3040,7 +3040,7 @@ class SessionManager
$sql = "SELECT *, c.id as real_id FROM $tbl_course c
INNER JOIN $tbl_session_rel_course src
ON c.id = src.c_id
WHERE src.id_session = '$session_id' ";
WHERE src.session_id = '$session_id' ";
if (!empty($course_name)) {
$course_name = Database::escape_string($course_name);
@ -3132,7 +3132,7 @@ class SessionManager
INNER JOIN $tbl_session_rel_course src
ON c.id = src.c_id
WHERE
src.id_session IN ($sessionsSQL)
src.session_id IN ($sessionsSQL)
$keywordCondition
";
if ($getCount) {
@ -3178,7 +3178,7 @@ class SessionManager
$sql = "SELECT * FROM $tbl_course c
INNER JOIN $tbl_session_rel_course src
ON c.id = src.c_id
WHERE src.id_session LIKE '$session_id'";
WHERE src.session_id LIKE '$session_id'";
if (!empty($course_name)) {
$sql .= " AND UPPER(c.title) LIKE UPPER('%$course_name%') ";
}
@ -3213,7 +3213,7 @@ class SessionManager
FROM $tbl_course c
INNER JOIN $tbl_session_rel_course src
ON c.id = src.c_id
WHERE src.id_session = '$session_id' ";
WHERE src.session_id = '$session_id' ";
$keywordCondition = null;
if (!empty($keyword)) {
@ -3287,7 +3287,7 @@ class SessionManager
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON u.user_id = $tbl_session_rel_user.id_user AND
$tbl_session_rel_user.id_session = $id
$tbl_session_rel_user.session_id = $id
LEFT OUTER JOIN $table_access_url_user uu
ON (uu.user_id = u.user_id)
";
@ -3368,7 +3368,7 @@ class SessionManager
FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE
session_rcru.id_user = user.user_id AND
session_rcru.id_session = '" . intval($session_id) . "' AND
session_rcru.session_id = '" . intval($session_id) . "' AND
session_rcru.c_id ='" . intval($courseId) . "' AND
user.user_id = " . intval($user_id);
@ -3400,7 +3400,7 @@ class SessionManager
$sql = "SELECT session_rcru.status
FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE session_rcru.id_user = user.user_id AND
session_rcru.id_session = '" . intval($session_id) . "' AND
session_rcru.session_id = '" . intval($session_id) . "' AND
session_rcru.c_id ='" . intval($courseId) . "' AND
user.user_id = " . intval($user_id);
$result = Database::query($sql);
@ -3673,7 +3673,7 @@ class SessionManager
$courseId = intval($courseId);
$sql = "SELECT name, s.id
FROM $table_session_course sc
INNER JOIN $table_session s ON (sc.id_session = s.id)
INNER JOIN $table_session s ON (sc.session_id = s.id)
WHERE sc.c_id = '$courseId' ";
$result = Database::query($sql);
@ -4599,8 +4599,8 @@ class SessionManager
$sql = "$masterSelect (
($select
FROM $tbl_session s
INNER JOIN $tbl_session_rel_course_rel_user su ON (s.id = su.id_session)
INNER JOIN $tbl_user u ON (u.user_id = su.id_user AND s.id = id_session)
INNER JOIN $tbl_session_rel_course_rel_user su ON (s.id = su.session_id)
INNER JOIN $tbl_user u ON (u.user_id = su.user_id)
INNER JOIN $tbl_session_rel_access_url url ON (url.session_id = s.id)
$where
$sessionConditions
@ -4887,7 +4887,7 @@ class SessionManager
$sql = "SELECT DISTINCT(cu.user_id) FROM $course c
INNER JOIN $sessionCourse src ON c.id = src.c_id
INNER JOIN $courseUser cu ON (cu.c_id = c.id)
WHERE src.id_session IN ('$sessionToString') AND cu.status = 1";
WHERE src.session_id IN ('$sessionToString') AND cu.status = 1";
$result = Database::query($sql);
$teacherListId = array();
while($row = Database::fetch_array($result, 'ASSOC')) {
@ -5473,7 +5473,7 @@ class SessionManager
FROM $courseTable c
INNER JOIN $sessionRelCourseTable src
ON c.id = src.c_id
WHERE src.id_session = $sessionId
WHERE src.session_id = $sessionId
AND c.code = '$courseCode' ";
$result = Database::query($sql);
@ -5592,7 +5592,7 @@ class SessionManager
$sql = "SELECT COUNT(1) as count, u.user_id, scu.status status_in_session, u.status user_status "
. "FROM session_rel_course_rel_user scu "
. "INNER JOIN user u ON scu.id_user = u.user_id "
. "WHERE scu.id_session = " . intval($sessionId) . " "
. "WHERE scu.session_id = " . intval($sessionId) . " "
. "GROUP BY u.user_id";
$result = Database::query($sql);
@ -5796,7 +5796,7 @@ class SessionManager
}
// Query used to find course-coaches from sessions
$sql = "SELECT
scu.id_session AS session_id,
scu.session_id,
c.id AS course_id,
c.code AS course_code,
c.title AS course_title,
@ -5806,8 +5806,8 @@ class SessionManager
FROM $courseTable c
INNER JOIN $sessionCourseUserTable scu ON c.id = scu.c_id
INNER JOIN $userTable u ON scu.id_user = u.user_id
WHERE scu.status = 2 AND scu.id_session IN $sessionIdsString
ORDER BY scu.id_session ASC ";
WHERE scu.status = 2 AND scu.session_id IN $sessionIdsString
ORDER BY scu.session_id ASC ";
$res = Database::query($sql);
$sessionCourseList = Database::store_result($res, 'ASSOC');
// Check if course list had result

@ -1872,14 +1872,14 @@ class Tracking
$courseId = intval($courseId);
//get teachers
$sql = "SELECT scu.id_session, scu.id_user, s.name
$sql = "SELECT scu.session_id, scu.id_user, s.name
FROM session_rel_course_rel_user scu, session s
WHERE
scu.id_session = s.id
scu.session_id = s.id
AND scu.status = 2
AND scu.visibility = 1
AND scu.c_id = '%s'
AND scu.id_session = %s";
AND scu.session_id = %s";
$query = sprintf($sql, intval($courseId), $sessionId);
$rs = Database::query($query);
$teachers = array();
@ -2668,10 +2668,10 @@ class Tracking
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = 'SELECT scu.id_session, scu.c_id
$sql = 'SELECT scu.session_id, scu.c_id
FROM ' . $tbl_session_course_user . ' scu
INNER JOIN '.$tbl_session_rel_access_url.' sru
ON (scu.id_session=sru.session_id)
ON (scu.session_id=sru.session_id)
WHERE
scu.id_user=' . $coach_id.' AND
scu.status=2 AND
@ -2690,9 +2690,9 @@ class Tracking
WHERE
srcru.id_user = sru.id_user AND
sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
srcru.id_session = sru.id_session AND
srcru.session_id = sru.session_id AND
srcru.c_id = '$courseId' AND
srcru.id_session='$id_session'";
srcru.session_id='$id_session'";
$rs = Database::query($sql);
@ -2702,16 +2702,15 @@ class Tracking
}
// Then, courses where $coach_id is coach of the session //
$sql = 'SELECT session_course_user.id_user
$sql = 'SELECT session_course_user.user_id
FROM ' . $tbl_session_course_user . ' as session_course_user
INNER JOIN '.$tbl_session_user.' sru
ON session_course_user.id_user = sru.id_user AND session_course_user.id_session = sru.id_session
ON session_course_user.id_user = sru.id_user AND session_course_user.session_id = sru.session_id
INNER JOIN ' . $tbl_session_course . ' as session_course
ON session_course.c_id = session_course_user.c_id
AND session_course_user.id_session = session_course.id_session
AND session_course_user.session_id = session_course.session_id
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session
ON session.id = session_course.session_id
AND session.id_coach = ' . $coach_id;
if (api_is_multiple_url_enabled()) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@ -2721,12 +2720,12 @@ class Tracking
FROM ' . $tbl_session_course_user . ' as session_course_user
INNER JOIN '.$tbl_session_user.' sru
ON session_course_user.id_user = sru.id_user AND
session_course_user.id_session = sru.id_session
session_course_user.session_id = sru.session_id
INNER JOIN ' . $tbl_session_course . ' as session_course
ON session_course.c_id = session_course_user.c_id AND
session_course_user.id_session = session_course.id_session
session_course_user.session_id = session_course.session_id
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session AND
ON session.id = session_course.session_id AND
session.id_coach = ' . $coach_id.'
INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url
ON session.id = session_rel_url.session_id WHERE access_url_id = '.$access_url_id;
@ -2820,7 +2819,7 @@ class Tracking
INNER JOIN ' . $tbl_session_course . ' as session_course
ON session_course.c_id = session_course_user.c_id
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session
ON session.id = session_course.session_id
AND session.id_coach = ' . $coach_id . '
WHERE id_user = ' . $student_id;
$result = Database::query($sql);
@ -2887,7 +2886,7 @@ class Tracking
$sql = 'SELECT DISTINCT course.code
FROM ' . $tbl_session_course . ' as session_course
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session
ON session.id = session_course.session_id
AND session.id_coach = ' . $coach_id . '
INNER JOIN ' . $tbl_course . ' as course
ON course.id = session_course.c_id';
@ -2901,7 +2900,7 @@ class Tracking
INNER JOIN '.$tbl_course.' c
ON (c.id = session_course.c_id)
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session
ON session.id = session_course.session_id
AND session.id_coach = ' . $coach_id . '
INNER JOIN ' . $tbl_course . ' as course
ON course.id = session_course.c_id
@ -2911,7 +2910,7 @@ class Tracking
}
if (!empty ($id_session)) {
$sql .= ' WHERE session_course.id_session=' . $id_session;
$sql .= ' WHERE session_course.session_id=' . $id_session;
if (api_is_multiple_url_enabled())
$sql .= ' AND access_url_id = '.$access_url_id;
} else {
@ -2989,7 +2988,7 @@ class Tracking
SELECT DISTINCT session.id, session.name, session.date_start, session.date_end
FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as session_course_user
ON session.id = session_course_user.id_session AND
ON session.id = session_course_user.session_id AND
session_course_user.id_user= $coach_id AND
session_course_user.status=2
INNER JOIN $tbl_session_rel_access_url session_rel_url
@ -3495,8 +3494,8 @@ class Tracking
if ($session_id != 0) {
$inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user
ON c.id = session_course_user.c_id
AND session_course_user.id_session = '.intval($session_id).'
AND session_course_user.id_user = stats_login.user_id ';
AND session_course_user.session_id = '.intval($session_id).'
AND session_course_user.user_id = stats_login.user_id ';
}
$sql = 'SELECT user_id, MAX(login_course_date) max_date
FROM '.$tbl_track_login.' stats_login '.$inner.'
@ -3991,7 +3990,7 @@ class Tracking
$orderBy = " ORDER BY s.id, position ";
$tableSessionRelCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$extraInnerJoin = " INNER JOIN $tableSessionRelCourse src
ON (cu.c_id = src.c_id AND src.id_session = $session_id) ";
ON (cu.c_id = src.c_id AND src.session_id = $session_id) ";
}
// Get the list of sessions where the user is subscribed as student
@ -3999,7 +3998,7 @@ class Tracking
$sql = "SELECT DISTINCT c.code, s.id as session_id, name
FROM $tbl_session_course_user cu
INNER JOIN $tbl_access_rel_session a
ON (a.session_id = cu.id_session)
ON (a.session_id = cu.session_id)
INNER JOIN $tbl_session s
ON (s.id = a.session_id)
INNER JOIN $tbl_course c
@ -4013,7 +4012,7 @@ class Tracking
$sql = "SELECT DISTINCT c.code, s.id as session_id, name
FROM $tbl_session_course_user cu
INNER JOIN $tbl_session s
ON (s.id = cu.id_session)
ON (s.id = cu.session_id)
INNER JOIN $tbl_course c
ON (c.id = cu.c_id)
$extraInnerJoin

@ -2502,7 +2502,7 @@ class UserManager
LEFT JOIN $tbl_session_category session_category
ON (session_category_id = session_category.id)
LEFT JOIN $tbl_session_course_user as session_rel_course_user
ON (session_rel_course_user.id_session = session.id)
ON (session_rel_course_user.session_id = session.id)
WHERE (
session_rel_course_user.id_user = $user_id OR
session.id_coach = $user_id
@ -2754,18 +2754,18 @@ class UserManager
category_code user_course_cat,
date_start,
date_end,
session.id as id_session,
session.id as session_id,
session.name as session_name
FROM $tbl_session_course_user as session_course_user
INNER JOIN $tbl_course AS course
ON course.code = session_course_user.course_code
ON course.id = session_course_user.c_id
INNER JOIN $tbl_session as session
ON session.id = session_course_user.id_session
ON session.id = session_course_user.session_id
LEFT JOIN $tbl_user as user
ON user.user_id = session_course_user.id_user OR session.id_coach = user.user_id
WHERE
session_course_user.id_session = $id_session AND (
(session_course_user.id_user = $user_id AND session_course_user.status = 2)
session_course_user.session_id = $id_session AND (
(session_course_user.user_id = $user_id AND session_course_user.status = 2)
OR session.id_coach = $user_id
)
ORDER BY i";
@ -2773,7 +2773,7 @@ class UserManager
while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) {
$result_row['course_info'] = api_get_course_info($result_row['code']);
$key = $result_row['id_session'].' - '.$result_row['code'];
$key = $result_row['session_id'].' - '.$result_row['code'];
$personal_course_list[$key] = $result_row;
}
}
@ -2797,13 +2797,13 @@ class UserManager
category_code user_course_cat,
date_start,
date_end,
session.id as id_session,
session.id as session_id,
session.name as session_name,
IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5')
FROM $tbl_session_course_user as session_course_user
INNER JOIN $tbl_course AS course
ON course.code = session_course_user.course_code AND session_course_user.id_session = $session_id
INNER JOIN $tbl_session as session ON session_course_user.id_session = session.id
ON course.id = session_course_user.c_id AND session_course_user.session_id = $session_id
INNER JOIN $tbl_session as session ON session_course_user.session_id = session.id
LEFT JOIN $tbl_user as user ON user.user_id = session_course_user.id_user
WHERE session_course_user.id_user = $user_id
ORDER BY i";
@ -2812,7 +2812,7 @@ class UserManager
while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) {
$result_row['course_info'] = api_get_course_info($result_row['code']);
$key = $result_row['id_session'].' - '.$result_row['code'];
$key = $result_row['session_id'].' - '.$result_row['code'];
if (!isset($personal_course_list[$key])) {
$personal_course_list[$key] = $result_row;
}
@ -2861,13 +2861,13 @@ class UserManager
c.visibility, c.id as real_id
FROM $tbl_session_course_user as scu
INNER JOIN $tbl_session_course sc
ON (scu.id_session = sc.id_session AND scu.c_id = sc.c_id)
ON (scu.session_id = sc.session_id AND scu.c_id = sc.c_id)
INNER JOIN $tableCourse as c
ON (scu.c_id = c.id)
$join_access_url
WHERE
scu.id_user = $user_id AND
scu.id_session = $session_id
scu.user_id = $user_id AND
scu.session_id = $session_id
$where_access_url
ORDER BY sc.position ASC";
@ -2888,9 +2888,9 @@ class UserManager
c.visibility, c.id as real_id
FROM $tbl_session_course_user as scu
INNER JOIN $tbl_session as s
ON (scu.id_session = s.id)
ON (scu.session_id = s.id)
INNER JOIN $tbl_session_course sc
ON (scu.id_session = sc.id_session AND scu.c_id = sc.c_id)
ON (scu.session_id = sc.session_id AND scu.c_id = sc.c_id)
INNER JOIN $tableCourse as c
ON (scu.c_id = c.id)
$join_access_url
@ -4317,7 +4317,7 @@ class UserManager
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user sru ON (sru.id_user = u.user_id)
WHERE
sru.id_session IN (
sru.session_id IN (
SELECT DISTINCT(s.id) FROM $tbl_session s INNER JOIN
$tbl_session_rel_access_url
WHERE access_url_id = ".api_get_current_access_url_id()."
@ -4327,7 +4327,7 @@ class UserManager
INNER JOIN $tbl_session_rel_access_url url
ON (url.session_id = s.id)
INNER JOIN $tbl_session_rel_course_rel_user scu
ON (scu.id_session = s.id)
ON (scu.session_id = s.id)
WHERE access_url_id = ".api_get_current_access_url_id()."
$sessionConditionsTeacher
)

@ -1062,10 +1062,10 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
// Session coach, session admin or course coach admin
$sql = "SELECT session.id_coach, session_admin_id, session_rcru.id_user
FROM $tbl_session session, $tbl_session_course_user session_rcru
WHERE session_rcru.id_session = session.id AND
session_rcru.course_code = '$_cid' AND
WHERE session_rcru.session_id = session.id AND
session_rcru.c_id = '$_cid' AND
session_rcru.id_user = '$user_id' AND
session_rcru.id_session = $session_id AND
session_rcru.session_id = $session_id AND
session_rcru.status = 2
";
@ -1084,7 +1084,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
// Am I a session coach for this session?
$sql = "SELECT id, id_coach FROM $tbl_session session ".
"INNER JOIN $tbl_session_course sc ".
"ON sc.id_session = session.id ".
"ON sc.session_id = session.id ".
"WHERE session.id = $session_id ".
"AND session.id_coach = $user_id ".
"AND sc.course_code = '$_cid'";
@ -1102,7 +1102,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
"FROM $tbl_session_course_user cu ".
"WHERE course_code = '$_cid' AND ".
" cu.id_user = '".$user_id."' AND ".
" cu.id_session = '".$session_id."' ".
" cu.session_id = '".$session_id."' ".
"LIMIT 1";
$result = Database::query($sql);

@ -48,7 +48,7 @@ if (!empty($_GET['session'])) {
FROM $tbl_course as course
INNER JOIN $tbl_session_course AS rel_course
ON course.code = rel_course.course_code
AND rel_course.id_session = ".$session['id']."
AND rel_course.session_id = ".$session['id']."
ORDER BY title ASC";
$result_course = Database::query($sql_course);

@ -270,8 +270,9 @@ if ($ajax_search) {
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id
AND $tbl_session_rel_user.id_session = " . intval($id_session) . "
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
AND $tbl_session_rel_user.session_id = " . intval($id_session) . "
INNER JOIN $tbl_user_rel_access_url url_user
ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id
$order_clause";
}

@ -72,7 +72,7 @@ $now = api_get_utc_datetime();
$sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session
ON session_course_user.id_session = session.id
ON session_course_user.session_id = session.id
AND ((date_start <= '$now'
AND date_end >= '$now')
OR (date_start='0000-00-00' AND date_end='0000-00-00'))

@ -67,7 +67,7 @@ $now = api_get_utc_datetime();
$sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session
ON session_course_user.id_session = session.id
ON session_course_user.session_id = session.id
AND ((date_start <= '$now'
AND date_end >= '$now')
OR (date_start='0000-00-00' AND date_end='0000-00-00'))

@ -32,20 +32,20 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
// setting the name of the tool
$tool_name = get_lang('SubscribeUsersToSession');
$add_type = 'unique';
if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
$add_type = Security::remove_XSS($_REQUEST['add_type']);
}
$page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
//checking for extra field with filter on
$extra_field_list= UserManager::get_extra_fields();
$new_field_list = array();
if (is_array($extra_field_list)) {
@ -56,35 +56,35 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
function search_users($needle, $type)
{
{
global $tbl_user,$tbl_session_rel_user,$id_session;
$xajax_response = new xajaxResponse();
$return = '';
if (!empty($needle) && !empty($type)) {
//normal behaviour
if ($type == 'any_session' && $needle == 'false') {
$type = 'multiple';
$needle = '';
}
// xajax send utf8 datas... datas in db can be non-utf8 datas
$charset = api_get_system_encoding();
$needle = Database::escape_string($needle);
$needle = api_convert_encoding($needle, $charset, 'utf-8');
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$cond_user_id = '';
//Only for single & multiple
if (in_array($type, array('single','multiple'))) {
if (!empty($id_session)) {
$id_session = intval($id_session);
// check id_user from session_rel_user table
$sql = 'SELECT id_user FROM '.$tbl_session_rel_user.' WHERE id_session ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
$sql = 'SELECT id_user FROM '.$tbl_session_rel_user.' WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
$res = Database::query($sql);
$user_ids = array();
if (Database::num_rows($res) > 0) {
@ -97,7 +97,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
switch ($type) {
case 'single':
// search users where username or firstname or lastname begins likes $needle
@ -152,7 +152,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
$rs = Database::query($sql);
$i=0;
if ($type == 'single') {
@ -165,7 +165,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
$return .= '...<br />';
}
}
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
} else {
global $nosessionUsersList;
@ -180,18 +180,18 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
return $xajax_response;
}
$xajax -> processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = '
<script type="text/javascript">
function add_user_to_session (code, content) {
document.getElementById("user_to_add").value = "";
document.getElementById("ajax_list_users_single").innerHTML = "";
destination = document.getElementById("destination_users");
for (i=0;i<destination.length;i++) {
if(destination.options[i].text == content) {
return false;
@ -201,7 +201,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
destination.selectedIndex = -1;
sortOptions(destination.options);
}
function remove_item(origin) {
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
@ -210,44 +210,44 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
function validate_filter() {
document.formulaire.add_type.value = \''.$add_type.'\';
document.formulaire.form_sent.value=0;
document.formulaire.submit();
}
function checked_in_no_session(checked) {
$("#first_letter_user")
.find("option")
.attr("selected", false);
xajax_search_users(checked, "any_session");
}
function change_select(val) {
$("#user_with_any_session_id").attr("checked", false);
xajax_search_users(val,"multiple");
}
</script>';
$form_sent = 0;
$errorMsg = $firstLetterUser = $firstLetterSession='';
$UserList = $SessionList = array();
$sessions = array();
$noPHP_SELF = true;
if (isset($_POST['form_sent']) && $_POST['form_sent']) {
$form_sent = $_POST['form_sent'];
$firstLetterUser = $_POST['firstLetterUser'];
$firstLetterSession = $_POST['firstLetterSession'];
$UserList = $_POST['sessionUsersList'];
if (!is_array($UserList)) {
$UserList=array();
}
if ($form_sent == 1) {
//added a parameter to send emails when registering a user
SessionManager::suscribe_users_to_session($id_session, $UserList, null, true);
@ -255,32 +255,32 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
exit;
}
}
$session_info = SessionManager::fetch($id_session);
Display::display_header($tool_name);
$nosessionUsersList = $sessionUsersList = array();
$ajax_search = $add_type == 'unique' ? true : false;
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
if ($ajax_search) {
$sql = "SELECT user_id, lastname, firstname, username, id_session
$sql = "SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session)."
AND $tbl_session_rel_user.session_id = ".intval($id_session)."
WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session
$sql="SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session)."
ON $tbl_session_rel_user.user_id = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.session_id = ".intval($id_session)."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
@ -309,7 +309,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
if ($use_extra_fields) {
$final_result = array();
if (count($extra_field_result)>1) {
@ -321,7 +321,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
} else {
$final_result = $extra_field_result[0];
}
$where_filter ='';
if (api_is_multiple_url_enabled()) {
if (is_array($final_result) && count($final_result)>0) {
@ -339,20 +339,20 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
if ($use_extra_fields) {
$sql = "SELECT user_id, lastname, firstname, username, id_session
$sql = "SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.session_id = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$where_filter AND u.status<>".DRH." AND u.status<>6
$order_clause";
} else {
$sql = "SELECT user_id, lastname, firstname, username, id_session
$sql = "SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.session_id = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." AND u.status<>6
$order_clause";
}
@ -360,42 +360,55 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT u.user_id, lastname, firstname, username, id_session
$sql = "SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id $where_filter AND u.status<>".DRH." AND u.status<>6
$order_clause";
}
}
$result = Database::query($sql);
$users = Database::store_result($result,'ASSOC');
foreach ($users as $uid => $user) {
if ($user['id_session'] != $id_session) {
$nosessionUsersList[$user['user_id']] = array('fn'=>$user['firstname'],'ln'=>$user['lastname'],'un'=>$user['username']) ;
if ($user['session_id'] != $id_session) {
$nosessionUsersList[$user['user_id']] = array(
'fn' => $user['firstname'],
'ln' => $user['lastname'],
'un' => $user['username']
);
unset($users[$uid]);
}
}
unset($users); //clean to free memory
//filling the correct users in list
$sql="SELECT user_id, lastname, firstname, username, id_session
$sql="SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
ON
$tbl_session_rel_user.id_user = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session
$sql="SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
@ -404,7 +417,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
$result = Database::query($sql);
$users = Database::store_result($result,'ASSOC');
foreach ($users as $uid => $user) {
if ($user['id_session'] == $id_session) {
if ($user['session_id'] == $id_session) {
$sessionUsersList[$user['user_id']] = $user;
if (array_key_exists($user['user_id'],$nosessionUsersList)) {
unset($nosessionUsersList[$user['user_id']]);
@ -414,7 +427,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
unset($users); //clean to free memory
}
if ($add_type == 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
@ -457,10 +470,10 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
?>
<input type="hidden" name="form_sent" value="1" />
<input type="hidden" name="add_type" />
<?php
if (!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
@ -470,7 +483,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
<div class="span5">
<div class="multiple_select_header">
<b><?php echo get_lang('UserListInPlatform') ?> :</b>
<?php if ($add_type == 'multiple') { ?>
<?php echo get_lang('FirstLetterUser'); ?> :
<select id="first_letter_user" name="firstLetterUser" onchange = "change_select(this.value);" >
@ -509,7 +522,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
?>
</div>
</div>
<div class="span2">
<div style="padding-top:54px;width:auto;text-align: center;">
<?php
@ -526,7 +539,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
<i class="fa fa-arrow-left"></i>
</button>
<?php
}
?>
@ -539,11 +552,11 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
} else {
//@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
}
?>
</div>
<div class="span5">
<div class="multiple_select_header">
<b><?php echo get_lang('UserListInSession') ?> :</b>
@ -565,7 +578,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
<!--
function moveItem(origin , destination)
{
for (var i = 0 ; i<origin.options.length ; i++) {
if (origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
@ -575,23 +588,23 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
destination.selectedIndex = -1;
sortOptions(destination.options);
}
function sortOptions(options)
{
newOptions = new Array();
for (i = 0 ; i<options.length ; i++)
newOptions[i] = options[i];
newOptions = newOptions.sort(mysort);
options.length = 0;
for (i = 0 ; i < newOptions.length ; i++)
options[i] = newOptions[i];
}
function mysort(a, b)
{
if (a.text.toLowerCase() > b.text.toLowerCase()) {
@ -602,7 +615,7 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
return 0;
}
function valide()
{
var options = document.getElementById('destination_users').options;
@ -610,32 +623,32 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
options[i].selected = true;
document.forms.formulaire.submit();
}
function loadUsersInSelect(select)
{
var xhr_object = null;
if(window.XMLHttpRequest) // Firefox
xhr_object = new XMLHttpRequest();
else if(window.ActiveXObject) // Internet Explorer
xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
else // XMLHttpRequest non supporté par le navigateur
alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
//xhr_object.open("GET", "loadUsersInSelect.ajax.php?id_session=<?php echo $id_session ?>&letter="+select.options[select.selectedIndex].text, false);
xhr_object.open("POST", "loadUsersInSelect.ajax.php");
xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
nosessionUsers = makepost(document.getElementById('origin_users'));
sessionUsers = makepost(document.getElementById('destination_users'));
nosessionClasses = makepost(document.getElementById('origin_classes'));
sessionClasses = makepost(document.getElementById('destination_classes'));
xhr_object.send("nosessionusers="+nosessionUsers+"&sessionusers="+sessionUsers+"&nosessionclasses="+nosessionClasses+"&sessionclasses="+sessionClasses);
xhr_object.onreadystatechange = function() {
if (xhr_object.readyState == 4) {
document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
@ -643,17 +656,17 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
}
}
}
function makepost(select)
{
var options = select.options;
var ret = "";
for (i = 0 ; i<options.length ; i++)
ret = ret + options[i].value +'::'+options[i].text+";;";
return ret;
}
-->
</script>
@ -662,4 +675,4 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
api_not_allowed();
}
/* FOOTER */
Display::display_footer();
Display::display_footer();

@ -216,10 +216,10 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
</tr>';
} else {
// select the courses
$sql = "SELECT code,title,visual_code, nbr_users
FROM $tbl_course,$tbl_session_rel_course
WHERE course_code = code
AND id_session='$id_session'
$sql = "SELECT c.id, code,title,visual_code, nbr_users
FROM $tbl_course c,$tbl_session_rel_course sc
WHERE c.id = sc.c_id
AND session_id='$id_session'
ORDER BY title";
$result=Database::query($sql);
$courses=Database::store_result($result);
@ -227,16 +227,20 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
//select the number of users
$sql = " SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
WHERE srcru.id_user = sru.id_user AND srcru.id_session = sru.id_session AND srcru.course_code = '".Database::escape_string($course['code'])."'
AND sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND srcru.id_session = '".intval($id_session)."'";
WHERE srcru.user_id = sru.user_id AND srcru.session_id = sru.session_id AND srcru.c_id = '".Database::escape_string($course['id'])."'
AND sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND srcru.session_id = '".intval($id_session)."'";
$rs = Database::query($sql);
$course['nbr_users'] = Database::result($rs,0,0);
// Get coachs of the courses in session
$sql = "SELECT user.lastname,user.firstname,user.username FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE session_rcru.id_user = user.user_id AND session_rcru.id_session = '".intval($id_session)."' AND session_rcru.course_code ='".Database::escape_string($course['code'])."' AND session_rcru.status=2";
$sql = "SELECT user.lastname,user.firstname,user.username
FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE
session_rcru.user_id = user.user_id AND
session_rcru.session_id = '".intval($id_session)."' AND
session_rcru.c_id ='".Database::escape_string($course['id'])."' AND session_rcru.status=2";
$rs = Database::query($sql);
$coachs = array();
@ -301,14 +305,14 @@ if($_configuration['allow_tutors_to_assign_students_to_session'] == 'true') {
INNER JOIN $tbl_session_rel_user su
ON u.user_id = su.id_user AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
LEFT OUTER JOIN $table_access_url_user uu ON (uu.user_id = u.user_id)
WHERE su.id_session = $id_session AND (access_url_id = $url_id OR access_url_id is null )
WHERE su.session_id = $id_session AND (access_url_id = $url_id OR access_url_id is null )
$order_clause";
} else {
$sql = "SELECT u.user_id, lastname, firstname, username
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user su
ON u.user_id = su.id_user AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND su.id_session = ".$id_session.$order_clause;
AND su.session_id = ".$id_session.$order_clause;
}
$result = Database::query($sql);

@ -389,7 +389,7 @@ if (api_is_allowed_to_edit(null, true)) {
INNER JOIN '.$tbl_session_rel_user.' reluser
ON user.user_id = reluser.id_user AND reluser.relation_type<>'.SESSION_RELATION_TYPE_RRHH.'
INNER JOIN '.$tbl_session_rel_course.' rel_course
ON rel_course.id_session = reluser.id_session
ON rel_course.session_id = reluser.id_session
WHERE user.user_id = "'.$user_id.'"
AND rel_course.c_id = "'.$courseId.'"';

@ -2746,7 +2746,7 @@ function get_list_users_without_publication($task_id, $studentId = null)
WHERE u.status != 1 and cu.c_id='".api_get_course_int_id()."' AND u.user_id = cu.user_id";
} else {
$sql_users = "SELECT cu.id_user, u.lastname, u.firstname, u.email FROM $session_course_rel_user AS cu, $table_user AS u
WHERE u.status != 1 and cu.course_code='".api_get_course_id()."' AND u.user_id = cu.id_user and cu.id_session = '".$session_id."'";
WHERE u.status != 1 and cu.c_id='".api_get_course_int_id()."' AND u.user_id = cu.user_id and cu.session_id = '".$session_id."'";
}
if (!empty($studentId)) {

@ -19,9 +19,9 @@ $sessionExtraFieldValue = new ExtraFieldValue('session');
* Get session list
*/
$joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su ON s.id = su.id_session INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_USER_REL_USER) . ' uu ON su.id_user = uu.user_id INNER JOIN ' .
Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE) . ' asq ON su.id_session = asq.session_id AND su.id_user = asq.user_id';
Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su ON s.id = su.session_id INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_USER_REL_USER) . ' uu ON su.user_id = uu.user_id INNER JOIN ' .
Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE) . ' asq ON su.session_id = asq.session_id AND su.id_user = asq.user_id';
$columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status';
$conditions = array(
'where' => array(
@ -154,4 +154,4 @@ foreach ($queueByAdmin as $sessionId => $studentInfo) {
$data['session'] = $sessionInfoList[$sessionId];
$data['students'] = $studentInfo['students'];
$plugin->sendMail($data, ADVANCED_SUBSCRIPTION_ACTION_REMINDER_ADMIN);
}
}

@ -222,8 +222,8 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$now;
$extra = new ExtraFieldValue('session');
$joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.id_session';
$whereSessionParams = 'su.relation_type = ? AND s.date_start >= ? AND su.id_user = ?';
Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.session_id';
$whereSessionParams = 'su.relation_type = ? AND s.date_start >= ? AND su.user_id = ?';
$whereSessionParamsValues = array(
0,
$newYearDate->format('Y-m-d'),
@ -1315,7 +1315,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$sql = "SELECT s.id FROM session AS s "
. "INNER JOIN session_field_values AS sfv ON s.id = sfv.session_id "
. "INNER JOIN session_field AS sf ON sfv.field_id = sf.id "
. "INNER JOIN session_rel_user AS su ON s.id = su.id_session "
. "INNER JOIN session_rel_user AS su ON s.id = su.session_id "
. "WHERE sf.field_variable = 'is_induccion_session' "
. "AND su.relation_type = 0 "
. "AND su.id_user = " . intval($userId);

@ -160,9 +160,9 @@ function userSessionList()
// loop through all sessions
while ($rowSession = Database::fetch_assoc($resSessions)) {
// get courses of current session
$sqlSessionCourse = "SELECT DISTINCT a.id_session, a.course_code, a.nbr_users
$sqlSessionCourse = "SELECT DISTINCT a.session_id, a.course_code, a.nbr_users
FROM $tableBuySessionRelCourse a, $tableSessionRelCourse b
WHERE a.id_session = b.id_session AND a.id_session = " . $rowSession['session_id'] . ";";
WHERE a.session_id = b.session_id AND a.session_id = " . $rowSession['session_id'] . ";";
$resSessionCourse = Database::query($sqlSessionCourse);
$aux = array();
// loop through courses of current session
@ -488,9 +488,9 @@ function sessionInfo($code)
AND b.id = '".$code."';";
$res = Database::query($sql);
$rowSession = Database::fetch_assoc($res);
$sqlSessionCourse = "SELECT DISTINCT a.id_session, a.course_code, a.nbr_users
$sqlSessionCourse = "SELECT DISTINCT a.session_id, a.course_code, a.nbr_users
FROM $tableBuySessionRelCourse a, $tableSessionRelCourse b
WHERE a.id_session = b.id_session AND a.id_session = " . $rowSession['session_id'] . ";";
WHERE a.session_id = b.session_id AND a.session_id = " . $rowSession['session_id'] . ";";
$resSessionCourse = Database::query($sqlSessionCourse);
$aux = array();
// loop through courses of current session

@ -83,9 +83,9 @@ if ($_REQUEST['tab'] == 'sessions_filter') {
// loop through all sessions
while ($rowSession = Database::fetch_assoc($resSessions)) {
// get courses of current session
$sqlSessionCourse = "SELECT DISTINCT a.id_session, a.course_code, a.nbr_users
$sqlSessionCourse = "SELECT DISTINCT a.session_id, a.course_code, a.nbr_users
FROM $tableBuySessionRelCourse a, $tableSessionRelCourse b
WHERE a.id_session = b.id_session AND a.id_session = " . $rowSession['session_id'] . ";";
WHERE a.session_id = b.session_id AND a.session_id = " . $rowSession['session_id'] . ";";
$resSessionCourse = Database::query($sqlSessionCourse);
$aux = array();
// loop through courses of current session

@ -16,7 +16,7 @@ $itemProperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
$sql = "SELECT i.* FROM $document d
INNER JOIN $itemProperty i
ON (d.c_id = i.c_id AND i.ref = d.id AND d.session_id = i.id_session)
ON (d.c_id = i.c_id AND i.ref = d.id AND d.session_id = i.session_id)
WHERE
d.path LIKE '%_DELETED_%' AND
i.visibility IN (1, 0) AND

@ -54,7 +54,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as srcru
ON srcru.id_user = ".$_user['user_id']." AND srcru.status=2
AND session.id = srcru.id_session
AND session.id = srcru.session_id
ORDER BY date_start, date_end, name";
$result = Database::query($sql);

Loading…
Cancel
Save