From 93bad6fbc60e71f2626a0683f78596d7bdee3fa2 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 18 Feb 2023 19:09:29 -0500 Subject: [PATCH] Settings: Move settings from configuration.php to .env or to the Database - refs #2682 --- public/certificates/index.php | 2 +- public/main/admin/career_dashboard.php | 2 +- public/main/admin/career_diagram.php | 4 +- public/main/admin/careers.php | 4 +- public/main/admin/course_category.php | 2 +- public/main/admin/course_edit.php | 8 +- public/main/admin/index.php | 8 +- public/main/admin/update_schema.php | 2 +- public/main/admin/user_import.php | 4 +- public/main/admin/user_list.php | 4 +- public/main/announcements/announcements.php | 6 +- public/main/auth/courses.php | 8 +- public/main/auth/inscription.php | 12 +- public/main/auth/my_progress.php | 6 +- public/main/chat/chat.php | 2 +- .../course_description_controller.php | 4 +- public/main/course_info/infocours.php | 2 +- public/main/course_progress/index.php | 6 +- public/main/create_course/add_course.php | 13 +- public/main/cron/hosting_total_size_limit.php | 2 +- public/main/cron/import_csv.php | 3 +- public/main/exercise/ReadingComprehension.php | 2 +- public/main/exercise/admin.php | 2 +- public/main/exercise/exercise.class.php | 42 +- public/main/exercise/exercise.php | 2 +- .../exercise/exercise_question_reminder.php | 2 +- public/main/exercise/exercise_reminder.php | 2 +- public/main/exercise/exercise_report.php | 8 +- public/main/exercise/exercise_result.php | 6 +- public/main/exercise/exercise_show.php | 6 +- public/main/exercise/exercise_submit.php | 6 +- public/main/exercise/overview.php | 6 +- public/main/exercise/question.class.php | 12 +- public/main/exercise/question_admin.inc.php | 2 +- .../main/exercise/question_list_admin.inc.php | 6 +- public/main/exercise/question_pool.php | 8 +- public/main/exercise/result.php | 2 +- public/main/forum/forumfunction.inc.php | 8 +- public/main/forum/viewthread.php | 2 +- public/main/glossary/index.php | 6 +- .../gradebook/gradebook_display_summary.php | 4 +- public/main/gradebook/index.php | 8 +- public/main/gradebook/lib/GradebookUtils.php | 2 +- .../main/gradebook/lib/be/category.class.php | 4 +- .../gradebook/lib/be/exerciselink.class.php | 2 +- .../gradebook/lib/be/surveylink.class.php | 2 +- .../main/gradebook/lib/fe/catform.class.php | 2 +- .../gradebook/lib/fe/gradebooktable.class.php | 8 +- .../lib/flatview_data_generator.class.php | 10 +- .../lib/gradebook_data_generator.class.php | 4 +- public/main/inc/ajax/admin.ajax.php | 4 +- public/main/inc/ajax/chat.ajax.php | 2 +- public/main/inc/ajax/course.ajax.php | 4 +- public/main/inc/ajax/exercise.ajax.php | 4 +- public/main/inc/ajax/model.ajax.php | 2 +- public/main/inc/ajax/user_manager.ajax.php | 2 +- public/main/inc/ajax/work.ajax.php | 4 +- public/main/inc/email_editor_external.php | 2 +- public/main/inc/lib/AnnouncementManager.php | 2 +- public/main/inc/lib/CourseChatUtils.php | 2 +- .../lib/CoursesAndSessionsCatalog.class.php | 6 +- public/main/inc/lib/ScheduledAnnouncement.php | 2 +- public/main/inc/lib/SkillModel.php | 10 +- public/main/inc/lib/agenda.lib.php | 6 +- public/main/inc/lib/api.lib.php | 16 +- public/main/inc/lib/certificate.lib.php | 4 +- public/main/inc/lib/course.lib.php | 22 +- public/main/inc/lib/course_category.lib.php | 9 +- public/main/inc/lib/display.lib.php | 4 +- public/main/inc/lib/document.lib.php | 2 +- public/main/inc/lib/events.lib.php | 2 +- public/main/inc/lib/exercise.lib.php | 6 +- public/main/inc/lib/export.lib.inc.php | 2 +- public/main/inc/lib/extra_field.lib.php | 2 +- .../formvalidator/Element/DateRangePicker.php | 16 +- public/main/inc/lib/glossary.lib.php | 6 +- public/main/inc/lib/message.lib.php | 2 +- public/main/inc/lib/notification.lib.php | 4 +- public/main/inc/lib/pdf.lib.php | 2 +- public/main/inc/lib/redirect.class.php | 7 +- public/main/inc/lib/sessionmanager.lib.php | 4 +- public/main/inc/lib/social.lib.php | 10 +- public/main/inc/lib/sortable_table.class.php | 2 +- public/main/inc/lib/template.lib.php | 20 +- public/main/inc/lib/tracking.lib.php | 4 +- public/main/inc/lib/usermanager.lib.php | 18 +- public/main/inc/lib/userportal.lib.php | 16 +- public/main/lp/LearnPathItemForm.php | 2 +- public/main/lp/ScormApi.php | 2 +- public/main/lp/ScormExport.php | 2 +- public/main/lp/learnpath.class.php | 17 +- public/main/lp/learnpathItem.class.php | 6 +- public/main/lp/learnpathList.class.php | 2 +- public/main/lp/lp_add.php | 2 +- public/main/lp/lp_add_category.php | 2 +- public/main/lp/lp_ajax_switch_item_toc.php | 2 +- public/main/lp/lp_controller.php | 4 +- public/main/lp/lp_edit.php | 4 +- public/main/lp/lp_list.php | 4 +- public/main/lp/lp_upload.php | 2 +- public/main/lp/lp_view.php | 10 +- public/main/lp/my_list.php | 2 +- public/main/lp/scorm_api.php | 2 +- public/main/my_space/index.php | 2 +- public/main/my_space/myStudents.php | 8 +- public/main/my_space/my_career.php | 2 +- public/main/my_space/student.php | 2 +- public/main/my_space/users.php | 2 +- public/main/my_space/work_stats.php | 6 +- public/main/portfolio/add_category.php | 2 +- public/main/portfolio/add_item.php | 2 +- public/main/portfolio/edit_category.php | 2 +- public/main/portfolio/edit_item.php | 2 +- .../session/add_edit_users_to_session.php | 2 +- public/main/session/index.php | 2 +- public/main/session/session_list.php | 2 +- public/main/session/session_list_custom.php | 2 +- public/main/skills/assign.php | 2 +- public/main/skills/issued.php | 2 +- public/main/skills/issued_all.php | 2 +- public/main/social/personal_data.php | 8 +- public/main/social/require_user_linking.php | 2 +- public/main/survey/create_new_survey.php | 2 +- public/main/survey/edit_meeting.php | 2 +- public/main/survey/fillsurvey.php | 6 +- public/main/survey/preview.php | 4 +- public/main/survey/survey.lib.php | 22 +- public/main/survey/survey.php | 2 +- public/main/survey/surveyUtil.class.php | 8 +- public/main/survey/survey_invitation.php | 6 +- public/main/survey/survey_invite.php | 2 +- public/main/survey/survey_question.php | 12 +- .../template/default/admin/index.html.twig | 2 +- .../partials/result_exercise.html.twig | 2 +- .../template/default/forum/list.html.twig | 2 +- .../user_portal/grid_session.html.twig | 2 +- public/main/tracking/courseLog.php | 2 +- public/main/tracking/messages.php | 2 +- public/main/upload/index.php | 2 +- public/main/user/career_diagram.php | 2 +- public/main/user/user.php | 2 +- public/main/work/add_document.php | 2 +- public/main/work/edit.php | 2 +- public/main/work/edit_work.php | 2 +- public/main/work/publications.php | 2 +- public/main/work/upload.php | 6 +- public/main/work/upload_from_template.php | 2 +- public/main/work/view.php | 4 +- public/main/work/work.lib.php | 22 +- public/main/work/work_list.php | 4 +- public/main/work/work_list_all.php | 4 +- .../layout/login_form.tpl | 2 +- .../azure_active_directory/view/login.tpl | 2 +- .../Editor/CkEditor/Toolbar/Basic.php | 2 +- src/CoreBundle/Component/Editor/Toolbar.php | 2 +- src/CoreBundle/Controller/ChatController.php | 2 +- .../Controller/CourseController.php | 4 +- .../Controller/SessionController.php | 2 +- .../Schema/V200/Version20230216122900.php | 550 ++++++++++++++++++ src/CoreBundle/Resources/config/settings.yml | 5 + .../Resources/views/LearnPath/list.html.twig | 2 +- .../Resources/views/Session/about.html.twig | 2 +- .../Settings/AdminSettingsSchema.php | 9 + .../Settings/AgendaSettingsSchema.php | 4 + .../Settings/AnnouncementSettingsSchema.php | 10 + .../Settings/ChatSettingsSchema.php | 4 + .../Settings/CourseSettingsSchema.php | 58 ++ .../Settings/DocumentSettingsSchema.php | 26 + .../Settings/EditorSettingsSchema.php | 6 + .../Settings/ExerciseSettingsSchema.php | 68 +++ .../Settings/ForumSettingsSchema.php | 9 + .../Settings/GlossarySettingsSchema.php | 14 + .../Settings/GradebookSettingsSchema.php | 27 + .../Settings/LanguageSettingsSchema.php | 2 + .../Settings/LearningPathSettingsSchema.php | 56 ++ .../Settings/MailSettingsSchema.php | 24 + .../Settings/MessageSettingsSchema.php | 4 + .../Settings/PlatformSettingsSchema.php | 58 +- .../Settings/ProfileSettingsSchema.php | 29 + .../Settings/SecuritySettingsSchema.php | 86 ++- .../Settings/SessionSettingsSchema.php | 45 ++ .../Settings/SkillSettingsSchema.php | 10 + .../Settings/SocialSettingsSchema.php | 4 + .../Settings/SurveySettingsSchema.php | 18 + .../Settings/WorkSettingsSchema.php | 51 ++ .../Component/CourseCopy/CourseBuilder.php | 2 +- .../Component/CourseCopy/CourseRestorer.php | 6 +- .../CourseCopy/Resources/SurveyQuestion.php | 2 +- 188 files changed, 1571 insertions(+), 401 deletions(-) create mode 100644 src/CoreBundle/Migrations/Schema/V200/Version20230216122900.php create mode 100644 src/CoreBundle/Settings/WorkSettingsSchema.php diff --git a/public/certificates/index.php b/public/certificates/index.php index ef44c54d51..ee57c6ef64 100644 --- a/public/certificates/index.php +++ b/public/certificates/index.php @@ -35,7 +35,7 @@ switch ($action) { 'left' => 0, ]; - $orientation = api_get_configuration_value('certificate_pdf_orientation'); + $orientation = api_get_setting('document.certificate_pdf_orientation'); $pdfParams['orientation'] = 'landscape'; if (!empty($orientation)) { $pdfParams['orientation'] = $orientation; diff --git a/public/main/admin/career_dashboard.php b/public/main/admin/career_dashboard.php index 1e6cbc0125..7ca0c97193 100644 --- a/public/main/admin/career_dashboard.php +++ b/public/main/admin/career_dashboard.php @@ -8,7 +8,7 @@ $cidReset = true; require_once __DIR__.'/../inc/global.inc.php'; -$allowCareer = api_get_configuration_value('allow_session_admin_read_careers'); +$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers')); api_protect_admin_script($allowCareer); diff --git a/public/main/admin/career_diagram.php b/public/main/admin/career_diagram.php index 91a2db6f67..b5fd2953a9 100644 --- a/public/main/admin/career_diagram.php +++ b/public/main/admin/career_diagram.php @@ -14,7 +14,7 @@ ALTER TABLE extra_field_values modify column value longtext null; $cidReset = true; require_once __DIR__.'/../inc/global.inc.php'; -if (false === api_get_configuration_value('allow_career_diagram')) { +if ('false' === api_get_setting('profile.allow_career_diagram')) { api_not_allowed(true); } @@ -33,7 +33,7 @@ if (!(api_is_platform_admin() || api_is_drh())) { $this_section = SECTION_PLATFORM_ADMIN; -$allowCareer = api_get_configuration_value('allow_session_admin_read_careers'); +$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers')); api_protect_admin_script($allowCareer); $htmlHeadXtra[] = api_get_js('jsplumb2.js'); diff --git a/public/main/admin/careers.php b/public/main/admin/careers.php index ce083f914f..e502b3fe79 100644 --- a/public/main/admin/careers.php +++ b/public/main/admin/careers.php @@ -7,7 +7,7 @@ require_once __DIR__.'/../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; -$allowCareer = api_get_configuration_value('allow_session_admin_read_careers'); +$allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers')); api_protect_admin_script($allowCareer); // Add the JS needed to use the jqgrid @@ -74,7 +74,7 @@ $extra_params['autowidth'] = 'true'; $extra_params['height'] = 'auto'; $diagramLink = ''; -$allow = api_get_configuration_value('allow_career_diagram'); +$allow = ('true' === api_get_setting('profile.allow_career_diagram')); if ($allow) { $diagramLink = ''. diff --git a/public/main/admin/course_category.php b/public/main/admin/course_category.php index 8db8771036..9b49246fa6 100644 --- a/public/main/admin/course_category.php +++ b/public/main/admin/course_category.php @@ -134,7 +134,7 @@ if ('add' === $action || 'edit' === $action) { $form->addHidden('formSent', 1); $form->addElement('text', 'code', get_lang('Category code')); - if (api_get_configuration_value('save_titles_as_html')) { + if ('true' === api_get_setting('editor.save_titles_as_html')) { $form->addHtmlEditor( 'name', get_lang('Category name'), diff --git a/public/main/admin/course_edit.php b/public/main/admin/course_edit.php index 86be493acc..5c0410339a 100644 --- a/public/main/admin/course_edit.php +++ b/public/main/admin/course_edit.php @@ -139,11 +139,11 @@ $form->addText( $form->applyFilter('visual_code', 'strtoupper'); $form->applyFilter('visual_code', 'html_filter'); - +$allowBaseCourseCategory = ('true' === api_get_setting('course.allow_base_course_category')); $categories = $courseCategoriesRepo->getCategoriesByCourseIdAndAccessUrlId( $urlId, $courseId, - api_get_configuration_value('allow_base_course_category') + $allowBaseCourseCategory ); $courseCategoryNames = []; @@ -186,7 +186,7 @@ if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) { ); } -$allowEditSessionCoaches = false === api_get_configuration_value('disabled_edit_session_coaches_course_editing_course'); +$allowEditSessionCoaches = ('false' === api_get_setting('course.disabled_edit_session_coaches_course_editing_course')); $coursesInSession = SessionManager::get_session_by_course($courseInfo['real_id']); if (!empty($coursesInSession) && $allowEditSessionCoaches) { foreach ($coursesInSession as $session) { @@ -265,7 +265,7 @@ $extra = $extraField->addElements( true ); -if (api_get_configuration_value('multiple_access_url_show_shared_course_marker')) { +if ('true' === api_get_setting('course.multiple_access_url_show_shared_course_marker')) { $urls = UrlManager::get_access_url_from_course($courseId); $urlToString = ''; foreach ($urls as $url) { diff --git a/public/main/admin/index.php b/public/main/admin/index.php index 6167483f7a..9d6785269e 100644 --- a/public/main/admin/index.php +++ b/public/main/admin/index.php @@ -85,10 +85,10 @@ if (api_is_platform_admin()) { } $items[] = ['url' => 'extra_fields.php?type=user', 'label' => get_lang('Profiling')]; $items[] = ['url' => 'usergroups.php', 'label' => get_lang('Classes')]; - if (!api_get_configuration_value('disable_gdpr')) { + if ('true' !== api_get_setting('profile.disable_gdpr')) { $items[] = ['url' => 'user_list_consent.php', 'label' => get_lang('Users in consents list')]; } - if (api_get_configuration_value('show_link_request_hrm_user')) { + if ('true' === api_get_setting('admin.show_link_request_hrm_user')) { $items[] = ['url' => 'user_linking_requests.php', 'label' => get_lang('Student linking requests')]; } } else { @@ -108,7 +108,7 @@ if (api_is_platform_admin()) { }); } - if (true === api_get_configuration_value('limit_session_admin_list_users')) { + if ('true' === api_get_setting('session.limit_session_admin_list_users')) { $items = array_filter($items, function (array $item) { $urls = ['user_list.php']; @@ -241,7 +241,7 @@ if (api_is_platform_admin()) { ]; } - $allowCareer = api_get_configuration_value('allow_session_admin_read_careers'); + $allowCareer = ('true' === api_get_setting('session.allow_session_admin_read_careers')); if (api_is_platform_admin() || ($allowCareer && api_is_session_admin())) { // option only visible in development mode. Enable through code if required diff --git a/public/main/admin/update_schema.php b/public/main/admin/update_schema.php index 6c2a6f1680..feabecb45a 100644 --- a/public/main/admin/update_schema.php +++ b/public/main/admin/update_schema.php @@ -8,7 +8,7 @@ require_once __DIR__.'/../inc/global.inc.php'; // Access restrictions api_protect_admin_script(true); -if (true != api_get_configuration_value('sync_db_with_schema')) { +if ('false' === api_get_setting('platform.sync_db_with_schema')) { api_not_allowed(true); } diff --git a/public/main/admin/user_import.php b/public/main/admin/user_import.php index 296aff5b6b..4b18fc5f1c 100644 --- a/public/main/admin/user_import.php +++ b/public/main/admin/user_import.php @@ -339,7 +339,7 @@ function save_data($users, $sendMail = false) function parse_csv_data($users, $fileName, $sendEmail = 0, $checkUniqueEmail = true, $resumeImport = false) { $usersFromOrigin = $users; - $allowRandom = api_get_configuration_value('generate_random_login'); + $allowRandom = ('true' === api_get_setting('platform.generate_random_login')); if ($allowRandom) { $factory = new RandomLib\Factory(); $generator = $factory->getLowStrengthGenerator(); @@ -749,7 +749,7 @@ if ($count_fields > 0) { } } -if (api_get_configuration_value('plugin_redirection_enabled')) { +if ('true' === api_get_setting('admin.plugin_redirection_enabled')) { $list[] = 'Redirection'; $list_reponse[] = api_get_path(WEB_PATH); } diff --git a/public/main/admin/user_list.php b/public/main/admin/user_list.php index e88ca1f33e..cf4c2d3097 100644 --- a/public/main/admin/user_list.php +++ b/public/main/admin/user_list.php @@ -547,7 +547,7 @@ function modify_filter($user_id, $url_params, $row) $loginAsStatusForSessionAdmins = [$statusname[STUDENT]]; // Except when session.allow_session_admin_login_as_teacher is enabled, then can login_as teachers also - if (api_get_configuration_value('session.allow_session_admin_login_as_teacher')) { + if ('true' === api_get_setting('session.allow_session_admin_login_as_teacher')) { $loginAsStatusForSessionAdmins[] = $statusname[COURSEMANAGER]; } @@ -730,7 +730,7 @@ function modify_filter($user_id, $url_params, $row) } } - $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin'); + $allowDelete = ('true' === api_get_setting('session.allow_delete_user_for_session_admin')); if (api_is_session_admin() && $allowDelete) { if ($user_id != $currentUserId && diff --git a/public/main/announcements/announcements.php b/public/main/announcements/announcements.php index 15165ed1bb..876a822508 100644 --- a/public/main/announcements/announcements.php +++ b/public/main/announcements/announcements.php @@ -89,7 +89,7 @@ $logInfo = [ ]; Event::registerLog($logInfo); -$announcementAttachmentIsDisabled = api_get_configuration_value('disable_announcement_attachment'); +$announcementAttachmentIsDisabled = ('true' === api_get_setting('announcement.disable_announcement_attachment')); $thisAnnouncementId = null; switch ($action) { @@ -329,7 +329,7 @@ switch ($action) { break; case 'delete_all': if (api_is_allowed_to_edit()) { - $allow = api_get_configuration_value('disable_delete_all_announcements'); + $allow = ('true' === api_get_setting('announcement.disable_delete_all_announcements')); if (false === $allow) { AnnouncementManager::delete_all_announcements($_course); Display::addFlash(Display::return_message(get_lang('Announcement has been deletedAll'))); @@ -821,7 +821,7 @@ if (($allowToEdit || $allowStudentInGroupToSend) && (empty($_GET['origin']) || ' /* if ($allowToEdit && 0 == api_get_group_id()) { - $allow = api_get_configuration_value('disable_delete_all_announcements'); + $allow = ('true' === api_get_setting('announcement.disable_delete_all_announcements')); if (false === $allow && api_is_allowed_to_edit()) { if (!isset($_GET['action']) || isset($_GET['action']) && 'list' == $_GET['action'] diff --git a/public/main/auth/courses.php b/public/main/auth/courses.php index 9cf3252228..6646b0621a 100644 --- a/public/main/auth/courses.php +++ b/public/main/auth/courses.php @@ -22,7 +22,7 @@ if ('true' !== api_get_setting('course_catalog_published')) { api_block_anonymous_users(); } -$allowExtraFields = api_get_configuration_value('allow_course_extra_field_in_catalog'); +$allowExtraFields = ('true' === api_get_setting('course.allow_course_extra_field_in_catalog')); // For students $userCanViewPage = true; @@ -116,7 +116,7 @@ switch ($action) { CourseManager::autoSubscribeToCourse($courseCodeToSubscribe); if ('course_home' === $redirectAfterSubscription) { $redirectionTarget = $courseInfo['course_public_url']; - if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) { + if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) { $user = api_get_user_entity(api_get_user_id()); if ($user) { foreach ($user->getCurrentlyAccessibleSessions() as $session) { @@ -164,7 +164,7 @@ switch ($action) { if ('course_home' === $redirectAfterSubscription) { $redirectionTarget = $courseInfo['course_public_url']; - if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) { + if ('true' === api_get_setting('session.catalog_course_subscription_in_user_s_session')) { $user = api_get_user_entity(api_get_user_id()); if ($user) { foreach ($user->getCurrentlyAccessibleSessions() as $session) { @@ -413,7 +413,7 @@ switch ($action) { } $courseUrl = api_get_path(WEB_COURSE_PATH); - $hideRating = api_get_configuration_value('hide_course_rating'); + $hideRating = ('true' === api_get_setting('course.hide_course_rating')); if (!empty($courses)) { foreach ($courses as &$course) { diff --git a/public/main/auth/inscription.php b/public/main/auth/inscription.php index 715354a4d2..9d5660f392 100644 --- a/public/main/auth/inscription.php +++ b/public/main/auth/inscription.php @@ -105,9 +105,9 @@ $extraFieldsLoaded = false; $htmlHeadXtra[] = api_get_password_checker_js('#username', '#pass1'); // User is not allowed if Terms and Conditions are disabled and // registration is disabled too. -$isNotAllowedHere = 'false' === api_get_setting('allow_terms_conditions') && - 'false' === api_get_setting('allow_registration'); - +//$isNotAllowedHere = 'false' === api_get_setting('allow_terms_conditions') && + // 'false' === api_get_setting('allow_registration'); +$isNotAllowedHere = false; if ($isNotAllowedHere) { api_not_allowed(true, get_lang('Sorry, you are trying to access the registration page for this portal, but registration is currently disabled. Please contact the administrator (see contact information in the footer). If you already have an account on this site.')); } @@ -153,7 +153,7 @@ $sessionId = Session::read('sessionId'); $sessionRedirect = isset($_REQUEST['s']) && !empty($_REQUEST['s']) ? $_REQUEST['s'] : null; $onlyOneCourseSessionRedirect = isset($_REQUEST['cr']) && !empty($_REQUEST['cr']) ? $_REQUEST['cr'] : null; -if (api_get_configuration_value('allow_redirect_to_session_after_inscription_about')) { +if ('true' === api_get_setting('session.allow_redirect_to_session_after_inscription_about')) { if (!empty($sessionRedirect)) { Session::write('session_redirect', $sessionRedirect); Session::write('only_one_course_session_redirect', $onlyOneCourseSessionRedirect); @@ -199,7 +199,7 @@ if (false === $userAlreadyRegisteredShowTerms && } $LastnameLabel = get_lang('LastName'); - if (true == api_get_configuration_value('registration_add_helptext_for_2_names')) { + if ('true' === api_get_setting('profile.registration_add_helptext_for_2_names')) { $LastnameLabel = [$LastnameLabel, get_lang('InsertTwoNames')]; } if (api_is_western_name_order()) { @@ -753,7 +753,7 @@ if ($blockButton) { ); } } else { - $allow = api_get_configuration_value('allow_double_validation_in_registration'); + $allow = ('true' === api_get_setting('platform.allow_double_validation_in_registration')); if (false === $allow && $termActivated) { $htmlHeadXtra[] = ''; -if (api_get_configuration_value('quiz_prevent_copy_paste')) { +if ('true' === api_get_setting('exercise.quiz_prevent_copy_paste')) { $htmlHeadXtra[] = ''; } @@ -208,7 +208,7 @@ $stats = ExerciseLib::displayQuestionListByAttempt( $saveResults, $remainingMessage, $allowSignature, - api_get_configuration_value('quiz_results_answers_report'), + ('true' === api_get_setting('exercise.quiz_results_answers_report')), false ); $pageContent .= ob_get_contents(); @@ -226,7 +226,7 @@ $statsTeacher = ExerciseLib::displayQuestionListByAttempt( false, $remainingMessage, $allowSignature, - api_get_configuration_value('quiz_results_answers_report'), + ('true' === api_get_setting('exercise.quiz_results_answers_report')), false ); ob_end_clean(); diff --git a/public/main/exercise/exercise_show.php b/public/main/exercise/exercise_show.php index ff6131e937..9473184962 100644 --- a/public/main/exercise/exercise_show.php +++ b/public/main/exercise/exercise_show.php @@ -136,7 +136,7 @@ if (!$is_allowedToEdit) { } $allowRecordAudio = 'true' === api_get_setting('enable_record_audio'); -$allowTeacherCommentAudio = true === api_get_configuration_value('allow_teacher_comment_audio'); +$allowTeacherCommentAudio = ('true' === api_get_setting('exercise.allow_teacher_comment_audio')); //$js = ''; //$htmlHeadXtra[] = $js; @@ -325,7 +325,7 @@ if ($show_results || $show_only_total_score || $showTotalScoreAndUserChoicesInLa $track_exercise_info, false, false, - api_get_configuration_value('quiz_results_answers_report') + ('true' === api_get_setting('exercise.quiz_results_answers_report')) ); } @@ -689,7 +689,7 @@ foreach ($questionList as $questionId) { echo '