From f73a41753d2608187a0c85a28e419b8ea839d671 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 23 Feb 2018 15:26:17 +0100
Subject: [adduser] Extend module to simple user manager (add/edit/remove)

TODO: Assign roles
---
 modules-available/adduser/lang/en/messages.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules-available/adduser/lang/en/messages.json')

diff --git a/modules-available/adduser/lang/en/messages.json b/modules-available/adduser/lang/en/messages.json
index 3a402278..69af3227 100644
--- a/modules-available/adduser/lang/en/messages.json
+++ b/modules-available/adduser/lang/en/messages.json
@@ -1,5 +1,8 @@
 {
+    "adduser-success": "User successfully added",
+    "db-error": "Database error: {{0}}",
+    "password-changed": "Password changed",
     "password-mismatch": "Password and password confirmation do not match",
-    "adduser-disabled": "Insufficient privileges to add more users",
-    "adduser-success": "User successfully added"
+    "user-edited": "User data has been updated",
+    "user-not-found": "User with ID {{0}} not found"
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 3945fad76dc623e784cfb4fedee1978e99958a4e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Mar 2018 11:31:25 +0100
Subject: [adduser] Fix delete message, add translations

---
 modules-available/adduser/lang/de/messages.json    |  3 +++
 .../adduser/lang/de/template-tags.json             |  4 ++++
 modules-available/adduser/lang/en/messages.json    |  3 +++
 .../adduser/lang/en/template-tags.json             |  4 ++++
 .../adduser/templates/page-userlist.html           | 24 ++++++++++++++++------
 5 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'modules-available/adduser/lang/en/messages.json')

diff --git a/modules-available/adduser/lang/de/messages.json b/modules-available/adduser/lang/de/messages.json
index 0ab4571f..207e8056 100644
--- a/modules-available/adduser/lang/de/messages.json
+++ b/modules-available/adduser/lang/de/messages.json
@@ -1,8 +1,11 @@
 {
     "adduser-success": "Benutzer erfolgreich hinzugef\u00fcgt",
+    "cannot-delete-1-self": "Sie k\u00f6nnen nicht den Benutzer mit der ID 1 oder sich selbst l\u00f6schen",
     "db-error": "Datenbankfehler: {{0}}",
     "password-changed": "Passwort ge\u00e4ndert",
     "password-mismatch": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein",
+    "roles-updated": "Rollen aktualisiert",
+    "user-deleted": "Benutzer {{0}} gel\u00f6scht",
     "user-edited": "Benutzerdaten wurden ge\u00e4ndert",
     "user-not-found": "Benutzer mit ID {{0}} nicht gefunden"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/lang/de/template-tags.json b/modules-available/adduser/lang/de/template-tags.json
index 0b6b2530..31a7871e 100644
--- a/modules-available/adduser/lang/de/template-tags.json
+++ b/modules-available/adduser/lang/de/template-tags.json
@@ -1,8 +1,10 @@
 {
     "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_changePassword": "Neues Passwort",
+    "lang_confirmDelete": "L\u00f6schen best\u00e4tigen",
     "lang_confirmation": "Wiederholen",
     "lang_createUser": "Benutzer anlegen",
     "lang_editUser": "Benutzer bearbeiten",
@@ -11,6 +13,8 @@
     "lang_login": "Login",
     "lang_name": "Name",
     "lang_phone": "Telefon",
+    "lang_role": "Rolle",
+    "lang_userDeleteConfirm": "M\u00f6chten Sie diesen Benutzer wirklich l\u00f6schen?",
     "lang_userManagement": "Benutzerverwaltung",
     "lang_userlist": "Benutzerliste"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/lang/en/messages.json b/modules-available/adduser/lang/en/messages.json
index 69af3227..d55e0ec6 100644
--- a/modules-available/adduser/lang/en/messages.json
+++ b/modules-available/adduser/lang/en/messages.json
@@ -1,8 +1,11 @@
 {
     "adduser-success": "User successfully added",
+    "cannot-delete-1-self": "Cannot delete user with ID 1 or yourself",
     "db-error": "Database error: {{0}}",
     "password-changed": "Password changed",
     "password-mismatch": "Password and password confirmation do not match",
+    "roles-updated": "Roles have been updated",
+    "user-deleted": "Deleted user {{0}}",
     "user-edited": "User data has been updated",
     "user-not-found": "User with ID {{0}} not found"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/lang/en/template-tags.json b/modules-available/adduser/lang/en/template-tags.json
index 2c9b8b53..4fe03711 100644
--- a/modules-available/adduser/lang/en/template-tags.json
+++ b/modules-available/adduser/lang/en/template-tags.json
@@ -1,8 +1,10 @@
 {
     "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 acounts 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_changePassword": "Change password",
+    "lang_confirmDelete": "Confirm delete",
     "lang_confirmation": "Confirm Password",
     "lang_createUser": "Create User",
     "lang_editUser": "Edit user",
@@ -11,6 +13,8 @@
     "lang_login": "Login",
     "lang_name": "Name",
     "lang_phone": "Phone",
+    "lang_role": "Role",
+    "lang_userDeleteConfirm": "Do you want to delete this user?",
     "lang_userManagement": "User management",
     "lang_userlist": "User list"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/templates/page-userlist.html b/modules-available/adduser/templates/page-userlist.html
index 5b14f7e5..8d9c6de0 100644
--- a/modules-available/adduser/templates/page-userlist.html
+++ b/modules-available/adduser/templates/page-userlist.html
@@ -18,7 +18,7 @@
 		<tbody>
 		{{#list}}
 			<tr>
-				<td>{{login}}</td>
+				<td id="user-{{userid}}">{{login}}</td>
 				<td>{{fullname}}</td>
 				<td>{{phone}}</td>
 				<td>{{email}}</td>
@@ -27,8 +27,8 @@
 						<span class="glyphicon glyphicon-edit"></span>
 					</button>
 					{{^hide_delete}}
-					<button type="button" {{perms.user.remove.disabled}} class="btn btn-danger btn-xs"
-							  data-target="#delete-modal" data-toggle="modal" onclick="$('#delete-userid').val({{userid}})">
+					<button type="button" {{perms.user.remove.disabled}} class="btn btn-danger btn-xs del-user-btn"
+							  data-target="#delete-modal" data-toggle="modal" data-user="{{userid}}">
 						<span class="glyphicon glyphicon-trash"></span>
 					</button>
 					{{/hide_delete}}
@@ -44,6 +44,19 @@
 		</a>
 	</div>
 </form>
+<script>
+	document.addEventListener('DOMContentLoaded', function() {
+		$('.del-user-btn').click(function (e) {
+			var uid = $(this).data('user');
+			if (!uid) {
+				alert('ERROR');
+				return false;
+			}
+			$('#delete-userid').val(uid);
+			$('#delete-user-field').text($('#user-' + uid).text());
+		});
+	});
+</script>
 
 <!-- Modals -->
 <div class ="modal fade" id="delete-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
@@ -52,11 +65,10 @@
 			<form method="post">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{lang_confirmDelete}}</h4>
+					<h4 class="modal-title" id="myModalLabel">{{lang_confirmDelete}}: <span id="delete-user-field"></span></h4>
 				</div>
 				<div class="modal-body">
-					<p>{{lang_roleDeleteConfirm}}</p>
-					{{lang_numAssignedUsers}}: <span id="delete-role-users"></span>
+					<p>{{lang_userDeleteConfirm}}</p>
 				</div>
 				<div class="modal-footer">
 					<input type="hidden" name="action" value="deleteuser">
-- 
cgit v1.2.3-55-g7522


From 4bc146d5e2bf3dfcddf674aa366bdebd1c1e2a4a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Mar 2018 10:35:05 +0200
Subject: [adduser] Show name of deleted user in confirmation message

Refs #3344
---
 modules-available/adduser/lang/de/messages.json | 2 +-
 modules-available/adduser/lang/en/messages.json | 2 +-
 modules-available/adduser/page.inc.php          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules-available/adduser/lang/en/messages.json')

diff --git a/modules-available/adduser/lang/de/messages.json b/modules-available/adduser/lang/de/messages.json
index 207e8056..a744ae5f 100644
--- a/modules-available/adduser/lang/de/messages.json
+++ b/modules-available/adduser/lang/de/messages.json
@@ -5,7 +5,7 @@
     "password-changed": "Passwort ge\u00e4ndert",
     "password-mismatch": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein",
     "roles-updated": "Rollen aktualisiert",
-    "user-deleted": "Benutzer {{0}} gel\u00f6scht",
+    "user-deleted": "Benutzer {{0}} (ID={1}}) gel\u00f6scht",
     "user-edited": "Benutzerdaten wurden ge\u00e4ndert",
     "user-not-found": "Benutzer mit ID {{0}} nicht gefunden"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/lang/en/messages.json b/modules-available/adduser/lang/en/messages.json
index d55e0ec6..67bca6f9 100644
--- a/modules-available/adduser/lang/en/messages.json
+++ b/modules-available/adduser/lang/en/messages.json
@@ -5,7 +5,7 @@
     "password-changed": "Password changed",
     "password-mismatch": "Password and password confirmation do not match",
     "roles-updated": "Roles have been updated",
-    "user-deleted": "Deleted user {{0}}",
+    "user-deleted": "Deleted user {{0}} (ID={{1}})",
     "user-edited": "User data has been updated",
     "user-not-found": "User with ID {{0}} not found"
 }
\ No newline at end of file
diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php
index 60785d6c..c43a04e6 100644
--- a/modules-available/adduser/page.inc.php
+++ b/modules-available/adduser/page.inc.php
@@ -129,7 +129,7 @@ class Page_AddUser extends Page
 			return;
 		}
 		//\\
-		$user = Database::queryFirst('SELECT userid, login, fullname, phone, email
+		$user = Database::queryFirst('SELECT userid, login
 					FROM user WHERE userid = :userid', compact('userid'));
 		if ($user === false) {
 			Message::addError('user-not-found', $userid);
@@ -140,7 +140,7 @@ class Page_AddUser extends Page
 			return;
 		}
 		Database::exec('DELETE FROM user WHERE userid = :userid', compact('userid'));
-		Message::addSuccess('user-deleted', $userid);
+		Message::addSuccess('user-deleted', $user['login'], $userid);
 	}
 
 	private function saveRoles($userid)
-- 
cgit v1.2.3-55-g7522