From 88fc134daf24a819e59087a8478d895acf2be812 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 11 May 2022 10:52:03 +0000
Subject: [PATCH] set sender for messages regarding resource requests and
bookings to the actual...
Closes #942
Merge request studip/studip!544
---
lib/models/resources/ResourceBooking.class.php | 6 +++---
lib/models/resources/ResourceRequest.class.php | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php
index fe4e4be817b..d7c1b2f8b9a 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -848,7 +848,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$mail_text = $template->render();
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
[$reservation->assigned_user->username],
_('Reservierung überbucht'),
$mail_text
@@ -870,7 +870,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$mail_text = $template->render();
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
[$reservation->booking_user->username],
_('Reservierung überbucht'),
$mail_text
@@ -1865,7 +1865,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$mail_text = $template->render();
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
[$booking_user->username],
_('Ihre Buchung wurde gelöscht'),
$mail_text
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index b66fb54072c..648d83c9c6d 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1908,7 +1908,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
}
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
$user->username,
$mail_title,
$mail_text
@@ -1990,7 +1990,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$mail_text = $template->render();
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
$this->user->username,
$mail_title,
$mail_text
@@ -2079,7 +2079,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$mail_text = $template->render();
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
$lecturer->user->username,
$mail_title,
$mail_text
@@ -2128,7 +2128,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
//Send the mail:
Message::send(
- '____%system%____',
+ User::findCurrent()->id,
$user->username,
$mail_title,
$mail_text
--
GitLab