From 23d18b98c9894aa79b843db19af3a11329ffeae2 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Tue, 4 May 2021 13:37:14 +0200 Subject: [PATCH] Export IP addresses stored with filebase versions See WoltLab/com.woltlab.filebase#146 --- .../lib/acp/action/UserExportGdprAction.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php b/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php index 3a300ebc91..7762964eb6 100644 --- a/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/UserExportGdprAction.class.php @@ -156,9 +156,6 @@ class UserExportGdprAction extends AbstractAction $this->ipAddresses = [ 'com.woltlab.blog' => ['blog' . WCF_N . '_entry '], 'com.woltlab.calendar' => ['calendar' . WCF_N . '_event'], - // do not include filebaseN_file_version here, it lacks a userID column and therefore we cannot - // reliably determine if that ip address belongs to the file author, or if it was somebody else, - // e. g. moderators or other authors 'com.woltlab.filebase' => [ 'filebase' . WCF_N . '_file', 'filebase' . WCF_N . '_file_download', @@ -210,7 +207,12 @@ class UserExportGdprAction extends AbstractAction ); } - if ($package === 'com.woltlab.gallery') { + if ($package === 'com.woltlab.filebase') { + $ipAddresses = \array_merge( + $ipAddresses, + $this->exportIpAddresses('filebase' . WCF_N . '_file_version', 'ipAddress', 'uploadTime', 'userID') + ); + } elseif ($package === 'com.woltlab.gallery') { $ipAddresses = \array_merge( $ipAddresses, $this->exportIpAddresses('gallery' . WCF_N . '_image', 'ipAddress', 'uploadTime', 'userID') -- 2.20.1