From 6a294d0994b6970ea71d9e52e4718823c2e392e3 Mon Sep 17 00:00:00 2001
From: john-gom <116556069+john-gom@users.noreply.github.com>
Date: Thu, 15 Jun 2023 09:59:35 +0100
Subject: [PATCH] feat: Allow users to delete their own accounts (#8548)

* Allow users to delete their own accounts

* Change to using a button for delete
---
 cgi/user.pl                                        |  7 +------
 po/common/common.pot                               | 10 +++++++++-
 po/common/en.po                                    |  8 ++++++++
 .../web/pages/user_form/user_form_page.tt.html     | 14 ++++++++------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/cgi/user.pl b/cgi/user.pl
index 85f53c6ff3bea..390638ed774f1 100644
--- a/cgi/user.pl
+++ b/cgi/user.pl
@@ -106,12 +106,7 @@
 
 	if ($type eq 'edit') {
 		if (single_param('delete') eq 'on') {
-			if ($admin) {
-				$type = 'delete';
-			}
-			else {
-				display_error_and_exit($Lang{error_no_permission}{$lang}, 403);
-			}
+			$type = 'delete';
 		}
 	}
 
diff --git a/po/common/common.pot b/po/common/common.pot
index f53cbe6d4fa6a..918e442426431 100644
--- a/po/common/common.pot
+++ b/po/common/common.pot
@@ -504,7 +504,15 @@ msgid "Delete the images"
 msgstr ""
 
 msgctxt "delete_user"
-msgid "Delete an user"
+msgid "Delete a user"
+msgstr ""
+
+msgctxt "delete_confirmation"
+msgid "This will delete your user details and anonymise all of your contributions. Please re-enter your user name to confirm."
+msgstr ""
+
+msgctxt "danger_zone"
+msgid "Danger Zone"
 msgstr ""
 
 msgctxt "diff_add"
diff --git a/po/common/en.po b/po/common/en.po
index 995f9c562d6e2..5edad7a42aa62 100644
--- a/po/common/en.po
+++ b/po/common/en.po
@@ -493,6 +493,14 @@ msgctxt "delete_user"
 msgid "Delete an user"
 msgstr "Delete an user"
 
+msgctxt "delete_confirmation"
+msgid "This will delete your user details and anonymise all of your contributions. Please re-enter your user name to confirm."
+msgstr "This will delete your user details and anonymise all of your contributions. Please re-enter your user name to confirm."
+
+msgctxt "danger_zone"
+msgid "Danger Zone"
+msgstr "Danger Zone"
+
 msgctxt "diff_add"
 msgid "Added:"
 msgstr "Added:"
diff --git a/templates/web/pages/user_form/user_form_page.tt.html b/templates/web/pages/user_form/user_form_page.tt.html
index 7147451f2bb15..6af14f91ee728 100644
--- a/templates/web/pages/user_form/user_form_page.tt.html
+++ b/templates/web/pages/user_form/user_form_page.tt.html
@@ -45,7 +45,7 @@
 
     <!-- Start form -->
 
-    <form method="post" action="/cgi/user.pl" enctype="multipart/form-data">
+    <form method="post" action="/cgi/user.pl" enctype="multipart/form-data" id="user_form">
 		[% FOREACH section IN sections %]
 
             [% IF section.name %]
@@ -127,12 +127,14 @@
             <p>[% lang("unsubscribe_info") %]</p>
         [% END %]
 
-        [% IF admin %]
-            <label>
-                <input type="checkbox" name="delete" onchange="if (this.checked) { if (!confirm('This action cannot be undone, are you sure you want to delete the user?')) { this.checked = false }}" />
-                [% lang("delete_user") %]
-            </label>
+        [% IF userid %]
+            <fieldset>
+                <legend class="text_warning">[% lang("danger_zone") %]</legend>
+                <input type="button" name=".delete" class="button text_warning" value="[% lang("delete_user") %]" onclick="if ('[% userid %]'.localeCompare(prompt('[% lang("delete_confirmation") %]'),undefined,'base') === 0) {document.getElementById('delete_input').value='on';document.getElementById('user_form').submit();}"/>
+                <input type="hidden" name="delete" id="delete_input"/>
+            </fieldset>
         [% END %]
+
         <input type="hidden" name="action" value="process" />
         <input type="hidden" name="type" value="[% type %]" />
         [% IF userid %]