From 6cd142ffd650e7fe5aadce7fb56a1318653114cc Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 6 Aug 2018 14:25:54 +0200 Subject: [PATCH] If user sends remove account request, delete the remove legal request See #2555 --- main/admin/user_list_consent.php | 6 +++++- main/social/personal_data.php | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php index 5e8e6686ab..765ff7a5e2 100644 --- a/main/admin/user_list_consent.php +++ b/main/admin/user_list_consent.php @@ -71,7 +71,11 @@ function prepare_user_sql_query($getCount) $extraFieldValue = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); $sql .= " INNER JOIN $extraFieldValue v - ON (u.id = v.item_id AND (field_id = $extraFieldId OR field_id = $extraFieldIdDeleteAccount)) "; + ON ( + u.id = v.item_id AND + (field_id = $extraFieldId OR field_id = $extraFieldIdDeleteAccount) AND + v.value = 1 + ) "; $keywordList = [ 'keyword_firstname', diff --git a/main/social/personal_data.php b/main/social/personal_data.php index c3ea43960a..5f09055393 100755 --- a/main/social/personal_data.php +++ b/main/social/personal_data.php @@ -99,6 +99,19 @@ switch ($action) { $explanation = $formDelete->getSubmitValue('explanation'); UserManager::createDataPrivacyExtraFields(); + // Remove delete agreement if it was sent: + UserManager::update_extra_field_value( + $userId, + 'request_for_legal_agreement_consent_removal', + '' + ); + + UserManager::update_extra_field_value( + $userId, + 'request_for_legal_agreement_consent_removal_justification', + '' + ); + UserManager::update_extra_field_value( $userId, 'request_for_delete_account',