From 14ed1dd2033372ef660c07e7eb021817d6e27b8f Mon Sep 17 00:00:00 2001 From: NicoDucou Date: Wed, 10 May 2023 19:06:36 +0200 Subject: [PATCH] Script: System: fixing various errors -refs BT#20736 --- ..._courses_sessions_users_from_a_specific_url.php | 14 +++++++------- ...ons_users_from_all_urls_except_specific_url.php | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/scripts/multi_url_delete_courses_sessions_users_from_a_specific_url.php b/tests/scripts/multi_url_delete_courses_sessions_users_from_a_specific_url.php index 471188e432..81f238c81e 100644 --- a/tests/scripts/multi_url_delete_courses_sessions_users_from_a_specific_url.php +++ b/tests/scripts/multi_url_delete_courses_sessions_users_from_a_specific_url.php @@ -15,20 +15,20 @@ if (empty($urlId)) { } require_once '../../main/inc/global.inc.php'; -$accessUrlRelCourseTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); -$accessUrlRelUserTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_USER); -$accessUrlRelSessionTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); +$accessUrlRelCourseTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); +$accessUrlRelUserTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); +$accessUrlRelSessionTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); -$sqlCoursesToDelete = "select c_id from $accessUrlRelCourseTable where access_url_id = $urlId and c_id not in (select c_id from $accessUrlRelCourseTable where access_url_id != $urlId)" -$sqlUsersToDelete = "select user_id from $accessUrlRelUserTable where access_url_id = $urlId and user_id not in (select user_id from $accessUrlRelUserTable where access_url_id != $urlId)" -$sqlSessionsToDelete = "select session_id from $accessUrlRelSessionTable where access_url_id = $urlId and session_id not in (select user_id from $accessUrlRelUserTable where access_url_id != $urlId)" +$sqlCoursesToDelete = "select c_id from $accessUrlRelCourseTable where access_url_id = $urlId and c_id not in (select c_id from $accessUrlRelCourseTable where access_url_id != $urlId)"; +$sqlUsersToDelete = "select user_id from $accessUrlRelUserTable where access_url_id = $urlId and user_id not in (select user_id from $accessUrlRelUserTable where access_url_id != $urlId)"; +$sqlSessionsToDelete = "select session_id from $accessUrlRelSessionTable where access_url_id = $urlId and session_id not in (select session_id from $accessUrlRelSessionTable where access_url_id != $urlId)"; echo "Initiating sessions deletion".PHP_EOL; $resSessionsToDelete = Database::query($sqlSessionsToDelete); while ($data = Database::fetch_array($resSessionsToDelete)) { echo "deleting session with id = " . $data['session_id'] . ".".PHP_EOL; - if (!SessionManager::delete($data['session_id'])) { + if (!SessionManager::delete($data['session_id'],true)) { echo "Session " . $data['session_id'] . " not deleted".PHP_EOL; } } diff --git a/tests/scripts/multi_url_delete_courses_sessions_users_from_all_urls_except_specific_url.php b/tests/scripts/multi_url_delete_courses_sessions_users_from_all_urls_except_specific_url.php index 23b47bee21..889ac59be4 100644 --- a/tests/scripts/multi_url_delete_courses_sessions_users_from_all_urls_except_specific_url.php +++ b/tests/scripts/multi_url_delete_courses_sessions_users_from_all_urls_except_specific_url.php @@ -15,20 +15,20 @@ if (empty($urlId)) { } require_once '../../main/inc/global.inc.php'; -$accessUrlRelCourseTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); -$accessUrlRelUserTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_USER); -$accessUrlRelSessionTable = Database::get_course_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); +$accessUrlRelCourseTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); +$accessUrlRelUserTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); +$accessUrlRelSessionTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); -$sqlCoursesToDelete = "select c_id from $accessUrlRelCourseTable where access_url_id != $urlId and c_id not in (select c_id from $accessUrlRelCourseTable where access_url_id = $urlId)" -$sqlUsersToDelete = "select user_id from $accessUrlRelUserTable where access_url_id != $urlId and user_id not in (select user_id from $accessUrlRelUserTable where access_url_id = $urlId)" -$sqlSessionsToDelete = "select session_id from $accessUrlRelSessionTable where access_url_id != $urlId and session_id not in (select user_id from $accessUrlRelUserTable where access_url_id = $urlId)" +$sqlCoursesToDelete = "select c_id from $accessUrlRelCourseTable where access_url_id != $urlId and c_id not in (select c_id from $accessUrlRelCourseTable where access_url_id = $urlId)"; +$sqlUsersToDelete = "select user_id from $accessUrlRelUserTable where access_url_id != $urlId and user_id not in (select user_id from $accessUrlRelUserTable where access_url_id = $urlId)"; +$sqlSessionsToDelete = "select session_id from $accessUrlRelSessionTable where access_url_id != $urlId and session_id not in (select session_id from $accessUrlRelSessionTable where access_url_id = $urlId)"; echo "Initiating sessions deletion".PHP_EOL; $resSessionsToDelete = Database::query($sqlSessionsToDelete); while ($data = Database::fetch_array($resSessionsToDelete)) { echo "deleting session with id = " . $data['session_id'] . ".".PHP_EOL; - if (!SessionManager::delete($data['session_id'])) { + if (!SessionManager::delete($data['session_id'],true)) { echo "Session " . $data['session_id'] . " not deleted".PHP_EOL; } }