From dd5deb52eb5eb1437eb1627fcf25fd86219d66d9 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 f925cba58b5..362d69bb7ae 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.class.php
@@ -849,7 +849,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
@@ -871,7 +871,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
@@ -1866,7 +1866,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 229501f2de0..e5b33cfe566 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