From 2b3d56412d8783a2826d12e81c4b77200bab64ff Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 23 Sep 2024 13:57:59 +0000
Subject: [PATCH] fix parameter that should send mails when deleting a user,
fixes #4624
Closes #4624
Merge request studip/studip!3436
---
app/controllers/admin/user.php | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index bf8b9282121..4af6b42470b 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -309,7 +309,18 @@ class Admin_UserController extends AuthenticatedController
$umanager->getFromDatabase($user_id);
//delete
- if ($umanager->deleteUser($delete_documents, $delete_content_from_course, $delete_personal_documents, $delete_personal_content, $delete_names, $delete_memberships, !Request::bool('mail'), $delete_courseware)) {
+ if (
+ $umanager->deleteUser(
+ $delete_documents,
+ $delete_content_from_course,
+ $delete_personal_documents,
+ $delete_personal_content,
+ $delete_names,
+ $delete_memberships,
+ Request::bool('mail', false),
+ $delete_courseware
+ )
+ ) {
$details = explode('§', str_replace(['msg§', 'info§', 'error§'], '', mb_substr($umanager->msg, 0, -1)));
PageLayout::postSuccess(htmlReady(sprintf(_('"%s (%s)" wurde erfolgreich gelöscht.'), $user->getFullName(), $user->username)), $details);
} else {
@@ -346,7 +357,18 @@ class Admin_UserController extends AuthenticatedController
$umanager->getFromDatabase($_user_id);
//delete
- if ($umanager->deleteUser($delete_documents, $delete_content_from_course, $delete_personal_documents, $delete_personal_content, $delete_names, $delete_memberships, !Request::bool('mail'))) {
+ if (
+ $umanager->deleteUser(
+ $delete_documents,
+ $delete_content_from_course,
+ $delete_personal_documents,
+ $delete_personal_content,
+ $delete_names,
+ $delete_memberships,
+ Request::bool('mail', false),
+ $delete_courseware
+ )
+ ) {
$details = explode('§', str_replace(['msg§', 'info§', 'error§'], '', mb_substr($umanager->msg, 0, -1)));
PageLayout::postSuccess(htmlReady(sprintf(_('"%s (%s)" wurde erfolgreich gelöscht'), $users[$i]->getFullName(), $users[$i]->username)), $details);
} else {
--
GitLab