From 46ed10dbd3d91c0bf7701da3d4c590dac83044e2 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Sun, 29 Nov 2020 15:17:13 +0100 Subject: [PATCH] Update from 1.11.x --- public/main/exercise/exercise.class.php | 2 +- public/main/group/group.php | 7 +- public/main/group/group_category.php | 2 + public/main/group/group_creation.php | 2 + public/main/group/group_space.php | 1 + public/main/group/settings.php | 2 + public/main/link/link.php | 2 + public/main/link/link_goto.php | 1 + .../plagiarism/compilatio/compiladmin.php | 29 +++--- public/main/tracking/courseLog.php | 99 +++++++++++++------ public/main/tracking/exams.php | 4 +- .../main/tracking/question_course_report.php | 3 - public/main/user/class.php | 25 ++++- public/main/user/resume_session.php | 4 +- public/main/user/user.php | 13 ++- 15 files changed, 131 insertions(+), 65 deletions(-) diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php index 1e0051ce68..858300d43c 100644 --- a/public/main/exercise/exercise.class.php +++ b/public/main/exercise/exercise.class.php @@ -2985,7 +2985,7 @@ class Exercise $exerciseObject->sessionId = api_get_session_id(); $courseId = api_get_course_int_id(); $exerciseObject->save(); - $newId = $exerciseObject->selectId(); + $newId = $exerciseObject->getId(); $exerciseRelQuestionTable = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); $count = 1; diff --git a/public/main/group/group.php b/public/main/group/group.php index f2a5228e24..4d18e4c111 100644 --- a/public/main/group/group.php +++ b/public/main/group/group.php @@ -198,12 +198,9 @@ if (api_is_allowed_to_edit(false, true)) { $actionsLeft .= ''. Display::return_icon('add-groups.png', get_lang('Create new group(s)'), '', ICON_SIZE_MEDIUM).''; - if ('true' === api_get_setting('allow_group_categories') && empty($sessionId)) { + if (empty($sessionId) && 'true' === api_get_setting('allow_group_categories')) { $actionsLeft .= ''. - Display::return_icon('new_folder.png', get_lang('Add category'), '', ICON_SIZE_MEDIUM).''; - } else { - $actionsLeft .= ''. - Display::return_icon('settings.png', get_lang('Edit settings'), '', ICON_SIZE_MEDIUM).''; + Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).''; } $actionsLeft .= ''. diff --git a/public/main/group/group_category.php b/public/main/group/group_category.php index 79b675f14d..ccf9fe72f9 100644 --- a/public/main/group/group_category.php +++ b/public/main/group/group_category.php @@ -4,6 +4,8 @@ require_once __DIR__.'/../inc/global.inc.php'; +$this_section = SECTION_COURSES; +$current_course_tool = TOOL_GROUP; // Notice for unauthorized people. api_protect_course_script(true); diff --git a/public/main/group/group_creation.php b/public/main/group/group_creation.php index 0e6672e226..39d142b390 100644 --- a/public/main/group/group_creation.php +++ b/public/main/group/group_creation.php @@ -3,6 +3,8 @@ /* For licensing terms, see /license.txt */ require_once __DIR__.'/../inc/global.inc.php'; +$this_section = SECTION_COURSES; +$current_course_tool = TOOL_GROUP; api_protect_course_script(true); diff --git a/public/main/group/group_space.php b/public/main/group/group_space.php index bd15446d90..1faa4affa1 100644 --- a/public/main/group/group_space.php +++ b/public/main/group/group_space.php @@ -9,6 +9,7 @@ * @todo Display error message if no group ID specified */ require_once __DIR__.'/../inc/global.inc.php'; +$current_course_tool = TOOL_GROUP; // Notice for unauthorized people. api_protect_course_script(true, false, 'group'); diff --git a/public/main/group/settings.php b/public/main/group/settings.php index c09994def6..c433790151 100644 --- a/public/main/group/settings.php +++ b/public/main/group/settings.php @@ -11,6 +11,8 @@ * @todo course admin functionality to create groups based on who is in which course (or class). */ require_once __DIR__.'/../inc/global.inc.php'; +$this_section = SECTION_COURSES; +$current_course_tool = TOOL_GROUP; api_protect_course_script(true); diff --git a/public/main/link/link.php b/public/main/link/link.php index be3a42c9b1..a8c8e1e365 100644 --- a/public/main/link/link.php +++ b/public/main/link/link.php @@ -19,6 +19,8 @@ */ require_once __DIR__.'/../inc/global.inc.php'; +$current_course_tool = TOOL_LINK; +$this_section = SECTION_COURSES; api_protect_course_script(true); $htmlHeadXtra[] = '