diff options
Diffstat (limited to 'modules-available/adduser')
| -rw-r--r-- | modules-available/adduser/lang/de/template-tags.json | 2 | ||||
| -rw-r--r-- | modules-available/adduser/lang/en/template-tags.json | 2 | ||||
| -rw-r--r-- | modules-available/adduser/page.inc.php | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/modules-available/adduser/lang/de/template-tags.json b/modules-available/adduser/lang/de/template-tags.json index 7c00cdda..c68c36c0 100644 --- a/modules-available/adduser/lang/de/template-tags.json +++ b/modules-available/adduser/lang/de/template-tags.json @@ -2,7 +2,7 @@ "lang_addUser": "Nutzer hinzuf\u00fcgen", "lang_assignRoles": "Rollen zuweisen", "lang_changeLoginHint": "Sie k\u00f6nnen den Namen, den der Nutzer beim Login angeben muss, \u00e4ndern. Dies ist nur bei lokalen Nutzern m\u00f6glich, die nicht \u00fcber LDAP\/AD authentifiziert werden.", - "lang_changeOwnPasswordHint": "Ihr eigenes Passwort k\u00f6nnen Sie \u00fcber den Button \"Passwort \u00e4ndern\" im Men\u00fc \u00e4ndern.", + "lang_changeOwnPasswordHint": "Ihr eigenes Passwort k\u00f6nnen Sie \u00e4ndern, indem Sie auf Ihren Nutzernamen in der Men\u00fcleiste klicken.", "lang_changePassword": "Neues Passwort", "lang_confirmation": "Wiederholen", "lang_createUser": "Benutzer anlegen", diff --git a/modules-available/adduser/lang/en/template-tags.json b/modules-available/adduser/lang/en/template-tags.json index 89413d12..cf202381 100644 --- a/modules-available/adduser/lang/en/template-tags.json +++ b/modules-available/adduser/lang/en/template-tags.json @@ -2,7 +2,7 @@ "lang_addUser": "Add user", "lang_assignRoles": "Assign roles", "lang_changeLoginHint": "You can change the login identifier used for logging in. This is only enabled for local accounts that are not linked to LDAP\/AD servers.", - "lang_changeOwnPasswordHint": "You can change your own password by clicking the \"change password\" button in the menu.", + "lang_changeOwnPasswordHint": "You can change your own password by clicking your username in the menu.", "lang_changePassword": "Change password", "lang_confirmation": "Confirm Password", "lang_createUser": "Create User", diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php index 4ab69919..0ef28a3e 100644 --- a/modules-available/adduser/page.inc.php +++ b/modules-available/adduser/page.inc.php @@ -32,10 +32,8 @@ class Page_AddUser extends Page $email = Request::post('email', '', 'string'); if (empty($login) || empty($pass1) || empty($pass2) || empty($fullname)) { Message::addError('main.empty-field'); - return; } elseif ($pass1 !== $pass2) { Message::addError('password-mismatch'); - return; } else { if (Database::queryFirst('SELECT userid FROM user LIMIT 1') !== false) { User::assertPermission('user.add'); @@ -69,7 +67,6 @@ class Page_AddUser extends Page } Message::addInfo('adduser-success'); $this->saveRoles($id); - return; } } @@ -203,7 +200,7 @@ class Page_AddUser extends Page } elseif ($show === 'list') { User::assertPermission('user.view-list'); $page = new Paginate('SELECT userid, login, fullname, phone, email FROM user ORDER BY login', 50); - $data = ['list' => $page->exec()->fetchAll(PDO::FETCH_ASSOC)]; + $data = ['list' => $page->exec()->fetchAll()]; foreach ($data['list'] as &$u) { // Don't allow deleting user 1 and self $u['hide_delete'] = $u['userid'] == 1 || $u['userid'] == User::getId(); @@ -218,13 +215,13 @@ class Page_AddUser extends Page } } - private function showRoles($userid = false) + private function showRoles(int $userid = null): void { if (!Module::isAvailable('permissionmanager')) return; if (!User::hasPermission('.permissionmanager.users.edit-roles')) return; - $data = ['roles' => PermissionUtil::getRoles($userid, false)]; + $data = ['roles' => PermissionUtil::getRoles($userid)]; Render::addTemplate('user-permissions', $data); } |