If user sends remove account request, delete the remove legal request

See #2555

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',

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',