aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorRon Lucke <lucke@elan-ev.de>2023-12-15 08:25:47 +0000
committerRon Lucke <lucke@elan-ev.de>2023-12-15 08:25:47 +0000
commit0e1abc0c9d1bafeb392011b1dedc609b3de6e46f (patch)
treec24daeb218afc294724692d720eb158bd2635ade /app/controllers/admin
parent9da159cf2cb977e13eb9760a3bfa66eec33eeab3 (diff)
fix #1694
Closes #1694 Merge request studip/studip!2459
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/user.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index ad9f054..74daee1 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -273,12 +273,13 @@ class Admin_UserController extends AuthenticatedController
*/
public function delete_action($user_id = null, $parent = '')
{
- $delete_documents = (bool) Request::int('documents');
- $delete_content_from_course = (bool) Request::int('coursecontent');
- $delete_personal_documents = (bool) Request::int('personaldocuments');
- $delete_personal_content = (bool) Request::int('personalcontent');
- $delete_names = (bool) Request::int('personalnames');
- $delete_memberships = (bool) Request::int('memberships');
+ $delete_documents = Request::bool('documents');
+ $delete_courseware = Request::bool('courseware');
+ $delete_content_from_course = Request::bool('coursecontent');
+ $delete_personal_documents = Request::bool('personaldocuments');
+ $delete_personal_content = Request::bool('personalcontent');
+ $delete_names = Request::bool('personalnames');
+ $delete_memberships = Request::bool('memberships');
//deleting one user
if (!is_null($user_id)) {
@@ -299,7 +300,7 @@ 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'), $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 {