Skip to content

Commit 64b1dfb

Browse files
authored
Merge pull request #816 from boxwise/fix-deleteprofile
Fix deleteprofile
2 parents 7cd851e + d616b0c commit 64b1dfb

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

assets/js/custom.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,6 @@ $(".delete-user").on("click", function (e) {
631631
$.ajax({
632632
type: "post",
633633
url: "ajax.php?file=deleteprofile",
634-
data: {
635-
cms_user_id: el.data("id"),
636-
},
637634
dataType: "json",
638635
success: function (result) {
639636
AjaxCheckSuccess(result);

library/ajax/deleteprofile.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?php
22

33
db_transaction(function () {
4+
$user_id = $_SESSION['user']['id'];
45
// Only append .deleted suffix if the email doesn't already have it
56
// This prevents double-deletion if the query is somehow executed twice
67
// Pattern checks for .deleted.<digits> after the @ symbol (e.g., user@domain.com.deleted.123)
7-
db_query('UPDATE cms_users SET deleted = NOW(), email = CONCAT(email,".deleted.",id) WHERE id = :id AND (NOT deleted OR deleted IS NULL) AND email NOT REGEXP "@.*\.deleted\.[0-9]+$"', ['id' => $_POST['cms_user_id']]);
8-
updateAuth0UserFromDb($_POST['cms_user_id']);
8+
db_query('UPDATE cms_users SET modified = NOW(), modified_by = :id, deleted = NOW(), email = CONCAT(email,".deleted.",id) WHERE id = :id AND (NOT deleted OR deleted IS NULL) AND email NOT REGEXP "@.*\.deleted\.[0-9]+$"', ['id' => $user_id]);
9+
updateAuth0UserFromDb($user_id);
10+
simpleSaveChangeHistory('cms_users', $user_id, 'Record deleted');
911
});
1012

11-
simpleSaveChangeHistory('cms_users', $_POST['cms_user_id'], 'Record deleted without undelete');
1213
// when a user deactive its account we need to ensure that user logged out immediately and then redirected to Auth0 login page
1314
global $settings;
1415
logout();

0 commit comments

Comments
 (0)