From fd83fca8bc9136e0958b2cb16972832431583e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Mon, 2 Dec 2024 12:40:57 +0100
Subject: re #4754

---
 app/controllers/course/ilias_interface.php         |  20 +++++++++++---
 app/views/admin/ilias_interface/edit_content.php   |  30 ++++++++++-----------
 .../ilias_interface/edit_interface_settings.php    |   2 +-
 app/views/course/ilias_interface/index.php         |  12 +++++++--
 app/views/my_ilias_accounts/index.php              |  12 +++++----
 doc/de/studip-installation-guide-de-401.pdf        | Bin 83856 -> 0 bytes
 doc/de/verbindung_studip-ilias3.pdf                | Bin 128710 -> 0 bytes
 lib/ilias_interface/ConnectedIlias.php             |   2 +-
 lib/modules/IliasInterfaceModule.php               |  12 +++++++--
 9 files changed, 60 insertions(+), 30 deletions(-)
 delete mode 100644 doc/de/studip-installation-guide-de-401.pdf
 delete mode 100644 doc/de/verbindung_studip-ilias3.pdf

diff --git a/app/controllers/course/ilias_interface.php b/app/controllers/course/ilias_interface.php
index 4f45397..ede6ced 100644
--- a/app/controllers/course/ilias_interface.php
+++ b/app/controllers/course/ilias_interface.php
@@ -90,9 +90,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 kein ILIAS-Kurs 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.'));
+                }
             }
         }
 
@@ -106,7 +114,7 @@ class Course_IliasInterfaceController extends AuthenticatedController
                     Icon::create('add')
                 )->asDialog();
             }
-            if ($this->author_permission) {
+            if ($this->author_permission && $ilias_interface_config['create_objects']) {
                 $widget->addLink(
                     _('Meine Lernobjekte'),
                     $this->url_for('course/ilias_interface/add_object/my_modules'),
@@ -242,7 +250,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 cc0e595..5e36357 100644
--- a/app/views/admin/ilias_interface/edit_content.php
+++ b/app/views/admin/ilias_interface/edit_content.php
@@ -18,8 +18,6 @@
             <input type="text" name="ilias_root_category_name" size="50" maxlength="255" value="<?= htmlReady($ilias_config['root_category_name']) ?>" required>
         <? endif ?>
     </label>
-
-    <!-- TODO Konfigurationsmoeglichkeit, ob Kategorie automatisch erzeugt wird -->
     <? if ($ilias_config['user_data_category']) : ?>
     <label>
         <span class="required"><?= _('Kategorie mit User-Daten') ?></span>
@@ -27,10 +25,10 @@
     </label>
     <? endif ?>
     <? if ($ilias_interface_config['create_category']) : ?>
-    <label>
-        <input type="checkbox" name="ilias_category_create_on_add_module" value="1" <?= $ilias_config['category_create_on_add_module'] ? 'checked' : '' ?>>
-        <span><?= _('Persönliche ILIAS-Kategorie erst erzeugen, wenn Lernobjekte angelegt werden') ?></span>
-    </label>
+        <label>
+            <input type="checkbox" name="ilias_category_create_on_add_module" value="1" <?= $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>
@@ -120,17 +118,19 @@
         <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" <?=$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" <?=$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 43a7594..1b7e90e 100644
--- a/app/views/admin/ilias_interface/edit_interface_settings.php
+++ b/app/views/admin/ilias_interface/edit_interface_settings.php
@@ -17,7 +17,7 @@
     </label>
     <label>
         <input type="checkbox" name="ilias_interface_create_objects" value="1" <?= !empty($ilias_interface_config['create_objects']) ? 'checked' : '' ?>>
-        <span><?= _('Auch Lernobjekte aus ILIAS verknüpfbar') ?></span>
+        <span><?= _('Lernobjekte anlegbar') ?></span>
     </label>
     <label>
         <input type="checkbox" name="ilias_interface_edit_moduletitle" value="1" <?= !empty($ilias_interface_config['edit_moduletitle']) ? 'checked' : '' ?>>
diff --git a/app/views/course/ilias_interface/index.php b/app/views/course/ilias_interface/index.php
index 7d33f20..c7c1e4e 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 (!$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/doc/de/studip-installation-guide-de-401.pdf b/doc/de/studip-installation-guide-de-401.pdf
deleted file mode 100644
index 253c9f3..0000000
Binary files a/doc/de/studip-installation-guide-de-401.pdf and /dev/null differ
diff --git a/doc/de/verbindung_studip-ilias3.pdf b/doc/de/verbindung_studip-ilias3.pdf
deleted file mode 100644
index 28b940f..0000000
Binary files a/doc/de/verbindung_studip-ilias3.pdf and /dev/null differ
diff --git a/lib/ilias_interface/ConnectedIlias.php b/lib/ilias_interface/ConnectedIlias.php
index c215c48..6b9ff55 100644
--- a/lib/ilias_interface/ConnectedIlias.php
+++ b/lib/ilias_interface/ConnectedIlias.php
@@ -1150,7 +1150,7 @@ class ConnectedIlias
                 if (is_array($admin_user_exists)) {
                     $this->user->unsetConnection(true);
                     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($ilias->getName())));
                     }
                 }
             } else return true;
diff --git a/lib/modules/IliasInterfaceModule.php b/lib/modules/IliasInterfaceModule.php
index 54a4916..a7d9266 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 ($this->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 ($this->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