From 361d08355a6630b9080f976cb1e4215b41a9622d Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 14 Oct 2025 07:46:35 +0000
Subject: delete_booking_notification mail: check for user-ID instead of just
 checking for the user object, fixes #5260

Closes #5260

Merge request studip/studip!3944
---
 locale/de/LC_MAILS/delete_booking_notification.php | 12 +++++++++++-
 locale/en/LC_MAILS/delete_booking_notification.php | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/locale/de/LC_MAILS/delete_booking_notification.php b/locale/de/LC_MAILS/delete_booking_notification.php
index 540bbac..aa010c7 100644
--- a/locale/de/LC_MAILS/delete_booking_notification.php
+++ b/locale/de/LC_MAILS/delete_booking_notification.php
@@ -1,3 +1,13 @@
+<?php
+/**
+ * @var int $booking_type
+ * @var Resource $resource
+ * @var ?Course $booking_course
+ * @var ?User $deleting_user
+ * @var int $begin
+ * @var int $end
+ */
+?>
 <? if (in_array($booking_type, [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_PLANNED])) : ?>
 <? if ($resource instanceof Room): ?>
 Ihre Buchung des Raumes <?= $resource->name ?> am <?= date('d.m.Y', $begin) ?>
@@ -34,6 +44,6 @@ Es handelte sich um eine Sperrbuchung für die Veranstaltung <?= $booking_course
 <? endif ?>
 <? endif ?>
 
-<? if ($deleting_user instanceof User) : ?>
+<? if ($deleting_user && !in_array($deleting_user->id, ['nobody', 'form'])) : ?>
 Die Löschung wurde von <?= $deleting_user->getFullName() ?> vorgenommen.
 <? endif ?>
diff --git a/locale/en/LC_MAILS/delete_booking_notification.php b/locale/en/LC_MAILS/delete_booking_notification.php
index 55bbc7e..c19433c 100644
--- a/locale/en/LC_MAILS/delete_booking_notification.php
+++ b/locale/en/LC_MAILS/delete_booking_notification.php
@@ -1,3 +1,13 @@
+<?php
+/**
+ * @var int $booking_type
+ * @var Resource $resource
+ * @var ?Course $booking_course
+ * @var ?User $deleting_user
+ * @var int $begin
+ * @var int $end
+ */
+?>
 <? if (in_array($booking_type, [ResourceBooking::TYPE_NORMAL, ResourceBooking::TYPE_PLANNED])) : ?>
 <? if ($resource instanceof Room): ?>
 Your booking of the room <?= $resource->name ?> on <?= date('d.m.Y', $begin) ?>
@@ -34,6 +44,6 @@ The deleted lock booking belonged to course <?= $booking_course->getFullName() ?
 <? endif ?>
 <? endif ?>
 
-<? if ($deleting_user instanceof User) : ?>
+<? if ($deleting_user && !in_array($deleting_user->id, ['nobody', 'form'])) : ?>
 The deletion has been made by <?= $deleting_user->getFullName() ?>.
 <? endif ?>
-- 
cgit v1.0