Skip to content

Commit 5b11f25

Browse files
jmontoyaajmontoyaa
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents 36149c1 + e968b63 commit 5b11f25

18 files changed

+262
-405
lines changed

‎main/admin/dashboard_add_courses_to_user.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
// Database Table Definitions
2626
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
27-
$tbl_course_rel_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
2827
$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
2928

3029
// initializing variables

‎main/admin/ldap_synchro.php‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,7 @@
2424

2525
// Database Table Definitions
2626
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
27-
$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
2827
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
29-
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
30-
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
31-
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
32-
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
33-
$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
34-
$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
3528

3629
$tbl_session_rel_etape = "session_rel_etape";
3730

@@ -159,34 +152,6 @@
159152
$CourseList[] = $row['c_id'];
160153
}
161154

162-
foreach ($CourseList as $enreg_course) {
163-
// On ajoute la relation entre l'utilisateur et le cours
164-
foreach ($UserList as $enreg_user) {
165-
$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
166-
VALUES('$id_session','$enreg_course','$enreg_user')";
167-
Database::query($sql);
168-
}
169-
$sql = "SELECT COUNT(user_id) as nbUsers ".
170-
"FROM $tbl_session_rel_course_rel_user ".
171-
"WHERE session_id='$id_session' AND c_id='$enreg_course'";
172-
$rs = Database::query($sql);
173-
list($nbr_users) = Database::fetch_array($rs);
174-
$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
175-
WHERE session_id='$id_session' AND c_id = '$enreg_course'";
176-
Database::query($sql);
177-
}
178-
// On ajoute la relation entre l'utilisateur et la session
179-
foreach ($UserList as $enreg_user) {
180-
$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) ".
181-
"VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')";
182-
Database::query($sql);
183-
}
184-
$sql = "SELECT COUNT(user_id) as nbUsers ".
185-
"FROM $tbl_session_rel_user ".
186-
"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
187-
$rs = Database::query($sql);
188-
list($nbr_users) = Database::fetch_array($rs);
189-
$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
190-
Database::query($sql);
155+
SessionManager::insertUsersInCourses($UserList, $CourseList, $id_session);
191156
}
192157
}

‎main/admin/ldap_users_synchro.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,6 @@
2222
$interbreadcrumb[] = ['url' => 'index.php', "name" => get_lang('PlatformAdmin')];
2323
$interbreadcrumb[] = ['url' => api_get_self(), "name" => get_lang('SessionsList')];
2424

25-
// Database Table Definitions
26-
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
27-
$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
28-
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
29-
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
30-
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
31-
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
32-
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
33-
$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
34-
$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
35-
36-
$tbl_session_rel_etape = "session_rel_etape";
37-
3825
$id_session = intval($_GET['id_session']);
3926

4027
$formSent = 0;

‎main/auth/ldap/authldap.php‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -610,15 +610,7 @@ function ldap_add_user_by_array($data, $update_if_exists = true)
610610
function ldap_add_user_to_session($UserList, $id_session)
611611
{
612612
// Database Table Definitions
613-
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
614-
$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
615613
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
616-
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
617-
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
618-
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
619-
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
620-
$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
621-
$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
622614

623615
$id_session = (int) $id_session;
624616
// Once users are imported in the users base, we can assign them to the session
@@ -627,39 +619,8 @@ function ldap_add_user_to_session($UserList, $id_session)
627619
while ($row = Database::fetch_array($result)) {
628620
$CourseList[] = $row['c_id'];
629621
}
630-
foreach ($CourseList as $enreg_course) {
631-
foreach ($UserList as $enreg_user) {
632-
$enreg_user = (int) $enreg_user;
633-
Database::query("INSERT IGNORE ".
634-
" INTO $tbl_session_rel_course_rel_user ".
635-
"(session_id,c_id,user_id) VALUES ".
636-
"('$id_session','$enreg_course','$enreg_user')");
637-
}
638-
$sql = "SELECT COUNT(user_id) as nbUsers ".
639-
" FROM $tbl_session_rel_course_rel_user ".
640-
" WHERE session_id='$id_session' ".
641-
" AND c_id='$enreg_course'";
642-
$rs = Database::query($sql);
643-
list($nbr_users) = Database::fetch_array($rs);
644-
Database::query("UPDATE $tbl_session_rel_course ".
645-
" SET nbr_users=$nbr_users ".
646-
" WHERE session_id='$id_session' ".
647-
" AND c_id='$enreg_course'");
648-
}
649-
foreach ($UserList as $enreg_user) {
650-
$enreg_user = (int) $enreg_user;
651-
Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
652-
" (session_id, user_id, registered_at) ".
653-
" VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
654-
}
655-
// We update the number of users in the session
656-
$sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
657-
" WHERE session_id='$id_session' ".
658-
" AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
659-
$rs = Database::query($sql);
660-
list($nbr_users) = Database::fetch_array($rs);
661-
Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
662-
" WHERE id='$id_session'");
622+
623+
SessionManager::insertUsersInCourses($UserList, $CourseList, $id_session);
663624
}
664625

665626
/**

‎main/coursecopy/copy_course_session.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
];
3939

4040
// Database Table Definitions
41-
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
42-
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
43-
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
4441
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
4542
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
4643

‎main/coursecopy/copy_course_session_selected.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@
5252
'name' => get_lang('Maintenance'),
5353
];
5454

55-
// Database Table Definitions
56-
$tbl_session_rel_course_rel_user = Database::get_main_table(
57-
TABLE_MAIN_SESSION_COURSE_USER
58-
);
59-
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
60-
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
61-
6255
/**
6356
* @param string $name
6457
*/

‎main/extra/group_space_tracking.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
// $tbl_personal_agenda = Database :: get_user_personal_table(TABLE_PERSONAL_AGENDA);
158158
$tbl_personal_agenda = Database:: get_main_table(TABLE_PERSONAL_AGENDA);
159159
$tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
160-
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
161160
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
162161
$tbl_stats_exercices_temp = Database:: get_main_table(track_e_exercices_temp);
163162
$tbl_group_course_info = Database:: get_course_table(TABLE_GROUP);

‎main/extra/myStudents.php‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,30 +162,11 @@ function show_image(image,width,height) {
162162
}
163163

164164
// Database Table Definitions
165-
//$tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
166-
//$tbl_stats_exercices = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
167-
$tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
168-
$tbl_session_user = Database:: get_main_table(TABLE_MAIN_SESSION_USER);
169-
$tbl_session = Database:: get_main_table(TABLE_MAIN_SESSION);
170-
$tbl_session_course = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE);
171-
$tbl_session_course_user = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
172-
$tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
173165
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
174166
$tbl_stats_access = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
175167
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
176-
$tbl_stats_exercices_attempts = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
177168
$tbl_personal_agenda = Database:: get_main_table(TABLE_PERSONAL_AGENDA);
178-
$tbl_course_lp_item = Database:: get_course_table(TABLE_LP_ITEM);
179-
180-
$tbl_course_lp_view = 'lp_view';
181-
$tbl_course_lp_view_item = 'lp_item_view';
182-
$tbl_course_lp_item = 'lp_item';
183-
$tbl_course_lp = 'lp';
184-
$tbl_course_quiz = 'quiz';
185-
$course_quiz_question = 'quiz_question';
186-
$course_quiz_rel_question = 'quiz_rel_question';
187-
$course_quiz_answer = 'quiz_answer';
188-
$course_student_publication = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
169+
189170
$TABLECALHORAIRE = Database:: get_course_table(TABLE_CAL_HORAIRE);
190171

191172
if (isset($_GET['user_id']) && $_GET['user_id'] != '') {

‎main/extra/userInfo.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ function show_image(image,width,height) {
6262
* Connection layer between Chamilo and the current script.
6363
*/
6464
$courseCode = api_get_course_id();
65-
$tbl_coursUser = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
6665
$userIdViewer = api_get_user_id(); // id fo the user currently online
6766
$allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin;
6867
$allowedToEditDef = api_is_allowed_to_edit(null, true);

‎main/inc/lib/add_course.lib.inc.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,15 +1333,18 @@ public static function register_course($params, $accessUrlId = 1)
13331333
$code
13341334
);
13351335
if (!empty($user_id)) {
1336-
$sql = "INSERT INTO $TABLECOURSUSER SET
1337-
c_id = $course_id,
1338-
user_id = '".intval($user_id)."',
1339-
status = '1',
1340-
is_tutor = '0',
1341-
sort = '".($i_course_sort)."',
1342-
relation_type = 0,
1343-
user_course_cat = '0'";
1344-
Database::query($sql);
1336+
Database::insert(
1337+
$TABLECOURSUSER,
1338+
[
1339+
'c_id' => $course_id,
1340+
'user_id' => $user_id,
1341+
'status' => 1,
1342+
'is_tutor' => 0,
1343+
'sort' => $i_course_sort,
1344+
'relation_type' => 0,
1345+
'user_course_cat' => 0,
1346+
]
1347+
);
13451348
}
13461349
}
13471350

0 commit comments

Comments
 (0)