From 9360ea5d075fddbbec3dedb51e064b13d9f05343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Tue, 24 Jun 2025 13:01:56 +0200
Subject: re #4754

Merge request studip/studip!3796
---
 app/controllers/admin/ilias_interface.php          |  6 ++-
 app/controllers/course/ilias_interface.php         | 20 ++++++--
 app/views/admin/ilias_interface/edit_content.php   | 37 +++++++-------
 .../ilias_interface/edit_interface_settings.php    | 10 +++-
 .../admin/ilias_interface/edit_permissions.php     | 16 +++----
 app/views/course/ilias_interface/index.php         | 12 ++++-
 app/views/my_ilias_accounts/index.php              | 12 +++--
 lib/ilias_interface/ConnectedIlias.php             | 56 +++++++++++++++-------
 lib/modules/IliasInterfaceModule.php               | 12 ++++-
 9 files changed, 124 insertions(+), 57 deletions(-)

diff --git a/app/controllers/admin/ilias_interface.php b/app/controllers/admin/ilias_interface.php
index dfb8f0a..ee069c4 100644
--- a/app/controllers/admin/ilias_interface.php
+++ b/app/controllers/admin/ilias_interface.php
@@ -104,6 +104,8 @@ class Admin_IliasInterfaceController extends AuthenticatedController
             $this->ilias_interface_config['cache'] = Request::bool('ilias_interface_cache', false);
             $this->ilias_interface_config['allow_change_course'] = Request::get('ilias_interface_allow_change_course');
             $this->ilias_interface_config['allow_add_own_course'] = Request::get('ilias_interface_allow_add_own_course');
+            $this->ilias_interface_config['create_category'] = (boolean)Request::get('ilias_interface_create_category');
+            $this->ilias_interface_config['create_objects'] = (boolean)Request::get('ilias_interface_create_objects');
 
             //store config entry
             Config::get()->store('ILIAS_INTERFACE_BASIC_SETTINGS', $this->ilias_interface_config);
@@ -433,14 +435,14 @@ class Admin_IliasInterfaceController extends AuthenticatedController
                             }
                             if (array_key_exists($ilias_role, $this->global_roles)) {
                                 $this->ilias_configs[$index]['additional_roles'][$studip_role][$ilias_role] = [
-                                    'id' => $this->global_roles[$ilias_role]['id'], 
+                                    'id' => $this->global_roles[$ilias_role]['id'],
                                     'name' => $this->global_roles[$ilias_role]['name']];
                                 PageLayout::postSuccess(sprintf(_('ILIAS-Rolle %s wird Stud.IP-Rechtestufe %s zugewiesen.'), $this->global_roles[$ilias_role]['name'], $studip_role));
                             } else {
                                 PageLayout::postError(_('ILIAS-Rolle nicht gefunden.'));
                             }
                         }
-                    } 
+                    }
 
                     //store config entry
                     Config::get()->store('ILIAS_INTERFACE_SETTINGS', $this->ilias_configs);
diff --git a/app/controllers/course/ilias_interface.php b/app/controllers/course/ilias_interface.php
index d79ed0b..13307bf 100644
--- a/app/controllers/course/ilias_interface.php
+++ b/app/controllers/course/ilias_interface.php
@@ -89,9 +89,17 @@ class Course_IliasInterfaceController extends AuthenticatedController
 
         if (($this->module_count == 0) && (!$this->courses)) {
             if (Context::isInstitute()) {
-                PageLayout::postInfo(_('Momentan sind dieser Einrichtung keine Lernobjekte zugeordnet.'));
+                if ($this->ilias_interface_config['create_objects']) {
+                    PageLayout::postInfo(_('Momentan sind dieser Einrichtung keine Lernobjekte zugeordnet.'));
+                } else {
+                    PageLayout::postInfo(_('Momentan sind dieser Einrichtung keine ILIAS-Kurse zugeordnet.'));
+                }
             } else {
-                PageLayout::postInfo(_('Momentan sind dieser Veranstaltung keine Lernobjekte zugeordnet.'));
+                if ($this->ilias_interface_config['create_objects']) {
+                    PageLayout::postInfo(_('Momentan sind dieser Veranstaltung keine Lernobjekte zugeordnet.'));
+                } else {
+                    PageLayout::postInfo(_('Momentan ist dieser Veranstaltung kein ILIAS-Kurs zugeordnet.'));
+                }
             }
         }
 
@@ -105,7 +113,7 @@ class Course_IliasInterfaceController extends AuthenticatedController
                     Icon::create('add')
                 )->asDialog();
             }
-            if ($this->author_permission) {
+            if ($this->author_permission && $this->ilias_interface_config['create_objects']) {
                 $widget->addLink(
                     _('Meine Lernobjekte'),
                     $this->url_for('course/ilias_interface/add_object/my_modules'),
@@ -241,7 +249,11 @@ class Course_IliasInterfaceController extends AuthenticatedController
      */
     public function add_object_action($mode = 'search', $index = '')
     {
-        PageLayout::setTitle(_('Lernobjekt hinzufügen'));
+        if ($this->ilias_interface_config['create_objects']) {
+            PageLayout::setTitle(_('Lernobjekt hinzufügen'));
+        } else {
+            PageLayout::setTitle(_('Neuen ILIAS-Kurs anlegen'));
+        }
 
         if (!$this->edit_permission) {
             throw new AccessDeniedException();
diff --git a/app/views/admin/ilias_interface/edit_content.php b/app/views/admin/ilias_interface/edit_content.php
index 2fdc534..a67fa21 100644
--- a/app/views/admin/ilias_interface/edit_content.php
+++ b/app/views/admin/ilias_interface/edit_content.php
@@ -11,9 +11,9 @@
     <?= CSRFProtection::tokenTag() ?>
     <input type="hidden" name="ilias_content_settings" size="50" maxlength="255" value="1">
     <label>
-        <span class="required"><?= _('Wurzelkategorie für Stud.IP-Daten') ?></span>
-        <? if (!empty($ilias_config['root_category'])) : ?>
-            <div><?=htmlReady($ilias_config['root_category_name']).' (ID '.htmlReady($ilias_config['root_category']).')'?></div>
+        <span class="required"><?= _('Name oder ID der Wurzelkategorie für Stud.IP-Daten') ?></span>
+        <? if (!empty($ilias_config['root_category_name'])) : ?>
+            <div><?= htmlReady($ilias_config['root_category_name']) ?></div>
         <? else : ?>
             <input type="text" name="ilias_root_category_name" size="50" maxlength="255" value="<?= empty($ilias_config['root_category_name']) ? '' : htmlReady($ilias_config['root_category_name']) ?>" required>
         <? endif ?>
@@ -24,10 +24,12 @@
         <div><?= _('User_daten').' (ID '.htmlReady($ilias_config['user_data_category']).')'?></div>
     </label>
     <? endif ?>
-    <label>
-        <input type="checkbox" name="ilias_category_create_on_add_module" value="1" <?= !empty($ilias_config['category_create_on_add_module']) ? 'checked' : '' ?>>
-        <span><?= _('Persönliche ILIAS-Kategorie erst erzeugen, wenn Lernobjekte angelegt werden') ?></span>
-    </label>
+    <? if ($ilias_interface_config['create_category']) : ?>
+        <label>
+            <input type="checkbox" name="ilias_category_create_on_add_module" value="1" <?= !empty($ilias_config['category_create_on_add_module']) ? 'checked' : '' ?>>
+            <span><?= _('Persönliche ILIAS-Kategorie erst erzeugen, wenn Lernobjekte angelegt werden') ?></span>
+        </label>
+    <? endif ?>
     <? if (array_key_exists('version', $ilias_config) && (ConnectedIlias::getIntVersion($ilias_config['version']) >= 50400) && (ConnectedIlias::getIntVersion($ilias_config['version']) < 60000)) : ?>
         <label>
             <input type="checkbox" name="ilias_category_to_desktop" value="1" <?= !empty($ilias_config['category_to_desktop']) ? 'checked' : '' ?>>
@@ -116,17 +118,20 @@
         <input type="checkbox" name="ilias_delete_ilias_courses" value="1" <?= !empty($ilias_config['delete_ilias_courses']) ? 'checked' : '' ?>>
         <span><?= _('Beim Löschen von Stud.IP-Veranstaltungen ILIAS-Kurse ebenfalls löschen (alle untergeordneten Objekte werden gelöscht!)') ?></span>
     </label>
-    <label>
-    <span>  <?= _('Module') ?></span>
-    </label>
-    <label>
-        <? foreach ($modules_available as $module_index => $module_name) : ?>
+
+    <? if ($ilias_interface_config['create_objects']) : ?>
         <label>
-            <input type="checkbox" name="ilias_modules_<?=$module_index?>" value="1" <?=!empty($ilias_config['modules'][$module_index]) ? ' checked':''?>>
-            <?=htmlReady($module_name)?>
+        <span>  <?= _('Module') ?></span>
         </label>
-        <? endforeach ?>
-    </label>
+        <label>
+            <? foreach ($modules_available as $module_index => $module_name) : ?>
+                <label>
+                    <input type="checkbox" name="ilias_modules_<?= $module_index ?>" value="1" <?= !empty($ilias_config['modules'][$module_index]) ? ' checked' : '' ?>>
+                    <?=htmlReady($module_name)?>
+                </label>
+            <? endforeach ?>
+        </label>
+    <? endif ?>
     <footer data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'submit') ?>
         <?= Studip\Button::createCancel(_('Abbrechen'), 'cancel', ['data-dialog' => 'close']) ?>
diff --git a/app/views/admin/ilias_interface/edit_interface_settings.php b/app/views/admin/ilias_interface/edit_interface_settings.php
index 5936d5e..03b87d0 100644
--- a/app/views/admin/ilias_interface/edit_interface_settings.php
+++ b/app/views/admin/ilias_interface/edit_interface_settings.php
@@ -8,10 +8,18 @@
 <form class="default" action="<?= $controller->url_for('admin/ilias_interface/save_interface_settings/') ?>" method="post">
     <?= CSRFProtection::tokenTag() ?>
     <label>
-        <span class="required"><?= _('Name des Moduls "ILIAS-Schnittstelle" in Veranstaltungen') ?></span>
+        <span class="required"><?= _('Name des Moduls „ILIAS-Schnittstelle“ in Veranstaltungen') ?></span>
         <input type="text" name="ilias_interface_moduletitle" size="50" maxlength="255" value="<?= htmlReady($ilias_interface_moduletitle) ?>" required>
     </label>
     <label>
+        <input type="checkbox" name="ilias_interface_create_category" value="1" <?= !empty($ilias_interface_config['create_category']) ? 'checked' : '' ?>>
+        <span><?= _('Persönliche Kategorie automatisch anlegen') ?></span>
+    </label>
+    <label>
+        <input type="checkbox" name="ilias_interface_create_objects" value="1" <?= !empty($ilias_interface_config['create_objects']) ? 'checked' : '' ?>>
+        <span><?= _('Lernobjekte anlegbar') ?></span>
+    </label>
+    <label>
         <input type="checkbox" name="ilias_interface_edit_moduletitle" value="1" <?= !empty($ilias_interface_config['edit_moduletitle']) ? 'checked' : '' ?>>
         <span><?= _('Lehrende können den Seitennamen der ILIAS-Schnittstelle in Veranstaltungen anpassen') ?></span>
     </label>
diff --git a/app/views/admin/ilias_interface/edit_permissions.php b/app/views/admin/ilias_interface/edit_permissions.php
index 3410a02..12242a5 100644
--- a/app/views/admin/ilias_interface/edit_permissions.php
+++ b/app/views/admin/ilias_interface/edit_permissions.php
@@ -12,17 +12,17 @@
             <?= _('Anlegen von Inhalten') ?>
         </legend>
         <label>
-            <span class="required"><?= _('Rollentemplate zum Erstellen von Lernobjekten') ?></span>
+            <span class="required"><?= _('Name oder ID des Rollen-Templates zum Erstellen von Lernobjekten') ?></span>
             <input type="text" name="ilias_author_role_name" size="50" maxlength="255" value="<?= $ilias_config['author_role_name'] ? htmlReady($ilias_config['author_role_name']) : 'Author' ?>" required>
         </label>
         <label>
             <span class="required"><?= _('Erforderliche Rechtestufe zum Erstellen von Lernobjekten') ?></span>
             <select name="ilias_author_perm">
-            	<option value="autor" <?=$ilias_config['author_perm'] == 'autor' ? 'selected' : ''?>><?=_('autor')?></option>
-            	<option value="tutor" <?=$ilias_config['author_perm'] == 'tutor' ? 'selected' : ''?>><?=_('tutor')?></option>
-            	<option value="dozent" <?=(($ilias_config['author_perm'] == 'dozent') OR ! $ilias_config['author_perm']) ? 'selected' : ''?>><?=_('dozent')?></option>
-            	<option value="admin" <?=$ilias_config['author_perm'] == 'admin' ? 'selected' : ''?>><?=_('admin')?></option>
-            	<option value="root" <?=$ilias_config['author_perm'] == 'root' ? 'selected' : ''?>><?=_('root')?></option>
+                <option value="autor" <?= $ilias_config['author_perm'] == 'autor' ? 'selected' : '' ?>><?= _('autor') ?></option>
+                <option value="tutor" <?= $ilias_config['author_perm'] == 'tutor' ? 'selected' : '' ?>><?= _('tutor') ?></option>
+                <option value="dozent" <?= (($ilias_config['author_perm'] == 'dozent') OR ! $ilias_config['author_perm']) ? 'selected' : '' ?>><?= _('dozent') ?></option>
+                <option value="admin" <?= $ilias_config['author_perm'] == 'admin' ? 'selected' : '' ?>><?= _('admin') ?></option>
+                <option value="root" <?= $ilias_config['author_perm'] == 'root' ? 'selected' : '' ?>><?= _('root') ?></option>
             </select>
         </label>
         <label>
@@ -32,7 +32,7 @@
     </fieldset>
     <footer data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'submit') ?>
-        <?= Studip\Button::createCancel(_('Schließen'), 'cancel', ['data-dialog' => 'close']) ?>
+        <?= Studip\Button::createCancel(_('Abbrechen'), 'cancel', ['data-dialog' => 'close']) ?>
     </footer>
     <fieldset>
         <legend>
@@ -50,7 +50,7 @@
                                 'title' => _('Diese Rollenzuweisung entfernen'),
                                 'data-confirm' => _('Sind Sie sicher, dass Sie diese ILIAS-Rollenzuweisung entfernen wollen?'),
                                 'formaction' => $controller->url_for(
-                                    'admin/ilias_interface/save/'.$ilias_index, 
+                                    'admin/ilias_interface/save/'.$ilias_index,
                                     [
                                         'remove_additional_role' => $role_data['id'],
                                         'studip_role' => $studip_role,
diff --git a/app/views/course/ilias_interface/index.php b/app/views/course/ilias_interface/index.php
index f713580..0acfe40 100644
--- a/app/views/course/ilias_interface/index.php
+++ b/app/views/course/ilias_interface/index.php
@@ -6,7 +6,11 @@
     <? endif?>
     <table class="default">
         <caption>
-            <?= sprintf(_('Lernobjekte in %s'), htmlReady($ilias->getName()))?>
+            <? if ($ilias_interface_config['create_objects']) : ?>
+                <?= sprintf(_('Lernobjekte in %s'), htmlReady($ilias->getName()))?>
+            <? else : ?>
+                <?= sprintf(_('Kurs in %s'), htmlReady($ilias->getName()))?>
+            <? endif ?>
         </caption>
         <colgroup>
             <col style="width: 5%">
@@ -83,7 +87,11 @@
     <? elseif (empty($courses[$ilias_index])) : ?>
         <tr>
             <td colspan="4">
-                <?= _('Es sind keine Lernobjekte mit dieser Veranstaltung verknüpft.')?>
+                <? if ($ilias_interface_config['create_objects']) : ?>
+                    <?= _('Es sind keine Lernobjekte mit dieser Veranstaltung verknüpft.')?>
+                <? else : ?>
+                    <?= _('Es ist kein ILIAS-Kurs mit dieser Veranstaltung verknüpft.')?>
+                <? endif ?>
             </td>
         </tr>
     <? else : ?>
diff --git a/app/views/my_ilias_accounts/index.php b/app/views/my_ilias_accounts/index.php
index de87919..76668be 100644
--- a/app/views/my_ilias_accounts/index.php
+++ b/app/views/my_ilias_accounts/index.php
@@ -4,11 +4,13 @@
     <table class="default">
         <caption>
             <?= sprintf(_('Meine Lernobjekte in %s'), $ilias->getName()) ?>
-            <span class="actions">
-                <a href="<?= $controller->url_for('my_ilias_accounts/add_object/'.$ilias_index) ?>" data-dialog="size=auto">
-                    <?= Icon::create('add', Icon::ROLE_CLICKABLE, tooltip2(_('Neues Lernobjekt anlegen'))) ?>
-                </a>
-            </span>
+            <? if ($ilias_interface_config['create_objects']) : ?>
+                <span class="actions">
+                    <a href="<?= $controller->url_for('my_ilias_accounts/add_object/'.$ilias_index) ?>" data-dialog="size=auto">
+                        <?= Icon::create('add', Icon::ROLE_CLICKABLE, tooltip2(_('Neues Lernobjekt anlegen'))) ?>
+                    </a>
+                </span>
+            <? endif ?>
         </caption>
         <colgroup>
             <col style="width: 5%">
diff --git a/lib/ilias_interface/ConnectedIlias.php b/lib/ilias_interface/ConnectedIlias.php
index 846fd2c..3c4332e 100644
--- a/lib/ilias_interface/ConnectedIlias.php
+++ b/lib/ilias_interface/ConnectedIlias.php
@@ -346,17 +346,29 @@ class ConnectedIlias
         if (!$this->ilias_config['root_category']) {
             // check category
             if (!$this->ilias_config['root_category_name']) {
-                $this->error[] = _("Die ILIAS-Kategorie für Stud.IP-Inhalte wurde noch nicht festgelegt.");
+                $this->error[] = _('Die ILIAS-Kategorie für Stud.IP-Inhalte wurde noch nicht festgelegt.');
                 return false;
             }
-            $category = $this->soap_client->getReferenceByTitle($this->ilias_config['root_category_name'], 'cat');
+
+            // if an ID was entered, simply use it; else get the ID by title/name
+            if ($this->ilias_config['root_category_name'] !== null) {
+                if (is_numeric($this->ilias_config['root_category_name'])) {
+                    $category = $this->ilias_config['root_category_name'];
+                } else {
+                    $category = $this->soap_client->getReferenceByTitle($this->ilias_config['root_category_name'], 'cat');
+                }
+            }
             if (!$category) {
-                $this->error[] = sprintf(_("Die Kategorie \"%s\" wurde nicht gefunden."), $this->ilias_config['root_category_name']);
+                $this->error[] = sprintf(_('Die Kategorie „%s“ wurde nicht gefunden.'), $this->ilias_config['root_category_name']);
                 return false;
             }
             if ($category) {
-                $this->ilias_config['root_category'] = $category;
-
+                // no ID entered manually
+                if ($this->ilias_config['root_category'] == null) {
+                    $this->ilias_config['root_category'] = $category;
+                } else {
+                    $this->ilias_config['root_category_name'] = $category['title'];
+                }
                 // check user data category
                 if (! $this->ilias_config['user_data_category']) {
                     $object_data["title"] = sprintf(_("User-Daten"));
@@ -392,18 +404,27 @@ class ConnectedIlias
             $this->error[] = _("Das Rollen-Template für die persönliche Kategorie wurde noch nicht festgelegt.");
             return false;
         }
-        $role_template = $this->soap_client->getObjectByTitle( $this->ilias_config['author_role_name'], "rolt" );
-        if ($role_template == false) {
-            $this->error[] = sprintf(_("Das Rollen-Template mit dem Namen \"%s\" wurde im System %s nicht gefunden."), htmlReady($this->ilias_config['author_role_name']), htmlReady($this->getName()));
-            return false;
-        }
-        if (is_array($role_template))
-        {
-            $this->ilias_config['author_role'] = $role_template["obj_id"];
-            $this->ilias_config['author_role_name'] = $role_template["title"];
+        // if an ID was entered, simply use it; else check for title
+        if (!is_numeric($this->ilias_config['author_role_name'])) {
+
+            $role_template = $this->soap_client->getObjectByTitle($this->ilias_config['author_role_name'], 'rolt');
+
+            if ($role_template == false) {
+                $this->error[] = sprintf(_('Das Rollen-Template mit dem Namen „%1$s“ wurde im System %2$s nicht gefunden.'), htmlReady($this->ilias_config['author_role_name']), htmlReady($this->getName()));
+                return false;
+            }
+            if (is_array($role_template))
+            {
+                $this->ilias_config['author_role'] = $role_template["obj_id"];
+                $this->storeSettings();
+            }
+            return true;
+        } else {
+            $this->ilias_config['author_role'] = 'object_id_' . $this->ilias_config['author_role_name'];
             $this->storeSettings();
+            return true;
         }
-        return true;
+
     }
 
     /**
@@ -1195,7 +1216,7 @@ class ConnectedIlias
 
 
     /**
-     * check Ilias user entry 
+     * check Ilias user entry
      *
      * checks if ILIAS user exists and removes auth_extern entry otherwise
      * @access public
@@ -1233,7 +1254,8 @@ class ConnectedIlias
     {
         if (! $this->checkIliasUserEntry()) {
             if ($this->newUser()) {
-                PageLayout::postSuccess(_("Neue Verknüpfung zu ILIAS-User angelegt."));
+                PageLayout::postSuccess(sprintf(_('Neues Konto in %s angelegt und mit Stud.IP-Konto verknüpft.'),
+                            htmlReady($this->ilias_config['name'])));
             }
             return false;
         }
diff --git a/lib/modules/IliasInterfaceModule.php b/lib/modules/IliasInterfaceModule.php
index a4d5a00..97a3286 100644
--- a/lib/modules/IliasInterfaceModule.php
+++ b/lib/modules/IliasInterfaceModule.php
@@ -140,9 +140,17 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu
         $navigation->setActiveImage(Icon::create('learnmodule', Icon::ROLE_INFO));
         if ($GLOBALS['perm']->have_studip_perm('tutor', $course_id) || ($GLOBALS['perm']->have_studip_perm('autor', $course_id) && IliasObjectConnections::isCourseConnected($course_id))) {
             if (get_object_type($course_id, ['inst'])) {
-                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Einrichtung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                if ($ilias_interface_config['create_objects']) {
+                    $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Einrichtung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                } else {
+                    $navigation->addSubNavigation('view', new Navigation(_('ILIAS-Kurs zu dieser Einrichtung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                }
             } else {
-                $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Veranstaltung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                if ($ilias_interface_config['create_objects']) {
+                    $navigation->addSubNavigation('view', new Navigation(_('Lernobjekte dieser Veranstaltung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                } else {
+                    $navigation->addSubNavigation('view', new Navigation(_('ILIAS-Kurs zu dieser Veranstaltung'), 'dispatch.php/course/ilias_interface/index/' . $course_id));
+                }
             }
         }
 
-- 
cgit v1.0