diff options
| author | Arne Schröder, M. A. <schroeder@data-quest.de> | 2026-02-06 14:19:44 +0000 |
|---|---|---|
| committer | Rasmus Fuhse <fuhse@data-quest.de> | 2026-02-06 14:19:44 +0000 |
| commit | 2e2da4616c3943c9fa4e0e3b9d285b4f7445e713 (patch) | |
| tree | 6e5ba0c54744ca06e0ade4f77a81170b96328543 /app | |
| parent | 05f3c89e816a1ae8cacc0ec6f07da9bc848d4923 (diff) | |
Resolve "ILIAS-Schnittstelle: Inkompatibilität mit ILIAS 10"
Closes #6160
Merge request studip/studip!4668
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/ilias_interface.php | 6 | ||||
| -rw-r--r-- | app/views/admin/ilias_interface/edit_server.php | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/admin/ilias_interface.php b/app/controllers/admin/ilias_interface.php index 89a8880..9f1e244 100644 --- a/app/controllers/admin/ilias_interface.php +++ b/app/controllers/admin/ilias_interface.php @@ -201,9 +201,9 @@ class Admin_IliasInterfaceController extends AuthenticatedController } // find new unique index $index = 'ilias'.ConnectedIlias::getIntVersion($this->ilias_version); - if (is_array($this->ilias_configs[$index]) || is_array($this->existing_indices[$index])) { + if (!empty($this->ilias_configs[$index]) || !empty($this->existing_indices[$index])) { $i = 1; - while (is_array($this->ilias_configs[$index.'-'.$i]) || is_array($this->existing_indices[$index.'-'.$i])) { + while (!empty($this->ilias_configs[$index.'-'.$i]) || !empty($this->existing_indices[$index.'-'.$i])) { $i++; } $index = $index.'-'.$i; @@ -240,7 +240,7 @@ class Admin_IliasInterfaceController extends AuthenticatedController if ($info['version']) { $this->ilias_version = $info['version']; $this->ilias_version_date = $info['version_date']; - $this->ilias_clients = $info['clients']; + $this->ilias_clients = $info['clients'] ?? []; } else { PageLayout::postInfo(_('ILIAS-Version und Clients konnten nicht automatisch erkannt werden.')); } diff --git a/app/views/admin/ilias_interface/edit_server.php b/app/views/admin/ilias_interface/edit_server.php index 803670a..f9757df 100644 --- a/app/views/admin/ilias_interface/edit_server.php +++ b/app/views/admin/ilias_interface/edit_server.php @@ -60,6 +60,7 @@ <input type="text" name="ilias_version" size="8" maxlength="8" value="<?=htmlReady($ilias_config['version']) ?>" required> <? endif ?> </label> + <? if (!empty($ilias_config['version']) && !empty($ilias_clients)) : ?> <label> <span class="required"> <?= _('Name des ILIAS-Mandanten') ?></span> <? if (isset($ilias_clients) && count($ilias_clients) == 1) : ?> @@ -75,9 +76,10 @@ <input type="text" name="ilias_client" size="50" maxlength="255" value="<?= $ilias_config['client'] ?>" required> <? endif ?> </label> + <? endif ?> <label> <span><?= _('Externe Authentifizierung') ?></span> - <? if ($ldap_options) : ?> + <? if (!empty($ldap_options)) : ?> <select name="ilias_ldap_enable"> <?=$ldap_options;?> </select><br> |