From abd3bd1084e397d5f835e23ca467c0dec8c9a110 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Mon, 4 Apr 2022 12:49:48 +0200
Subject: [PATCH] allow (re)setting password for admin and root, fixes #866
---
lib/classes/UserManagement.class.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
index b4c04ba8899..3a98719c489 100644
--- a/lib/classes/UserManagement.class.php
+++ b/lib/classes/UserManagement.class.php
@@ -256,12 +256,12 @@ class UserManagement
}
if (!$perm->is_fak_admin() && $newuser['auth_user_md5.perms'] === 'admin') {
- $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>>Admin-Accounts</em> anzulegen.') . '§';
+ $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Admin-Accounts</em> anzulegen.') . '§';
return false;
}
if (!$perm->have_perm('root') && $newuser['auth_user_md5.perms'] === 'root') {
- $this->msg .= 'error§' . _('Sie haben keine Berechtigung <em>Root-Accounts</em> anzulegen.') . '§';
+ $this->msg .= 'error§' . _('Sie haben keine Berechtigung, <em>Root-Accounts</em> anzulegen.') . '§';
return false;
}
@@ -705,9 +705,8 @@ class UserManagement
);
} else
- // admin and root cannot reset their password via mail
// only users with auth-type standard cann reset their password
- if ($user->perms == 'root' || $user->perms == 'admin' || $user->auth_plugin !== 'standard') {
+ if ($user->auth_plugin !== 'standard') {
// inform user, that their password cannot be reset via mail
$subject = sprintf(
@@ -725,7 +724,6 @@ class UserManagement
. "Wenden sie sich bitte stattdessen an\n%s"
),
Config::get()->UNI_NAME_CLEAN,
- $user->username,
$GLOBALS['UNI_CONTACT']
);
--
GitLab