From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 12 Jun 2020 18:17:17 +0000 (+0200)
Subject: Merge branch 'master' into media-consent
X-Git-Tag: 5.3.0_Alpha_1~216^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dcb9180bff26481c958864221062f0271b1cb25a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into media-consent
---

dcb9180bff26481c958864221062f0271b1cb25a
diff --cc com.woltlab.wcf/option.xml
index e12cbd2b80,d8db18b804..bf585ce06b
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@@ -1544,11 -1544,14 +1544,19 @@@ rub
  rust
  go</defaultvalue>
  			</option>
 +			<option name="message_enable_user_consent">
 +				<categoryname>message.general</categoryname>
 +				<optiontype>boolean</optiontype>
 +				<defaultvalue>1</defaultvalue>
 +			</option>
+ 			<option name="modification_log_expiration">
+ 				<categoryname>message.general</categoryname>
+ 				<optiontype>integer</optiontype>
+ 				<defaultvalue>0</defaultvalue>
+ 				<minvalue>0</minvalue>
+ 				<maxvalue>365</maxvalue>
+ 				<suffix>days</suffix>
+ 			</option>
  			<!-- /message.general -->
  			<option name="search_results_per_page">
  				<categoryname>message.search</categoryname>
diff --cc constants.php
index a960771b6a,66970fe257..81965a12cd
--- a/constants.php
+++ b/constants.php
@@@ -263,4 -263,4 +263,5 @@@ define('BLACKLIST_SFS_EMAIL_ADDRESS', '
  define('BLACKLIST_SFS_IP_ADDRESS', '90percentile');
  define('BLACKLIST_SFS_ACTION', 'disable');
  define('ENABLE_ENTERPRISE_MODE', 0);
 +define('MESSAGE_ENABLE_USER_CONSENT', 1);
+ define('MODIFICATION_LOG_EXPIRATION', 0);
diff --cc wcfsetup/install/lang/de.xml
index cfe0d5edaa,b3ba3bb063..65b2ea3f1b
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -1762,7 -1763,8 +1763,9 @@@ Die Datenbestände werden sorgfältig g
  		<item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[Es besteht immer das Risiko eines fehlerhaften Eintrages, daher wird die Einstellung <strong>Deaktivierung, erfordert manuelle Freischaltung</strong> ausdrücklich empfohlen.]]></item>
  		<item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Deaktivierung, erfordert manuelle Freischaltung]]></item>
  		<item name="wcf.acp.option.module_amp"><![CDATA[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
 +		<item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Inhalte von externen Anbietern erst nach Zustimmung anzuzeigen]]></item>
+ 		<item name="wcf.acp.option.modification_log_expiration"><![CDATA[Speicherzeit für Änderungen]]></item>
+ 		<item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Zeitraum, nachdem alte Änderungen aus dem Änderungsprotokoll entfernt werden [0, um die Entfernung gänzlich zu deaktivieren]]]></item>
  	</category>
  	<category name="wcf.acp.customOption">
  		<item name="wcf.acp.customOption.list"><![CDATA[Eingabefelder]]></item>
diff --cc wcfsetup/install/lang/en.xml
index abc2804f20,ada3909315..957e6536bc
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1746,7 -1747,8 +1747,9 @@@ The database is carefully maintained, b
  		<item name="wcf.acp.option.blacklist_sfs_action.description"><![CDATA[There is always the risk of a false-positive match, therefore it is highly recommended to set it to <strong>Disable and require manual approval</strong>.]]></item>
  		<item name="wcf.acp.option.blacklist_sfs_action.disable"><![CDATA[Disable and require manual approval]]></item>
  		<item name="wcf.acp.option.module_amp"><![CDATA[<abbr title="Accelerated Mobile Pages">AMP</abbr>]]></item>
 +		<item name="wcf.acp.option.message_enable_user_consent"><![CDATA[Prompt users before displaying content from external sources]]></item>
+ 		<item name="wcf.acp.option.modification_log_expiration"><![CDATA[Storage Time for Modification Logs]]></item>
+ 		<item name="wcf.acp.option.modification_log_expiration.description"><![CDATA[Modification logs will be deleted after the entered amount of days. To disable deleting old modification logs, enter “0”.]]></item>
  	</category>
  	<category name="wcf.acp.customOption">
  		<item name="wcf.acp.customOption.list"><![CDATA[Option Fields]]></item>