Dashboard: refactor manage modal translations for TRUNK

.github/workflows/legacy-ui.yml

@@ -39,6 +39,13 @@ jobs:
           tools: composer:v2
           coverage: none
 
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: "Install npm version 11"
+        run: sudo npm install -g npm@11
+
       - name: Install Node dependencies
         run: npm clean-install --omit-dev --ignore-scripts
 

components/ILIAS/AccessControl/classes/class.ilClaimingPermissionHelper.php

@@ -99,7 +99,7 @@ abstract protected function buildPermissionMap(): array;
      */
     protected function isValidContextAndAction(
         int $a_context_type,
-        string $a_context_id,
+        int $a_context_id,
         int $a_action_id,
         ?int $a_action_sub_id = null
     ): bool {
@@ -149,7 +149,7 @@ protected function getValidContextIds(int $a_context_type): array
      */
     public function hasPermission(
         int $a_context_type,
-        string $a_context_id,
+        int $a_context_id,
         int $a_action_id,
         ?int $a_action_sub_id = null
     ): bool {
@@ -163,7 +163,7 @@ public function hasPermission(
     /**
      * Check permissions
      */
-    public function hasPermissions(int $a_context_type, string $a_context_id, array $a_action_ids): array
+    public function hasPermissions(int $a_context_type, int $a_context_id, array $a_action_ids): array
     {
         $res = [];
 
@@ -186,12 +186,12 @@ public function hasPermissions(int $a_context_type, string $a_context_id, array
      */
     protected function checkPermission(
         int $a_context_type,
-        string $a_context_id,
+        int $a_context_id,
         int $a_action_id,
         ?int $a_action_sub_id = null
     ): bool {
         return ($this->checkRBAC() &&
-            $this->checkPlugins($a_context_type, (string) $a_context_id, $a_action_id, $a_action_sub_id));
+            $this->checkPlugins($a_context_type, $a_context_id, $a_action_id, $a_action_sub_id));
     }
 
     /**
@@ -216,7 +216,7 @@ abstract protected function getActivePlugins(): Generator;
      */
     protected function checkPlugins(
         int $a_context_type,
-        string $a_context_id,
+        int $a_context_id,
         int $a_action_id,
         ?int $a_action_sub_id = null
     ): bool {
@@ -238,24 +238,4 @@ protected function checkPlugins(
 
         return $valid;
     }
-
-    /**
-     * @return array of object type strings
-     */
-    public function getAllowedObjectTypes(): array
-    {
-        $accepted_types = ['cat','crs','sess','grp','iass','exc','file'];
-
-        $obj_def = new ilObjectDefinition();
-        $adv_md_types = $obj_def->getAdvancedMetaDataTypes();
-
-        $valid_accepted_types = [];
-        foreach ($adv_md_types as $value) {
-            if (in_array($value['obj_type'], $accepted_types) || in_array($value['sub_type'], $accepted_types)) {
-                array_push($valid_accepted_types, $value['obj_type']);
-            }
-        }
-
-        return $valid_accepted_types;
-    }
 }

components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php

@@ -117,8 +117,7 @@ public function executeCommand(): void
                 $eo = ilExportOptions::newInstance(ilExportOptions::allocateExportId());
                 $eo->addOption(ilExportOptions::KEY_ROOT, 0, $this->object->getId(), $this->obj_ref_id);
 
-                $exp = new ilExportGUI($this, new ilObjRole($this->object->getId()));
-                $exp->addFormat('xml');
+                $exp = new ilExportGUI($this, new ilObjRole($this->object->getId()), false);
                 $this->ctrl->forwardCommand($exp);
                 break;
 

components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php

@@ -914,17 +914,26 @@ public function owner(): void
     {
         $this->__initSubTabs('owner');
 
-        $form = new ilPropertyFormGUI();
-        $form->setFormAction($this->ctrl->getFormAction($this, "owner"));
-        $form->setTitle($this->lng->txt("info_owner_of_object"));
+        $this->tpl->setOnScreenMessage('info', $this->lng->txt('chown_warning'));
 
-        $login = new ilTextInputGUI($this->lng->txt("login"), "owner");
-        $login->setDataSource($this->ctrl->getLinkTargetByClass([get_class($this),
-                                                                      'ilRepositorySearchGUI'
-        ], 'doUserAutoComplete', '', true));
+        $form = new ilPropertyFormGUI();
+        $form->setFormAction($this->ctrl->getFormAction($this, 'owner'));
+        $form->setTitle($this->lng->txt('info_owner_of_object'));
+
+        $login = new ilTextInputGUI($this->lng->txt('login'), 'owner');
+        $login->setDataSource(
+            $this->ctrl->getLinkTargetByClass(
+                [
+                    $this::class,
+                    ilRepositorySearchGUI::class
+                ],
+                'doUserAutoComplete',
+                '',
+                true
+            )
+        );
         $login->setRequired(true);
         $login->setSize(50);
-        $login->setInfo($this->lng->txt("chown_warning"));
         $login->setValue(ilObjUser::_lookupLogin($this->gui_obj->getObject()->getOwner()));
         $form->addItem($login);
         $form->addCommandButton("changeOwner", $this->lng->txt("change_owner"));

components/ILIAS/AccessControl/src/Log/Table.php

@@ -172,7 +172,7 @@ public function getTotalRowCount(
         mixed $filter_data,
         mixed $additional_parameters
     ): ?int {
-        return $this->rbac_log->getLogItemsCount($this->getRefId(), $filter_data);
+        return $this->rbac_log->getLogItemsCount($this->getRefId(), $filter_data ?? []);
     }
 
     private function getRefId(): int
@@ -216,7 +216,10 @@ private function applyFilterValuesTrafos(array $filter_values): array
     private function buildChangeColumn(int $action, array $data): string
     {
         if ($action === \ilRbacLog::CHANGE_OWNER) {
-            $user_name = \ilObjUser::_lookupFullname($data[0] ?? 0);
+
+            $user_name = isset($data[0]) && is_numeric($data[0])
+                ? \ilObjUser::_lookupFullname((int) $data[0])
+                : '';
             return "{$this->lng->txt('rbac_log_changed_owner')}: {$user_name}";
         }
 

components/ILIAS/Accordion/Accordion.php

@@ -34,9 +34,5 @@ public function init(
     ): void {
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, "accordion.js");
-        /* This library was missing after discussing dependencies for ILIAS 10
-        $contribute[Component\Resource\PublicAsset::class] = static fn() =>
-            new Component\Resource\NodeModule("owl.carousel/dist/owl.carousel.js");
-        */
     }
 }

components/ILIAS/Accordion/classes/class.ilAccordionGUI.php

@@ -44,9 +44,6 @@ class ilAccordionGUI
     protected string $containerclass = "";
     protected string $id = "";
     protected bool $head_class_set = false;
-    public static string $owl_path = "./node_modules/owl.carousel/dist";
-    public static string $owl_js_path = "/owl.carousel.js";
-    public static string $owl_css_path = "/assets/owl.carousel.css";
     protected ilGlobalTemplateInterface $main_tpl;
     protected string $active_headerclass = "";
     protected string $behaviour = self::FIRST_OPEN;
@@ -228,8 +225,6 @@ public static function addJavaScript(?ilGlobalTemplate $main_tpl = null): void
             $tpl = $DIC["tpl"];
         }
 
-        ilYuiUtil::initConnection($tpl);
-
         foreach (self::getLocalJavascriptFiles() as $f) {
             $tpl->addJavaScript($f, true, 3);
         }
@@ -258,16 +253,14 @@ public static function getLocalJavascriptFiles(): array
             );
         }
         return array(
-            "assets/js/accordion.js",
-            "assets/js" . self::$owl_js_path
+            "assets/js/accordion.js"
         );
     }
 
     public static function getLocalCssFiles(): array
     {
         return array(
-            "./components/ILIAS/Accordion/css/accordion.css",
-            self::$owl_path . self::$owl_css_path
+            "./components/ILIAS/Accordion/css/accordion.css"
         );
     }
 

components/ILIAS/Administration/classes/RecoveryFolder/class.ilObjRecoveryFolderGUI.php

@@ -100,4 +100,19 @@ public function getActions(): array
             "removeFromSystem" => array("name" => "removeFromSystem", "lng" => "btn_remove_system")
         );
     }
+
+    protected function checkPermissionBool(string $perm, string $cmd = "", string $type = "", ?int $ref_id = null): bool
+    {
+        /*
+         * Since nodes in the administration do not have visible permissions anymore,
+         * those object permission checks have to be overwritten.
+         */
+        $operations = explode(',', $perm);
+        $operations = array_diff($operations, ["visible"]);
+        $perm = implode(',', $operations);
+        if ($perm === '') {
+            return true;
+        }
+        return parent::checkPermissionBool($perm, $cmd, $type, $ref_id);
+    }
 }

components/ILIAS/Administration/classes/SystemFolder/class.ilObjSystemFolderGUI.php

@@ -47,6 +47,8 @@ public function viewObject(): void
     public static function _goto(): void
     {
         global $DIC;
+
+        $DIC->ctrl()->setParameterByClass(self::class, 'ref_id', SYSTEM_FOLDER_ID);
         $DIC->ctrl()->redirectByClass([ilAdministrationGUI::class, self::class]);
     }
 }

components/ILIAS/Administration/classes/SystemSupport/class.ilSystemSupportContactsGUI.php

@@ -17,11 +17,13 @@
  *********************************************************************/
 
 use ILIAS\User\Profile\PublicProfileGUI;
+use ILIAS\Data\URI;
 
 /**
  * System support contacts
  *
  * @author Alex Killing <alex.killing@gmx.de>
+ * @ilCtrl_Calls ilSystemSupportContactsGUI: ILIAS\User\Profile\PublicProfileGUI
  */
 class ilSystemSupportContactsGUI implements ilCtrlBaseClassInterface
 {
@@ -61,9 +63,20 @@ public function __construct()
      */
     public function executeCommand()
     {
-        $cmd = $this->ctrl->getCmd("showContacts");
-        if (in_array($cmd, array("showContacts"))) {
-            $this->$cmd();
+        $next_class = $this->ctrl->getNextClass($this);
+
+        switch ($next_class) {
+            case strtolower(PublicProfileGUI::class):
+                $gui = new PublicProfileGUI();
+                $this->ctrl->setReturn($this, 'showContacts');
+                $this->ctrl->forwardCommand($gui);
+                break;
+
+            default:
+                $cmd = $this->ctrl->getCmd("showContacts");
+                if (in_array($cmd, array("showContacts"))) {
+                    $this->$cmd();
+                }
         }
     }
 
@@ -95,18 +108,13 @@ public function showContacts()
         $this->tpl->printToStdout();
     }
 
-
-    /**
-     * Get footer link
-     *
-     * @return string footer link
-     */
-    public static function getFooterLink()
+    public static function getFooterLink(): null|URI|string
     {
         global $DIC;
 
         $ilCtrl = $DIC->ctrl();
         $ilUser = $DIC->user();
+        $uri = $DIC->http()->request()->getUri();
 
         $users = ilSystemSupportContacts::getValidSupportContactIds();
         if (count($users) > 0) {
@@ -116,11 +124,12 @@ public static function getFooterLink()
                     ilSystemSupportContacts::getMailsToAddress()
                 );
             } else {
-                return $ilCtrl->getLinkTargetByClass("ilsystemsupportcontactsgui", "", "", false, false);
+                $path = $ilCtrl->getLinkTargetByClass("ilsystemsupportcontactsgui", "", "", false, false);
+                return new URI($uri->getScheme() . '://' . $uri->getHost() . '/' . $path);
             }
         }
 
-        return "";
+        return null;
     }
 
     /**

components/ILIAS/Administration/classes/class.ilAdministrationGUI.php

@@ -98,6 +98,7 @@ public function __construct()
         $this->ctrl = $DIC->ctrl();
         $this->global_screen = $DIC->globalScreen();
 
+        $this->lng->loadLanguageModule('administration');
         $this->lng->loadLanguageModule('benchmark');
 
         $context = $this->global_screen->tool()->context();

components/ILIAS/AdministrativeNotification/classes/Table.php

@@ -31,7 +31,7 @@
 use ILIAS\UI\URLBuilderToken;
 
 /**
- *
+ * @author Fabian Schmid <fabian@sr.solutions>
  */
 class Table
 {
@@ -45,11 +45,12 @@ class Table
     private ilLanguage $lng;
     private URLBuilder $url_builder;
     private URLBuilderToken $id_token;
+    private bool $write_access;
 
     protected array $components = [];
 
     public function __construct(
-        private ilADNNotificationGUI $calling_gui,
+        private ilADNNotificationGUI $calling_gui
     ) {
         global $DIC;
         $this->ui_factory = $DIC['ui.factory'];
@@ -58,15 +59,16 @@ public function __construct(
         $this->lng = $DIC['lng'];
 
         $this->url_builder = $this->initURIBuilder();
+        $this->write_access = (new ilObjAdministrativeNotificationAccess())->hasUserPermissionTo('write');
         $columns = $this->initColumns();
         $actions = $this->initActions();
         $data_retrieval = new DataRetrieval(
-            (new ilObjAdministrativeNotificationAccess())->hasUserPermissionTo('write')
+            $this->write_access
         );
 
         $this->components[] = $this->ui_factory->table()->data(
             $data_retrieval,
-            $this->lng->txt('notifications'),
+            $this->lng->txt('msg_table_title'),
             $columns,
         )->withActions($actions)->withRequest(
             $DIC->http()->request()
@@ -105,6 +107,10 @@ protected function initColumns(): array
 
     protected function initActions(): array
     {
+        if ($this->write_access === false) {
+            return [];
+        }
+
         return [
             self::ACTION_EDIT => $this->ui_factory->table()->action()->single(
                 $this->lng->txt("btn_edit"),

components/ILIAS/AdministrativeNotification/classes/class.ilADNNotification.php

@@ -142,14 +142,23 @@ public function isVisibleForUser(ilObjUser $ilObjUser): bool
         return ($this->isVisibleToUserBasedOnLanguage($ilObjUser) && $this->isVisibleRoleUserRoles($ilObjUser));
     }
 
-
-    protected function isVisibleToUserBasedOnLanguage(ilObjUser $ilObjUser): bool
+    protected function isVisibleToUserBasedOnLanguage(ilObjUser $user): bool
     {
         if (!$this->hasLanguageLimitation()) {
             return true;
         }
 
-        return in_array($ilObjUser->getLanguage(), $this->getLimitedToLanguages(), true);
+        // Special case for anonymous user
+        if ($user->isAnonymous()) {
+            // current language
+            global $DIC;
+            $current_language = $DIC->http()->request()->getQueryParams()['lang']
+                ?? $DIC->language()->getDefaultLanguage();
+        } else {
+            $current_language = $user->getLanguage();
+        }
+
+        return in_array($current_language, $this->getLimitedToLanguages(), true);
     }