From 51fa68d4cb96c17dcefd4f831e9dcdd81e30d7e4 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 8 Apr 2015 16:17:58 +0200 Subject: [PATCH] Replace id_session with session_id. --- main/admin/access_url_check_user_session.php | 2 +- main/admin/add_courses_to_session.php | 24 ++- main/admin/add_users_to_session.php | 35 ++-- main/admin/course_list.php | 2 +- main/admin/ldap_synchro.php | 12 +- main/admin/resume_session.php | 6 +- main/admin/session_course_edit.php | 15 +- main/admin/session_course_list.php | 6 +- main/admin/session_course_user.php | 26 ++- main/admin/session_course_user_list.php | 10 +- main/admin/session_export.php | 4 +- main/admin/session_import.php | 8 +- main/admin/special_exports.php | 26 +-- main/admin/user_move_stats.php | 14 +- main/chat/chat_whoisonline.php | 15 +- .../classes/CourseBuilder.class.php | 8 +- .../classes/CourseRestorer.class.php | 2 +- main/document/downloadfolder.inc.php | 20 +- main/forum/forumfunction.inc.php | 26 +-- main/gradebook/lib/GradebookUtils.php | 4 +- main/gradebook/lib/be/result.class.php | 6 +- main/inc/lib/AnnouncementEmail.php | 2 +- .../add_courses_to_session_functions.lib.php | 14 +- main/inc/lib/agenda.lib.php | 4 +- main/inc/lib/api.lib.php | 52 ++--- main/inc/lib/course.lib.php | 48 ++--- main/inc/lib/display.lib.php | 2 +- main/inc/lib/document.lib.php | 4 +- main/inc/lib/fileDisplay.lib.php | 2 +- main/inc/lib/login.lib.php | 4 +- main/inc/lib/myspace.lib.php | 10 +- main/inc/lib/sessionmanager.lib.php | 62 +++--- main/inc/lib/tracking.lib.php | 49 +++-- main/inc/lib/usermanager.lib.php | 36 ++-- main/inc/local.inc.php | 10 +- main/mySpace/reussite.php | 2 +- main/social/group_invitation.php | 5 +- main/tracking/userLog.php | 2 +- main/tracking/userlogCSV.php | 2 +- main/user/add_users_to_session.php | 197 ++++++++++-------- main/user/resume_session.php | 24 ++- main/user/user.php | 2 +- main/work/work.lib.php | 2 +- .../cron/notify_by_mail.php | 8 +- .../src/AdvancedSubscriptionPlugin.php | 6 +- plugin/buycourses/src/buy_course.lib.php | 8 +- plugin/buycourses/src/function.php | 4 +- .../detect_deleted_visible_documents.php | 2 +- whoisonlinesession.php | 2 +- 49 files changed, 432 insertions(+), 404 deletions(-) diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php index d7b2590449..cf627677d7 100755 --- a/main/admin/access_url_check_user_session.php +++ b/main/admin/access_url_check_user_session.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); diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php index 96ff7afc75..216a7f3152 100755 --- a/main/admin/add_courses_to_session.php +++ b/main/admin/add_courses_to_session.php @@ -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"; } diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php index ee747593d4..4f6bf2da78 100755 --- a/main/admin/add_users_to_session.php +++ b/main/admin/add_users_to_session.php @@ -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) { diff --git a/main/admin/course_list.php b/main/admin/course_list.php index ad42caf89f..e85e9ad3e1 100755 --- a/main/admin/course_list.php +++ b/main/admin/course_list.php @@ -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'])) { diff --git a/main/admin/ldap_synchro.php b/main/admin/ldap_synchro.php index 6cee744514..0e9d45faaf 100755 --- a/main/admin/ldap_synchro.php +++ b/main/admin/ldap_synchro.php @@ -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'"; diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index f7a41bc117..4af61c4376 100755 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -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); diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php index b3de5c7812..2ee0eed6c8 100755 --- a/main/admin/session_course_edit.php +++ b/main/admin/session_course_edit.php @@ -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']; } } } diff --git a/main/admin/session_course_list.php b/main/admin/session_course_list.php index c034c97274..34613f6e47 100755 --- a/main/admin/session_course_list.php +++ b/main/admin/session_course_list.php @@ -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); diff --git a/main/admin/session_course_user.php b/main/admin/session_course_user.php index 91bc6b4c02..ad5cc9f704 100755 --- a/main/admin/session_course_user.php +++ b/main/admin/session_course_user.php @@ -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 ''.$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); diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php index 0f835a4934..43858741df 100755 --- a/main/admin/session_course_user_list.php +++ b/main/admin/session_course_user_list.php @@ -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); diff --git a/main/admin/session_export.php b/main/admin/session_export.php index bd7913b549..d6d333a8e4 100755 --- a/main/admin/session_export.php +++ b/main/admin/session_export.php @@ -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); diff --git a/main/admin/session_import.php b/main/admin/session_import.php index e1b0b97aba..137422d457 100755 --- a/main/admin/session_import.php +++ b/main/admin/session_import.php @@ -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 { diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php index b45dcc0995..912060a588 100755 --- a/main/admin/special_exports.php +++ b/main/admin/special_exports.php @@ -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; diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php index 28b0d8af56..921e457eb6 100755 --- a/main/admin/user_move_stats.php +++ b/main/admin/user_move_stats.php @@ -583,9 +583,9 @@ $htmlHeadXtra[] = ''; - - + + $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 = ''.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').''; $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') { } } ?> - + - +
: - + :