From 8b3d40ca7780c10ac74e59b9c2547fea57409698 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 6 Aug 2018 13:03:46 +0200
Subject: [PATCH] Minor - fix user list consent buttons

---
 main/admin/user_list_consent.php  | 18 +++++++----
 main/coursecopy/import_backup.php |  1 -
 main/inc/lib/usermanager.lib.php  | 50 +++++++++++++++----------------
 main/social/personal_data.php     |  1 -
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php
index 0a1bde3696..7779a135ee 100644
--- a/main/admin/user_list_consent.php
+++ b/main/admin/user_list_consent.php
@@ -312,11 +312,16 @@ function modify_filter($user_id, $url_params, $row)
         api_get_path(WEB_CODE_PATH).'messages/new_message.php?send_to_user='.$user_id
     );
     $result .= '&nbsp;&nbsp;';
-    $result .= Display::url(
-        get_lang('RemoveTerms'),
-        api_get_self().'?user_id='.$user_id.'&action=delete_terms&sec_token='.$token
-    );
-    $result .= '&nbsp;&nbsp;';
+    $extraFields = Session::read('data_privacy_extra_fields');
+    $extraFieldId = $extraFields['delete_legal'];
+
+    if ($row[10] == $extraFieldId) {
+        $result .= Display::url(
+            get_lang('RemoveTerms'),
+            api_get_self().'?user_id='.$user_id.'&action=delete_terms&sec_token='.$token
+        );
+        $result .= '&nbsp;&nbsp;';
+    }
 
     $result .= ' <a href="'.api_get_self().'?action=anonymize&user_id='.$user_id.'&'.$url_params.'&sec_token='.$token.'"  onclick="javascript:if(!confirm('."'".addslashes(
             api_htmlentities(get_lang('ConfirmYourChoice'))
@@ -622,8 +627,9 @@ $table->set_column_filter(4, 'user_filter');
 $table->set_column_filter(6, 'email_filter');
 $table->set_column_filter(7, 'status_filter');
 $table->set_column_filter(8, 'active_filter');
-$table->set_column_filter(10, 'requestTypeFilter');
 $table->set_column_filter(11, 'modify_filter');
+$table->set_column_filter(10, 'requestTypeFilter');
+
 
 // Only show empty actions bar if delete users has been blocked
 $actionsList = [];
diff --git a/main/coursecopy/import_backup.php b/main/coursecopy/import_backup.php
index 07e04734fa..f270b6501e 100755
--- a/main/coursecopy/import_backup.php
+++ b/main/coursecopy/import_backup.php
@@ -271,5 +271,4 @@ if (!isset($_POST['action'])) {
     Session::erase('backup_file');
 }
 
-
 Display::display_footer();
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 9637bc4672..e9b94d0631 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -6249,6 +6249,31 @@ SQL;
         return $message;
     }
 
+    /**
+     * @return array
+     */
+    public static function createDataPrivacyExtraFields()
+    {
+        $extraFieldId = self::create_extra_field(
+            'request_for_legal_agreement_consent_removal',
+            1, //text
+            'Request for legal agreement consent removal',
+            ''
+        );
+
+        $extraFieldIdDeleteAccount = self::create_extra_field(
+            'request_for_delete_account',
+            1, //text
+            'Request for delete user account',
+            ''
+        );
+
+        return [
+            'delete_account_extra_field' => $extraFieldIdDeleteAccount,
+            'delete_legal' => $extraFieldId,
+        ];
+    }
+
     /**
      * @return EncoderFactory
      */
@@ -6346,29 +6371,4 @@ SQL;
 
         return $url;
     }
-
-    /**
-     * @return array
-     */
-    public static function createDataPrivacyExtraFields()
-    {
-        $extraFieldId = self::create_extra_field(
-            'request_for_legal_agreement_consent_removal',
-            1, //text
-            'Request for legal agreement consent removal',
-            ''
-        );
-
-        $extraFieldIdDeleteAccount = self::create_extra_field(
-            'request_for_delete_account',
-            1, //text
-            'Request for delete user account',
-            ''
-        );
-
-        return [
-            'delete_account_extra_field' => $extraFieldIdDeleteAccount,
-            'delete_legal' => $extraFieldId
-        ];
-    }
 }
diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index b7266a90e8..f26510948f 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -110,7 +110,6 @@ switch ($action) {
                 $explanation
             );
 
-
             Display::addFlash(Display::return_message(get_lang('Saved')));
             Event::addEvent(
                 LOG_USER_DELETE_ACCOUNT_REQUEST,