From 5ce52895cb15b0f09530007e9cd342997f1b84a1 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 17 Jul 2024 22:24:43 +0200 Subject: [PATCH] Admin: Remove check on multi-URL being enabled in scripts to add URLs --- public/main/admin/access_url_edit.php | 5 ---- public/main/admin/access_urls.php | 42 ++++++++++++--------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/public/main/admin/access_url_edit.php b/public/main/admin/access_url_edit.php index 2abe15e69d..b877277e8b 100644 --- a/public/main/admin/access_url_edit.php +++ b/public/main/admin/access_url_edit.php @@ -14,11 +14,6 @@ $this_section = SECTION_PLATFORM_ADMIN; api_protect_global_admin_script(); -if (!api_get_multiple_access_url()) { - header('Location: index.php'); - exit; -} - $httpRequest = HttpRequest::createFromGlobals(); $form = new FormValidator('add_url'); diff --git a/public/main/admin/access_urls.php b/public/main/admin/access_urls.php index 4796d54685..34ecd301cf 100644 --- a/public/main/admin/access_urls.php +++ b/public/main/admin/access_urls.php @@ -20,11 +20,6 @@ $this_section = SECTION_PLATFORM_ADMIN; //api_protect_admin_script(); api_protect_global_admin_script(); -if (!api_get_multiple_access_url()) { - header('Location: index.php'); - exit; -} - $httpRequest = HttpRequest::createFromGlobals(); $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('Administration')]; @@ -122,31 +117,32 @@ if (-1 == $current_access_url_id) { } $actions = Display::url( - Display::getMdiIcon('new_link', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add URL')), + Display::getMdiIcon('web-plus', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add URL')), api_get_path(WEB_CODE_PATH).'admin/access_url_edit.php' ); -$actions .= Display::url( - Display::getMdiIcon('user', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage users')), - api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php' -); -$actions .= Display::url( - Display::getMdiIcon('course', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage courses')), - api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php' -); +if (api_get_multiple_access_url()) { + $actions .= Display::url( + Display::getMdiIcon('account', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage users')), + api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php' + ); + $actions .= Display::url( + Display::getMdiIcon('book-open-page-variant', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage courses')), + api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php' + ); -$userGroup = new UserGroupModel(); -if ($userGroup->getUseMultipleUrl()) { + $userGroup = new UserGroupModel(); + if ($userGroup->getUseMultipleUrl()) { + $actions .= Display::url( + Display::getMdiIcon('account-group', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage user groups')), + api_get_path(WEB_CODE_PATH).'admin/access_url_edit_usergroup_to_url.php' + ); + } $actions .= Display::url( - Display::getMdiIcon('class', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage user groups')), - api_get_path(WEB_CODE_PATH).'admin/access_url_edit_usergroup_to_url.php' + Display::getMdiIcon('file-tree-outline', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage course categories')), + api_get_path(WEB_CODE_PATH).'admin/access_url_edit_course_category_to_url.php' ); } -$actions .= Display::url( - Display::getMdiIcon('folder', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Manage course categories')), - api_get_path(WEB_CODE_PATH).'admin/access_url_edit_course_category_to_url.php' -); - echo Display::toolbarAction('urls', [$actions]); $data = UrlManager::get_url_data();