From 304ee367c0f22a575e0e9951224255bee8a02518 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Thu, 22 Oct 2009 13:24:31 -0500 Subject: [PATCH] Fixed users number of a course in session - partial DT #5377 --- main/admin/resume_session.php | 2 +- main/inc/lib/sessionmanager.lib.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index 6f3182a6c0..d7eeb7badb 100644 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -215,7 +215,7 @@ else { //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.course_code = '".Database::escape_string($course['code'])."' + WHERE srcru.id_user = sru.id_user AND srcru.id_session = sru.id_session AND srcru.course_code = '".Database::escape_string($course['code'])."' AND srcru.id_session = '".intval($id_session)."'"; $rs = Database::query($sql, __FILE__, __LINE__); diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 6740f791f0..be882d52cc 100644 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -351,9 +351,8 @@ class SessionManager { if ($empty_users!==false) { foreach ($existingUsers as $existing_user) { if(!in_array($existing_user, $user_list)) { - $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course' AND id_user='$existing_user'"; + $sql = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course' AND id_user='$existing_user' AND status != 2 "; Database::query($sql,__FILE__,__LINE__); - if(Database::affected_rows()) { $nbr_users--; }