Revert "Add conf limit_session_admin_add_user - refs BT#15003"

This reverts commit 64a1667d87.

main/admin/index.php

@@ -113,6 +113,11 @@ if (api_is_platform_admin()) {
     if (api_get_configuration_value('show_link_request_hrm_user')) {
         $items[] = ['url' => 'user_linking_requests.php', 'label' => get_lang('UserLinkingRequests')];
     }
+} elseif (api_is_session_admin() && api_get_configuration_value('limit_session_admin_role')) {
+    $items = [
+        ['url' => 'user_list.php', 'label' => get_lang('UserList')],
+        ['url' => 'user_add.php', 'label' => get_lang('AddUsers')],
+    ];
 } else {
     $items = [
         ['url' => 'user_list.php', 'label' => get_lang('UserList')],
@@ -120,24 +125,6 @@ if (api_is_platform_admin()) {
         ['url' => 'user_import.php', 'label' => get_lang('ImportUserListXMLCSV')],
         ['url' => 'usergroups.php', 'label' => get_lang('Classes')],
     ];
-
-    if (api_is_session_admin()) {
-        if (true === api_get_configuration_value('limit_session_admin_role')) {
-            $items = array_filter($items, function (array $item) {
-                $urls = ['user_list.php', 'user_add.php'];
-
-                return in_array($item['url'], $urls);
-            });
-        }
-
-        if (true === api_get_configuration_value('limit_session_admin_add_user')) {
-            $items = array_filter($items, function (array $item) {
-                $urls = ['user_add.php'];
-
-                return !in_array($item['url'], $urls);
-            });
-        }
-    }
 }
 
 $blocks['users']['items'] = $items;

main/admin/user_add.php

@@ -14,7 +14,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
 // User permissions
 api_protect_admin_script(true);
 api_protect_limit_for_session_admin();
-api_protect_session_admin_add_user();
 
 $is_platform_admin = api_is_platform_admin() ? 1 : 0;
 

main/inc/lib/api.lib.php

@@ -8993,19 +8993,6 @@ function api_protect_limit_for_session_admin()
     }
 }
 
-/**
- * Limits that a session admin has access to add users.
- * When limit_session_admin_add_user configuration variable is set to true.
- */
-function api_protect_session_admin_add_user()
-{
-    $limitAdmin = api_get_configuration_value('limit_session_admin_add_user');
-
-    if (api_is_session_admin() && true === $limitAdmin) {
-        api_not_allowed(true);
-    }
-}
-
 /**
  * @return bool
  */

main/install/configuration.dist.php

@@ -411,8 +411,6 @@ ALTER TABLE portfolio_category CHANGE title title LONGTEXT NOT NULL;
 //$_configuration['system_announce_extra_roles'] = false;
 // Limits the features that a session admin has access to from the main admin panel (removes users import and usergroups)
 //$_configuration['limit_session_admin_role'] = false;
-// Limits that a session admin has access to add users
-//$_configuration['limit_session_admin_add_user'] = false;
 // Course tools visibility edition in sessions
 //$_configuration['allow_edit_tool_visibility_in_session'] = false;
 // Enable the support to ODF files