From 7c23cbbf095f86f3377d12e1f0df0e3fa59e8065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20Schr=C3=B6der=2C=20M=2E=20A=2E?=
<schroeder@data-quest.de>
Date: Fri, 6 Sep 2024 14:30:04 +0000
Subject: [PATCH] =?UTF-8?q?Resolve=20"ILIAS-Schnittstelle:=20neues=20Feld?=
=?UTF-8?q?=20matriculation=5Fnumber=20wird=20nicht=20ber=C3=BCcksichtigt"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #4446
Merge request studip/studip!3232
---
app/views/admin/ilias_interface/edit_content.php | 2 +-
lib/ilias_interface/IliasUser.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/admin/ilias_interface/edit_content.php b/app/views/admin/ilias_interface/edit_content.php
index f54a62d909d..f9c0b873218 100644
--- a/app/views/admin/ilias_interface/edit_content.php
+++ b/app/views/admin/ilias_interface/edit_content.php
@@ -45,7 +45,7 @@
<? endif ?>
</label>
<label>
- <span><?= _('Datenfeld (Name) mit Matrikelnummer (wenn leer, wird keine Matrikelnummer übergeben)') ?></span>
+ <span><?= _('Datenfeld (Name) mit Matrikelnummer (nur ausfüllen, wenn die Matrikelnummer in einem Datenfeld gespeichert wird)') ?></span>
<input type="text" name="ilias_matriculation" size="50" maxlength="255" value="<?= htmlReady($ilias_config['matriculation']) ?>">
</label>
<? if (count($ilias_datafields)) : ?>
diff --git a/lib/ilias_interface/IliasUser.php b/lib/ilias_interface/IliasUser.php
index da360827689..c44b3ec1498 100644
--- a/lib/ilias_interface/IliasUser.php
+++ b/lib/ilias_interface/IliasUser.php
@@ -111,7 +111,7 @@ class IliasUser
function getStudipUserData()
{
$query = "SELECT username, password, title_front, title_rear, Vorname,
- Nachname, Email, privatnr, privadr, geschlecht
+ Nachname, Email, privatnr, privadr, geschlecht, matriculation_number
FROM auth_user_md5
LEFT JOIN user_info USING (user_id)
WHERE user_id = ?";
@@ -146,6 +146,8 @@ class IliasUser
$this->matriculation = $entry->getDisplayValue();
}
}
+ } else {
+ $this->matriculation = $data['matriculation_number'];
}
if ($this->title_front != '') {
--
GitLab