From 7c3c98789bbb0894478143e5eacafa41b5f641ca Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 12 Apr 2019 13:22:09 +0200
Subject: [PATCH] The `attachment_storage` is now a secret option

Closes #2891
---
 com.woltlab.wcf/option.xml                                 | 5 +----
 .../install/files/lib/data/option/OptionEditor.class.php   | 7 ++++++-
 wcfsetup/install/lang/de.xml                               | 2 --
 wcfsetup/install/lang/en.xml                               | 2 --
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 4c21f293cb..ef2d9ec44d 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1015,10 +1015,6 @@ redis:wcf.acp.option.cache_source_type.redis</selectoptions>
 				<optiontype>text</optiontype>
 			</option>
 			<!-- /general.payment -->
-			<option name="attachment_storage">
-				<categoryname>message.attachment</categoryname>
-				<optiontype>text</optiontype>
-			</option>
 			<option name="attachment_enable_thumbnails">
 				<categoryname>message.attachment</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1730,6 +1726,7 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 		</options>
 	</import>
 	<delete>
+		<option name="attachment_storage" />
 		<option name="module_attachment"/>
 	</delete>
 </data>
diff --git a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
index fe84df28ce..25601d139c 100644
--- a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
@@ -141,8 +141,13 @@ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject
 		// file header
 		$writer->write("<?php\n/**\n* generated at ".gmdate('r')."\n*/\n");
 		
+		// Secret options cannot be enabled through the regular options, they need to be manually
+		// defined in the Core's `config.inc.php` to be activated.
+		$attachmentStorage = new Option(null, ['optionName' => 'attachment_storage', 'optionType' => 'text', 'optionValue' => null]);
+		$secretOptions = [$attachmentStorage->getConstantName() => $attachmentStorage];
+		
 		// get all options
-		$options = Option::getOptions();
+		$options = $secretOptions + Option::getOptions();
 		foreach ($options as $optionName => $option) {
 			$writeValue = $option->optionValue;
 			if ($writeValue === null) {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 17199487fc..8554e39893 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1383,8 +1383,6 @@ Das Fehlerprotokoll enthält {$data[count]} neue Einträge. Die ersten drei, in
 		<item name="wcf.acp.option.attachment_retain_dimensions"><![CDATA[Bildformat beim Erzeugen von Vorschaugrafiken beibehalten]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Höhe der Vorschaugrafiken]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Breite der Vorschaugrafiken]]></item>
-		<item name="wcf.acp.option.attachment_storage"><![CDATA[Speicherort der Dateianhänge]]></item>
-		<item name="wcf.acp.option.attachment_storage.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} optional einen vom Standard abweichenden Speicherort für die Dateianhänge definieren. Bereits existierende Dateianhänge müssen bei einer Änderung des Speicherortes manuell in den neuen Ort übertragen werden.]]></item>
 		<item name="wcf.acp.option.module_attachment"><![CDATA[Dateianhänge]]></item>
 		<item name="wcf.acp.option.module_smiley"><![CDATA[Smileys]]></item>
 		<item name="wcf.acp.option.category.message.censorship"><![CDATA[Zensur-Funktion]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0dea3f0ad6..858685c082 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1360,8 +1360,6 @@ This protocol file contains {$data[count]} new entries. The first three error me
 		<item name="wcf.acp.option.attachment_retain_dimensions"><![CDATA[Retain thumbnail dimensions]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Thumbnail Height]]></item>
 		<item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Thumbnail Width]]></item>
-		<item name="wcf.acp.option.attachment_storage"><![CDATA[Storage Location]]></item>
-		<item name="wcf.acp.option.attachment_storage.description"><![CDATA[You can specify a different storage location for attachments. Attention! You are responsible to move any existing attachments to the new storage location.]]></item>
 		<item name="wcf.acp.option.module_attachment"><![CDATA[Attachments]]></item>
 		<item name="wcf.acp.option.module_smiley"><![CDATA[Smilies]]></item>
 		<item name="wcf.acp.option.category.message.censorship"><![CDATA[Censorship]]></item>
-- 
2.20.1