From e37df7092bf0a66576fd7b134b5ecbddb616048c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 23 Feb 2021 14:49:50 +0100 Subject: [PATCH] Add permission to access the GDPR export Resolves #3993 --- com.woltlab.wcf/userGroupOption.xml | 11 ++++++++++- wcfsetup/install/files/acp/templates/userList.tpl | 2 +- .../lib/acp/action/UserExportGdprAction.class.php | 2 +- wcfsetup/install/lang/de.xml | 2 ++ wcfsetup/install/lang/en.xml | 2 ++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml index 79a68163a5..eeb6a39bfe 100644 --- a/com.woltlab.wcf/userGroupOption.xml +++ b/com.woltlab.wcf/userGroupOption.xml @@ -1055,9 +1055,18 @@ webp 1 module_tagging + - diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index 13b61cd26d..1f92e0ef3b 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -132,7 +132,7 @@ {/if} {/if} - {if $user->editable} + {if $user->accessible && $__wcf->session->getPermission('admin.user.canExportGdprData')}
  • {lang}wcf.acp.user.exportGdpr{/lang}
  • {/if} diff --git a/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php b/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php index 31d08b84e0..3a300ebc91 100644 --- a/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php @@ -100,7 +100,7 @@ class UserExportGdprAction extends AbstractAction /** * @inheritDoc */ - public $neededPermissions = ['admin.user.canEditUser']; + public $neededPermissions = ['admin.user.canExportGdprData']; /** * list of user option names that are excluded from the output, any option that begins with diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 29d5e64681..7810ce023a 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -921,6 +921,8 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z + + nicht statt und kann unter Umständen Informationen enthalten, die einem Administrator auf andere Weise nicht zugänglich wären.]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 5f5e01a748..1263759d8c 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -898,6 +898,8 @@ ATTENTION: The messages listed above are greatly shortened. You can view details + + will not be filtered according to the administrator’s permissions and may contain information that would be inaccessible otherwise.]]> -- 2.20.1