From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 14 Jul 2016 18:00:18 +0000 (+0200)
Subject: Add simple acl for media
X-Git-Tag: 3.0.0_Beta_1~1131
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c14f5026ff8a8930cb55abd9dcd91e1ad4df6d4b;p=GitHub%2FWoltLab%2FWCF.git

Add simple acl for media
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 92f027c6b6..6c726a2bd1 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1059,7 +1059,7 @@
 		</type>
 		<!-- /box controllers -->
 		
-		<!-- pages -->
+		<!-- simple acl -->
 		<type>
 			<name>com.woltlab.wcf.page</name>
 			<definitionname>com.woltlab.wcf.acl.simple</definitionname>
@@ -1068,7 +1068,11 @@
 			<name>com.woltlab.wcf.box</name>
 			<definitionname>com.woltlab.wcf.acl.simple</definitionname>
 		</type>
-		<!-- /pages -->
+		<type>
+			<name>com.woltlab.wcf.media</name>
+			<definitionname>com.woltlab.wcf.acl.simple</definitionname>
+		</type>
+		<!-- /simple acl -->
 		
 		<!-- article list box condition -->
 		<type>
diff --git a/com.woltlab.wcf/templates/__box.tpl b/com.woltlab.wcf/templates/__box.tpl
index d6a72d066d..81d06a6d1b 100644
--- a/com.woltlab.wcf/templates/__box.tpl
+++ b/com.woltlab.wcf/templates/__box.tpl
@@ -1,5 +1,5 @@
-<{if $box->showHeader}section{else}div{/if} class="box{if $box->hasImage()} boxWithImage{/if}{if $box->cssClassName} {$box->cssClassName}{/if}" data-box-identifier="{@$box->identifier}">
-	{if $box->hasImage()}
+<{if $box->showHeader}section{else}div{/if} class="box{if $box->getImage()} boxWithImage{/if}{if $box->cssClassName} {$box->cssClassName}{/if}" data-box-identifier="{@$box->identifier}">
+	{if $box->getImage()}
 		<div class="boxImage">
 			{if $box->hasLink()}
 				<a href="{$box->getLink()}">{@$box->getImage()}</a>
diff --git a/com.woltlab.wcf/templates/aclSimple.tpl b/com.woltlab.wcf/templates/aclSimple.tpl
new file mode 100644
index 0000000000..3fa5a97cea
--- /dev/null
+++ b/com.woltlab.wcf/templates/aclSimple.tpl
@@ -0,0 +1,59 @@
+{if !$__aclSimplePrefix|isset}{assign var='__aclSimplePrefix' value=''}{/if}
+
+<div class="section">
+	<dl>
+		<dt><label for="{@$__aclSimplePrefix}aclAllowAll">{lang}wcf.acl.allowAll{/lang}</label></dt>
+		<dd>
+			<ol class="flexibleButtonGroup">
+				<li>
+					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll" name="aclValues[allowAll]" value="1"{if $aclValues[allowAll]} checked{/if}>
+					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+				</li>
+				<li>
+					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll_no" name="aclValues[allowAll]" value="0"{if !$aclValues[allowAll]} checked{/if}>
+					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+				</li>
+			</ol>
+		</dd>
+	</dl>
+</div>
+
+<section class="section" id="{@$__aclSimplePrefix}aclInputContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
+	<h2 class="sectionTitle">{lang}wcf.acl.access{/lang}</h2>
+	<dl>
+		<dt><label for="{@$__aclSimplePrefix}aclSearchInput">{lang}wcf.acl.access.grant{/lang}</label></dt>
+		<dd>
+			<input type="text" id="{@$__aclSimplePrefix}aclSearchInput" class="long" placeholder="{lang}wcf.acl.search.description{/lang}">
+		</dd>
+	</dl>
+
+	<dl id="{@$__aclSimplePrefix}aclListContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
+		<dt>{lang}wcf.acl.access.granted{/lang}</dt>
+		<dd>
+			<ul id="{@$__aclSimplePrefix}aclAccessList" class="aclList containerList">
+				{foreach from=$aclValues[group] item=aclGroup}
+					<li>
+						<span class="icon icon16 fa-users"></span>
+						<span class="aclLabel">{$aclGroup}</span>
+						<span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
+						<input type="hidden" name="aclValues[group][]" value="{@$aclGroup->groupID}">
+					</li>
+				{/foreach}
+				{foreach from=$aclValues[user] item=aclUser}
+					<li>
+						<span class="icon icon16 fa-user"></span>
+						<span class="aclLabel">{$aclUser}</span>
+						<span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
+						<input type="hidden" name="aclValues[user][]" value="{@$aclUser->userID}">
+					</li>
+				{/foreach}
+			</ul>
+		</dd>
+	</dl>
+</section>
+
+<script data-relocate="true">
+	require(['WoltLab/WCF/Ui/Acl/Simple'], function(UiAclSimple) {
+		new UiAclSimple('{@$__aclSimplePrefix}');
+	});
+</script>
diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index b3fb0a854d..d537396a51 100644
--- a/com.woltlab.wcf/templates/languageChooser.tpl
+++ b/com.woltlab.wcf/templates/languageChooser.tpl
@@ -1,9 +1,10 @@
+{if !$__languageChooserPrefix|isset}{assign var='__languageChooserPrefix' value=''}{/if}
 {if !$label|isset}{assign var='label' value='wcf.user.language'}{/if}
 
 {if $languages|count}
 	<dl{if $errorField|isset && $errorField == 'languageID'} class="formError"{/if}>
 		<dt>{lang}{$label}{/lang}</dt>
-		<dd id="languageIDContainer">
+		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
 				<select name="languageID" id="languageID">
 					{foreach from=$languages item=__language}
@@ -25,7 +26,7 @@
 				{/implode}
 			};
 			
-			LanguageChooser.init('languageIDContainer', 'languageID', {$languageID}, languages)
+			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', 'languageID', {$languageID}, languages)
 		});
 	</script>
 {/if}
diff --git a/com.woltlab.wcf/templates/mediaEditor.tpl b/com.woltlab.wcf/templates/mediaEditor.tpl
index 2e9b939932..ef718a76d8 100644
--- a/com.woltlab.wcf/templates/mediaEditor.tpl
+++ b/com.woltlab.wcf/templates/mediaEditor.tpl
@@ -1,65 +1,77 @@
-<div id="mediaThumbnail"></div>
+{if $media->isImage}
+	<div class="mediaThumbnail">
+		{@$media->getThumbnailTag('small')}
+	</div>
+{/if}
 
 <div class="box48">
-	<span id="mediaFileIcon" class="icon icon48 fa-file-o"></span>
-	
+	{if $media->isImage}
+		<span class="icon icon48 fa-file-image-o"></span>
+	{else}
+		{@$media->getElementTag(48)}
+	{/if}
+
 	<dl class="plain dataList">
 		<dt>{lang}wcf.media.filename{/lang}</dt>
-		<dd id="mediaFilename"></dd>
-		
+		<dd id="mediaFilename">{$media->filename}</dd>
+
 		<dt>{lang}wcf.media.filesize{/lang}</dt>
-		<dd id="mediaFilesize"></dd>
-		
-		<dt>{lang}wcf.media.imageDimensions{/lang}</dt>
-		<dd id="mediaImageDimensions"></dd>
-		
+		<dd id="mediaFilesize">{@$media->filesize|filesize}</dd>
+
+		{if $media->isImage}
+			<dt>{lang}wcf.media.imageDimensions{/lang}</dt>
+			<dd id="mediaImageDimensions">{lang}wcf.media.imageDimensions.value{/lang}</dd>
+		{/if}
+
 		<dt>{lang}wcf.media.uploader{/lang}</dt>
-		<dd id="mediaUploader"></dd>
+		<dd id="mediaUploader">{@$media->getUserProfile()->getAnchorTag()}</dd>
 	</dl>
 </div>
 
 <section class="section">
 	<h2 class="sectionTitle">{lang}wcf.global.form.data{/lang}</h2>
-	
+
 	<dl>
 		<dt></dt>
 		<dd>
 			<label>
-				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1">
+				<input type="checkbox" name="isMultilingual" value="1"{if $media->isMultilingual} checked{/if}>
 				<span>{lang}wcf.media.isMultilingual{/lang}</span>
 			</label>
 		</dd>
 	</dl>
-	
+
 	{include file='languageChooser' label='wcf.media.languageID'}
-	
+
 	<dl>
-		<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
+		<dt><label for="title_{@$media->mediaID}">{lang}wcf.global.title{/lang}</label></dt>
 		<dd>
-			<input type="text" id="title" name="title" class="long">
+			<input type="text" id="title_{@$media->mediaID}" name="title" class="long" value="TODO">
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
-	
+	{include file='multipleLanguageInputJavascript' elementIdentifier='title'|concat:'_':$media->mediaID forceSelection=true}
+
 	<dl>
-		<dt><label for="caption">{lang}wcf.media.caption{/lang}</label></dt>
+		<dt><label for="caption_{@$media->mediaID}">{lang}wcf.media.caption{/lang}</label></dt>
 		<dd>
-			<textarea id="caption" name="caption" cols="40" rows="3"></textarea>
+			<textarea id="caption_{@$media->mediaID}" name="caption" cols="40" rows="3">TODO</textarea>
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='caption' forceSelection=true}
-	
+	{include file='multipleLanguageInputJavascript' elementIdentifier='caption'|concat:'_':$media->mediaID forceSelection=true}
+
 	<dl>
-		<dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
+		<dt><label for="altText_{@$media->mediaID}">{lang}wcf.media.altText{/lang}</label></dt>
 		<dd>
-			<input type="text" id="altText" name="altText" class="long">
+			<input type="text" id="altText_{@$media->mediaID}" name="altText" class="long" value="TODO">
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
-	
+	{include file='multipleLanguageInputJavascript' elementIdentifier='altText'|concat:'_':$media->mediaID forceSelection=true}
+
 	{event name='dataFields'}
 </section>
 
+{include file='aclSimple'}
+
 <div class="formSubmit">
 	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/com.woltlab.wcf/templates/mediaJavaScript.tpl b/com.woltlab.wcf/templates/mediaJavaScript.tpl
index ccac490856..76d9aae80d 100644
--- a/com.woltlab.wcf/templates/mediaJavaScript.tpl
+++ b/com.woltlab.wcf/templates/mediaJavaScript.tpl
@@ -11,7 +11,6 @@
 			'wcf.media.insert.imageSize.original': '{lang}wcf.media.insert.imageSize.original{/lang}',
 			'wcf.media.manager': '{lang}wcf.media.manager{/lang}',
 			'wcf.media.edit': '{lang}wcf.media.edit{/lang}',
-			'wcf.media.imageDimensions.value': '{lang __literal=true}wcf.media.imageDimensions.value{/lang}',
 			'wcf.media.button.insert': '{lang}wcf.media.button.insert{/lang}',
 			'wcf.media.search.filetype': '{lang}wcf.media.search.filetype{/lang}',
 			'wcf.media.search.noResults': '{lang}wcf.media.search.noResults{/lang}'
diff --git a/wcfsetup/install/files/acp/templates/aclSimple.tpl b/wcfsetup/install/files/acp/templates/aclSimple.tpl
index 35a2d2b897..0ddd8d3a2c 100644
--- a/wcfsetup/install/files/acp/templates/aclSimple.tpl
+++ b/wcfsetup/install/files/acp/templates/aclSimple.tpl
@@ -1,34 +1,36 @@
+{if !$__aclSimplePrefix|isset}{assign var='__aclSimplePrefix' value=''}{/if}
+
 <div class="section">
 	<dl>
-		<dt><label for="aclAllowAll">{lang}wcf.acl.allowAll{/lang}</label></dt>
+		<dt><label for="{@$__aclSimplePrefix}aclAllowAll">{lang}wcf.acl.allowAll{/lang}</label></dt>
 		<dd>
 			<ol class="flexibleButtonGroup">
 				<li>
-					<input type="radio" id="aclAllowAll" name="aclValues[allowAll]" value="1"{if $aclValues[allowAll]} checked{/if}>
-					<label for="aclAllowAll" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll" name="aclValues[allowAll]" value="1"{if $aclValues[allowAll]} checked{/if}>
+					<label for="{@$__aclSimplePrefix}aclAllowAll" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 				</li>
 				<li>
-					<input type="radio" id="aclAllowAll_no" name="aclValues[allowAll]" value="0"{if !$aclValues[allowAll]} checked{/if}>
-					<label for="aclAllowAll_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+					<input type="radio" id="{@$__aclSimplePrefix}aclAllowAll_no" name="aclValues[allowAll]" value="0"{if !$aclValues[allowAll]} checked{/if}>
+					<label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 				</li>
 			</ol>
 		</dd>
 	</dl>
 </div>
 
-<section class="section" id="aclInputContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
+<section class="section" id="{@$__aclSimplePrefix}aclInputContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
 	<h2 class="sectionTitle">{lang}wcf.acl.access{/lang}</h2>
 	<dl>
-		<dt><label for="aclSearchInput">{lang}wcf.acl.access.grant{/lang}</label></dt>
+		<dt><label for="{@$__aclSimplePrefix}aclSearchInput">{lang}wcf.acl.access.grant{/lang}</label></dt>
 		<dd>
-			<input type="text" id="aclSearchInput" class="long" placeholder="{lang}wcf.acl.search.description{/lang}">
+			<input type="text" id="{@$__aclSimplePrefix}aclSearchInput" class="long" placeholder="{lang}wcf.acl.search.description{/lang}">
 		</dd>
 	</dl>
 	
-	<dl id="aclListContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
+	<dl id="{@$__aclSimplePrefix}aclListContainer"{if $aclValues[allowAll]} style="display: none;"{/if}>
 		<dt>{lang}wcf.acl.access.granted{/lang}</dt>
 		<dd>
-			<ul id="aclAccessList" class="aclList containerList">
+			<ul id="{@$__aclSimplePrefix}aclAccessList" class="aclList containerList">
 				{foreach from=$aclValues[group] item=aclGroup}
 					<li>
 						<span class="icon icon16 fa-users"></span>
@@ -52,6 +54,6 @@
 
 <script data-relocate="true">
 	require(['WoltLab/WCF/Ui/Acl/Simple'], function(UiAclSimple) {
-		new UiAclSimple();
+		new UiAclSimple('{@$__aclSimplePrefix}');
 	});
 </script>
diff --git a/wcfsetup/install/files/acp/templates/languageChooser.tpl b/wcfsetup/install/files/acp/templates/languageChooser.tpl
index b3fb0a854d..d537396a51 100644
--- a/wcfsetup/install/files/acp/templates/languageChooser.tpl
+++ b/wcfsetup/install/files/acp/templates/languageChooser.tpl
@@ -1,9 +1,10 @@
+{if !$__languageChooserPrefix|isset}{assign var='__languageChooserPrefix' value=''}{/if}
 {if !$label|isset}{assign var='label' value='wcf.user.language'}{/if}
 
 {if $languages|count}
 	<dl{if $errorField|isset && $errorField == 'languageID'} class="formError"{/if}>
 		<dt>{lang}{$label}{/lang}</dt>
-		<dd id="languageIDContainer">
+		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
 				<select name="languageID" id="languageID">
 					{foreach from=$languages item=__language}
@@ -25,7 +26,7 @@
 				{/implode}
 			};
 			
-			LanguageChooser.init('languageIDContainer', 'languageID', {$languageID}, languages)
+			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', 'languageID', {$languageID}, languages)
 		});
 	</script>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/mediaAdd.tpl b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
index d2c9ebf96f..d8c51c2db4 100644
--- a/wcfsetup/install/files/acp/templates/mediaAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
@@ -131,6 +131,8 @@
 			{event name='dataFields'}
 		</section>
 		
+		{include file='aclSimple'}
+		
 		{event name='sections'}
 		
 		<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/mediaEditor.tpl b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
index 2e9b939932..69e982028f 100644
--- a/wcfsetup/install/files/acp/templates/mediaEditor.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaEditor.tpl
@@ -1,20 +1,30 @@
-<div id="mediaThumbnail"></div>
+{if $media->isImage}
+	<div class="mediaThumbnail">
+		{@$media->getThumbnailTag('small')}
+	</div>
+{/if}
 
 <div class="box48">
-	<span id="mediaFileIcon" class="icon icon48 fa-file-o"></span>
+	{if $media->isImage}
+		<span class="icon icon48 fa-file-image-o"></span>
+	{else}
+		{@$media->getElementTag(48)}
+	{/if}
 	
 	<dl class="plain dataList">
 		<dt>{lang}wcf.media.filename{/lang}</dt>
-		<dd id="mediaFilename"></dd>
+		<dd id="mediaFilename">{$media->filename}</dd>
 		
 		<dt>{lang}wcf.media.filesize{/lang}</dt>
-		<dd id="mediaFilesize"></dd>
+		<dd id="mediaFilesize">{@$media->filesize|filesize}</dd>
 		
-		<dt>{lang}wcf.media.imageDimensions{/lang}</dt>
-		<dd id="mediaImageDimensions"></dd>
+		{if $media->isImage}
+			<dt>{lang}wcf.media.imageDimensions{/lang}</dt>
+			<dd id="mediaImageDimensions">{lang}wcf.media.imageDimensions.value{/lang}</dd>
+		{/if}
 		
 		<dt>{lang}wcf.media.uploader{/lang}</dt>
-		<dd id="mediaUploader"></dd>
+		<dd id="mediaUploader">{@$media->getUserProfile()->getAnchorTag()}</dd>
 	</dl>
 </div>
 
@@ -25,7 +35,7 @@
 		<dt></dt>
 		<dd>
 			<label>
-				<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1">
+				<input type="checkbox" name="isMultilingual" value="1"{if $media->isMultilingual} checked{/if}>
 				<span>{lang}wcf.media.isMultilingual{/lang}</span>
 			</label>
 		</dd>
@@ -34,32 +44,34 @@
 	{include file='languageChooser' label='wcf.media.languageID'}
 	
 	<dl>
-		<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
+		<dt><label for="title_{@$media->mediaID}">{lang}wcf.global.title{/lang}</label></dt>
 		<dd>
-			<input type="text" id="title" name="title" class="long">
+			<input type="text" id="title_{@$media->mediaID}" name="title" class="long" value="TODO">
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
+	{include file='multipleLanguageInputJavascript' elementIdentifier='title'|concat:'_':$media->mediaID forceSelection=true}
 	
 	<dl>
-		<dt><label for="caption">{lang}wcf.media.caption{/lang}</label></dt>
+		<dt><label for="caption_{@$media->mediaID}">{lang}wcf.media.caption{/lang}</label></dt>
 		<dd>
-			<textarea id="caption" name="caption" cols="40" rows="3"></textarea>
+			<textarea id="caption_{@$media->mediaID}" name="caption" cols="40" rows="3">TODO</textarea>
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='caption' forceSelection=true}
+	{include file='multipleLanguageInputJavascript' elementIdentifier='caption'|concat:'_':$media->mediaID forceSelection=true}
 	
 	<dl>
-		<dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
+		<dt><label for="altText_{@$media->mediaID}">{lang}wcf.media.altText{/lang}</label></dt>
 		<dd>
-			<input type="text" id="altText" name="altText" class="long">
+			<input type="text" id="altText_{@$media->mediaID}" name="altText" class="long" value="TODO">
 		</dd>
 	</dl>
-	{include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
+	{include file='multipleLanguageInputJavascript' elementIdentifier='altText'|concat:'_':$media->mediaID forceSelection=true}
 	
 	{event name='dataFields'}
 </section>
 
+{include file='aclSimple'}
+
 <div class="formSubmit">
 	<button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl b/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
index ccac490856..76d9aae80d 100644
--- a/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
@@ -11,7 +11,6 @@
 			'wcf.media.insert.imageSize.original': '{lang}wcf.media.insert.imageSize.original{/lang}',
 			'wcf.media.manager': '{lang}wcf.media.manager{/lang}',
 			'wcf.media.edit': '{lang}wcf.media.edit{/lang}',
-			'wcf.media.imageDimensions.value': '{lang __literal=true}wcf.media.imageDimensions.value{/lang}',
 			'wcf.media.button.insert': '{lang}wcf.media.button.insert{/lang}',
 			'wcf.media.search.filetype': '{lang}wcf.media.search.filetype{/lang}',
 			'wcf.media.search.noResults': '{lang}wcf.media.search.noResults{/lang}'
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Media/Editor.js b/wcfsetup/install/files/js/WoltLab/WCF/Media/Editor.js
index 7bae2439e7..04335cceaa 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Media/Editor.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Media/Editor.js
@@ -37,7 +37,7 @@ define(
 		this._callbackObject = callbackObject;
 		this._media = null;
 		
-		this._elements = {};
+		this._dialogs = new Dictionary();
 	};
 	MediaEditor.prototype = {
 		/**
@@ -64,13 +64,13 @@ define(
 			
 			this._callbackObject._editorSuccess(this._media);
 			
-			UiDialog.close('mediaEditor');
+			UiDialog.close('mediaEditor_' + this._media.mediaID);
 			
 			this._media = null;
 		},
 		
 		/**
-		 * Is called if the editor is manually closed by the user.
+		 * Is called if an editor is manually closed by the user.
 		 */
 		_close: function() {
 			this._media = null;
@@ -78,55 +78,6 @@ define(
 			this._callbackObject._editorClose();
 		},
 		
-		/**
-		 * Returns the data for Ui/Dialog to setup the editor dialog.
-		 * 
-		 * @return	{object}	data to setup the editor dialog
-		 */
-		_dialogSetup: function() {
-			return {
-				id: 'mediaEditor',
-				options: {
-					backdropCloseOnClick: false,
-					onClose: this._close.bind(this),
-					title: Language.get('wcf.media.edit')
-				},
-				source: {
-					after: (function(content, data) {
-						var editor = UiDialog.getDialog('mediaEditor').content;
-						
-						// data elements
-						this._elements.thumbnail = elById('mediaThumbnail');
-						this._elements.filename = elById('mediaFilename');
-						this._elements.filesize = elById('mediaFilesize');
-						this._elements.imageDimensions = elById('mediaImageDimensions');
-						this._elements.fileIcon = elById('mediaFileIcon');
-						this._elements.uploader = elById('mediaUploader');
-						
-						// input elements
-						this._elements.altText = elById('altText');
-						this._elements.caption = elById('caption');
-						this._elements.isMultilingual = elById('isMultilingual');
-						this._elements.isMultilingual.addEventListener('change', this._updateLanguageFields.bind(this));
-						this._elements.title = elById('title');
-						this._elements.languageIdContainer = elById('languageIDContainer');
-						
-						var keyPress = this._keyPress.bind(this);
-						this._elements.altText.addEventListener('keypress', keyPress);
-						this._elements.title.addEventListener('keypress', keyPress);
-						
-						setTimeout(this._setData.bind(this), 100);
-						
-						elBySel('button[data-type="submit"]', editor).addEventListener(WCF_CLICK_EVENT, this._saveData.bind(this));
-					}).bind(this),
-					data: {
-						actionName: 'getEditorDialog',
-						className: 'wcf\\data\\media\\MediaAction'
-					}
-				}
-			};
-		},
-		
 		/**
 		 * Handles the `[ENTER]` key to submit the form.
 		 * 
@@ -145,54 +96,76 @@ define(
 		 * Saves the data of the currently edited media.
 		 */
 		_saveData: function() {
+			var content = UiDialog.getDialog('mediaEditor_' + this._media.mediaID).content;
+			
+			var altText = elBySel('input[name=altText]', content);
+			var caption = elBySel('textarea[name=caption]', content);
+			var title = elBySel('input[name=title]', content);
+			
 			var hasError = false;
-			var altTextError = DomTraverse.childByClass(this._elements.altText.parentNode.parentNode, 'innerError');
-			var captionError = DomTraverse.childByClass(this._elements.caption.parentNode.parentNode, 'innerError');
-			var titleError = DomTraverse.childByClass(this._elements.title.parentNode.parentNode, 'innerError');
+			var altTextError = DomTraverse.childByClass(altText.parentNode.parentNode, 'innerError');
+			var captionError = DomTraverse.childByClass(caption.parentNode.parentNode, 'innerError');
+			var titleError = DomTraverse.childByClass(title.parentNode.parentNode, 'innerError');
 			
-			this._media.isMultilingual = ~~this._elements.isMultilingual.checked;
+			this._media.isMultilingual = ~~elBySel('input[name=isMultilingual]', content).checked;
 			this._media.languageID = this._media.isMultilingual ? null : LanguageChooser.getLanguageId('languageID');
 			
 			this._media.altText = {};
 			this._media.caption = {};
 			this._media.title = {};
 			if (this._media.isMultilingual) {
-				if (!LanguageInput.validate('altText', true)) {
+				if (!LanguageInput.validate('altText_' + this._media.mediaID, true)) {
 					hasError = true;
 					if (!altTextError) {
 						var error = elCreate('small');
 						error.className = 'innerError';
 						error.textContent = Language.get('wcf.global.form.error.multilingual');
-						this._elements.altText.parentNode.parentNode.appendChild(error);
+						altText.parentNode.parentNode.appendChild(error);
 					}
 				}
-				if (!LanguageInput.validate('caption', true)) {
+				if (!LanguageInput.validate('caption_' + this._media.mediaID, true)) {
 					hasError = true;
 					if (!captionError) {
 						var error = elCreate('small');
 						error.className = 'innerError';
 						error.textContent = Language.get('wcf.global.form.error.multilingual');
-						this._elements.caption.parentNode.parentNode.appendChild(error);
+						caption.parentNode.parentNode.appendChild(error);
 					}
 				}
-				if (!LanguageInput.validate('title', true)) {
+				if (!LanguageInput.validate('title_' + this._media.mediaID, true)) {
 					hasError = true;
 					if (!titleError) {
 						var error = elCreate('small');
 						error.className = 'innerError';
 						error.textContent = Language.get('wcf.global.form.error.multilingual');
-						this._elements.title.parentNode.parentNode.appendChild(error);
+						thistitle.parentNode.parentNode.appendChild(error);
 					}
 				}
 				
-				this._media.altText = LanguageInput.getValues('altText').toObject();
-				this._media.caption = LanguageInput.getValues('caption').toObject();
-				this._media.title = LanguageInput.getValues('title').toObject();
+				this._media.altText = LanguageInput.getValues('altText_' + this._media.mediaID).toObject();
+				this._media.caption = LanguageInput.getValues('caption_' + this._media.mediaID).toObject();
+				this._media.title = LanguageInput.getValues('title_' + this._media.mediaID).toObject();
 			}
 			else {
-				this._media.altText[this._media.languageID] = this._elements.altText.value;
-				this._media.caption[this._media.languageID] = this._elements.caption.value;
-				this._media.title[this._media.languageID] = this._elements.title.value;
+				this._media.altText[this._media.languageID] = altText.value;
+				this._media.caption[this._media.languageID] = caption.value;
+				this._media.title[this._media.languageID] = title.value;
+			}
+			
+			var aclValues = {
+				allowAll: ~~elById('mediaEditor_' + this._media.mediaID + '_aclAllowAll').checked,
+				group: [],
+				user: [],
+			};
+			
+			var aclGroups = elBySelAll('input[name="aclValues[group][]"]', content);
+			for (var i = 0, length = aclGroups.length; i < length; i++) {
+				aclValues.group.push(~~aclGroups[i].value);
+			}
+			
+			var aclUsers = elBySelAll('input[name="aclValues[user][]"]', content);
+			for (var i = 0, length = aclUsers.length; i < length; i++) {
+				aclValues.user.push(~~aclUsers[i].value);
 			}
 			
 			if (!hasError) {
@@ -204,6 +177,7 @@ define(
 					actionName: 'update',
 					objectIDs: [ this._media.mediaID ],
 					parameters: {
+						aclValues: aclValues,
 						altText: this._media.altText,
 						caption: this._media.caption,
 						data: {
@@ -216,92 +190,28 @@ define(
 			}
 		},
 		
-		/**
-		 * Inserts the data of the currently edited media into the dialog.
-		 */
-		_setData: function() {
-			this._elements.thumbnail.innerHTML = '';
-			
-			this._elements.filename.textContent = this._media.filename;
-			this._elements.filesize.textContent = this._media.formattedFilesize;
-			
-			this._elements.uploader.innerHTML = '';
-			if (this._media.userLink) {
-				var a = elCreate('a');
-				a.className = 'userLink';
-				elAttr(a, 'href', this._media.userLink);
-				elData(a, 'user-id', this._media.userID);
-				a.textContent = this._media.username;
-				
-				this._elements.uploader.appendChild(a);
-			}
-			else {
-				this._elements.uploader.textContent = this._media.username;
-			}
-			
-			if (this._media.isImage) {
-				if (this._media.smallThumbnailLink) {
-					var img = elCreate('img');
-					elAttr(img, 'src', this._media.smallThumbnailLink);
-					elAttr(img, 'alt', '');
-					
-					this._elements.thumbnail.appendChild(img);
-				}
-				
-				this._elements.imageDimensions.textContent = Language.get('wcf.media.imageDimensions.value', {
-					height: this._media.height,
-					width: this._media.width
-				});
-				elShow(this._elements.imageDimensions);
-				elShow(this._elements.imageDimensions.previousElementSibling);
-				
-				this._elements.fileIcon.className = 'icon icon48 fa-file-image-o';
-			}
-			else {
-				elHide(this._elements.imageDimensions);
-				elHide(this._elements.imageDimensions.previousElementSibling);
-				
-				this._elements.fileIcon.className = 'icon icon48 ' + FileUtil.getIconClassByMimeType(this._media.fileType);
-			}
-			
-			this._elements.isMultilingual.checked = this._media.isMultilingual;
-			
-			LanguageChooser.setLanguageId('languageID', this._media.languageID || LANGUAGE_ID);
-			
-			if (this._media.isMultilingual) {
-				LanguageInput.setValues('altText', Dictionary.fromObject(this._media.altText || { }));
-				LanguageInput.setValues('caption', Dictionary.fromObject(this._media.caption || { }));
-				LanguageInput.setValues('title', Dictionary.fromObject(this._media.title || { }));
-			}
-			else {
-				this._elements.altText.value = this._media.altText ? this._media.altText[this._media.languageID] : '';
-				this._elements.caption.value = this._media.caption ? this._media.caption[this._media.languageID] : '';
-				this._elements.title.value = this._media.title ? this._media.title[this._media.languageID] : '';
-			}
-			
-			this._updateLanguageFields();
-			
-			DomChangeListener.trigger();
-		},
-		
 		/**
 		 * Updates language-related input fields depending on whether multilingualism
 		 * is enabled.
 		 */
-		_updateLanguageFields: function() {
-			if (this._elements.isMultilingual.checked) {
-				LanguageInput.enable('title');
-				LanguageInput.enable('caption');
-				LanguageInput.enable('altText');
+		_updateLanguageFields: function(event, element) {
+			if (event) element = event.currentTarget;
+			
+			var languageChooserContainer = elById('mediaEditor_' + this._media.mediaID + '_languageIDContainer').parentNode;
+			
+			if (element.checked) {
+				LanguageInput.enable('title_' + this._media.mediaID);
+				LanguageInput.enable('caption_' + this._media.mediaID);
+				LanguageInput.enable('altText_' + this._media.mediaID);
 				
-				elHide(this._elements.languageIdContainer.parentNode);
+				elHide(languageChooserContainer);
 			}
 			else {
-				LanguageInput.disable('title');
-				LanguageInput.disable('caption');
-				LanguageInput.disable('altText');
+				LanguageInput.disable('title_' + this._media.mediaID);
+				LanguageInput.disable('caption_' + this._media.mediaID);
+				LanguageInput.disable('altText_' + this._media.mediaID);
 				
-				elShow(this._elements.languageIdContainer.parentNode);
+				elShow(languageChooserContainer);
 			}
 		},
 		
@@ -317,10 +227,57 @@ define(
 			
 			this._media = media;
 			
-			if (UiDialog.getDialog('mediaEditor') !== undefined) {
-				this._setData();
+			if (!this._dialogs.has('mediaEditor_' + media.mediaID)) {
+				this._dialogs.set('mediaEditor_' + media.mediaID, {
+					_dialogSetup: function() {
+						return {
+							id: 'mediaEditor_' + media.mediaID,
+							options: {
+								backdropCloseOnClick: false,
+								onClose: this._close.bind(this),
+								title: Language.get('wcf.media.edit')
+							},
+							source: {
+								after: (function(content, data) {
+									setTimeout(function() {
+										LanguageChooser.setLanguageId('languageID', this._media.languageID || LANGUAGE_ID);
+										
+										if (this._media.isMultilingual) {
+											LanguageInput.setValues('altText_' + this._media.mediaID, Dictionary.fromObject(this._media.altText || { }));
+											LanguageInput.setValues('caption_' + this._media.mediaID, Dictionary.fromObject(this._media.caption || { }));
+											LanguageInput.setValues('title_' + this._media.mediaID, Dictionary.fromObject(this._media.title || { }));
+										}
+										
+										var isMultilingual = elBySel('input[name=isMultilingual]', content);
+										isMultilingual.addEventListener('change', this._updateLanguageFields.bind(this));
+										
+										this._updateLanguageFields(null, isMultilingual);
+										
+										var keyPress = this._keyPress.bind(this);
+										elBySel('input[name=altText]', content).addEventListener('keypress', keyPress);
+										elBySel('input[name=title]', content).addEventListener('keypress', keyPress);
+										
+										elBySel('button[data-type=submit]', content).addEventListener(WCF_CLICK_EVENT, this._saveData.bind(this));
+										
+										// remove focus from input elements and scroll dialog to top
+										document.activeElement.blur();
+										elById('mediaEditor_' + this._media.mediaID).parentNode.scrollTop = 0;
+										
+										DomChangeListener.trigger();
+									}.bind(this), 100);
+								}).bind(this),
+								data: {
+									actionName: 'getEditorDialog',
+									className: 'wcf\\data\\media\\MediaAction',
+									objectIDs: [media.mediaID]
+								}
+							}
+						};
+					}.bind(this),
+				});
 			}
-			UiDialog.open(this);
+			
+			UiDialog.open(this._dialogs.get('mediaEditor_' + media.mediaID));
 		}
 	};
 	
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Acl/Simple.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Acl/Simple.js
index 6dd00ada85..a7bf8e0429 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Acl/Simple.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Acl/Simple.js
@@ -1,31 +1,33 @@
 define(['Language', 'Dom/ChangeListener', 'WoltLab/WCF/Ui/User/Search/Input'], function(Language, DomChangeListener, UiUserSearchInput) {
 	"use strict";
 	
-	function UiAclSimple() { this.init(); }
+	function UiAclSimple(prefix) { this.init(prefix); }
 	UiAclSimple.prototype = {
-		init: function() {
+		init: function(prefix) {
+			this._prefix = prefix || '';
+			
 			this._build();
 		},
 		
 		_build: function () {
-			var container = elById('aclInputContainer');
+			var container = elById(this._prefix + 'aclInputContainer');
 			
-			elById('aclAllowAll').addEventListener('change', (function() {
+			elById(this._prefix + 'aclAllowAll').addEventListener('change', (function() {
 				elHide(container);
 			}));
-			elById('aclAllowAll_no').addEventListener('change', (function() {
+			elById(this._prefix + 'aclAllowAll_no').addEventListener('change', (function() {
 				elShow(container);
 			}));
 			
-			new UiUserSearchInput(elById('aclSearchInput'), {
+			new UiUserSearchInput(elById(this._prefix + 'aclSearchInput'), {
 				callbackSelect: this._select.bind(this),
 				includeUserGroups: true,
 				preventSubmit: true
 			});
 			
-			this._aclListContainer = elById('aclListContainer');
+			this._aclListContainer = elById(this._prefix + 'aclListContainer');
 			
-			this._list = elById('aclAccessList');
+			this._list = elById(this._prefix + 'aclAccessList');
 			this._list.addEventListener(WCF_CLICK_EVENT, this._removeItem.bind(this));
 			
 			DomChangeListener.trigger();
diff --git a/wcfsetup/install/files/lib/acp/form/MediaEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MediaEditForm.class.php
index 0cdaf3d53e..97f37545b8 100644
--- a/wcfsetup/install/files/lib/acp/form/MediaEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MediaEditForm.class.php
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\data\media\MediaAction;
 use wcf\data\media\ViewableMedia;
 use wcf\form\AbstractForm;
+use wcf\system\acl\simple\SimpleAclHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
@@ -20,6 +21,12 @@ use wcf\util\ArrayUtil;
  * @since	3.0
  */
 class MediaEditForm extends AbstractForm {
+	/**
+	 * acl values
+	 * @var array
+	 */
+	public $aclValues = [];
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -63,6 +70,7 @@ class MediaEditForm extends AbstractForm {
 		I18nHandler::getInstance()->assignVariables();
 		
 		WCF::getTPL()->assign([
+			'aclValues' => SimpleAclHandler::getInstance()->getOutputValues($this->aclValues),
 			'action' => 'edit',
 			'isMultilingual' => $this->isMultilingual,
 			'languages' => LanguageFactory::getInstance()->getLanguages(),
@@ -96,6 +104,8 @@ class MediaEditForm extends AbstractForm {
 				if (!empty($contentData['caption'])) I18nHandler::getInstance()->setValues('caption', $contentData['caption']);
 				if (!empty($contentData['title'])) I18nHandler::getInstance()->setValues('title', $contentData['title']);
 			}
+			
+			$this->aclValues = SimpleAclHandler::getInstance()->getValues('com.woltlab.wcf.media', $this->media->mediaID);
 		}
 		
 		if (!$this->languageID) {
@@ -114,6 +124,8 @@ class MediaEditForm extends AbstractForm {
 			if (isset($_POST['languageID'])) $this->languageID = intval($_POST['languageID']);
 		}
 		I18nHandler::getInstance()->readValues();
+		
+		if (isset($_POST['aclValues']) && is_array($_POST['aclValues'])) $this->aclValues = $_POST['aclValues'];
 	}
 	
 	/**
@@ -151,6 +163,9 @@ class MediaEditForm extends AbstractForm {
 		]));
 		$this->objectAction->executeAction();
 		
+		// save acl
+		SimpleAclHandler::getInstance()->setValues('com.woltlab.wcf.media', $this->media->mediaID, $this->aclValues);
+		
 		$this->saved();
 		
 		WCF::getTPL()->assign('success', true);
diff --git a/wcfsetup/install/files/lib/data/article/content/ViewableArticleContent.class.php b/wcfsetup/install/files/lib/data/article/content/ViewableArticleContent.class.php
index 78da2ee575..abab56b4ba 100644
--- a/wcfsetup/install/files/lib/data/article/content/ViewableArticleContent.class.php
+++ b/wcfsetup/install/files/lib/data/article/content/ViewableArticleContent.class.php
@@ -12,7 +12,7 @@ use wcf\data\DatabaseObjectDecorator;
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	WoltLabSuite\Core\Data\Article\Content
  * @since	3.0
- *
+ * 
  * @method	ArticleContent	getDecoratedObject()
  * @mixin	ArticleContent
  */
@@ -34,25 +34,10 @@ class ViewableArticleContent extends DatabaseObjectDecorator {
 	 */
 	protected $article;
 	
-	/**
-	 * Gets a specific article content decorated as viewable article content.
-	 *
-	 * @param	integer		$articleContentID
-	 * @return	ViewableArticleContent
-	 */
-	public static function getArticleContent($articleContentID) {
-		$list = new ViewableArticleContentList();
-		$list->setObjectIDs([$articleContentID]);
-		$list->readObjects();
-		$objects = $list->getObjects();
-		if (isset($objects[$articleContentID])) return $objects[$articleContentID];
-		return null;
-	}
-	
 	/**
 	 * Returns article object.
-	 *
-	 * @return ViewableArticle
+	 * 
+	 * @return	ViewableArticle
 	 */
 	public function getArticle() {
 		if ($this->article === null) {
@@ -64,27 +49,29 @@ class ViewableArticleContent extends DatabaseObjectDecorator {
 	
 	/**
 	 * Sets the article objects.
-	 *
-	 * @param ViewableArticle $article
+	 * 
+	 * @param	ViewableArticle		$article
 	 */
 	public function setArticle(ViewableArticle $article) {
 		$this->article = $article;
 	}
 	
 	/**
-	 * Returns the article's image.
-	 *
-	 * @return ViewableMedia
+	 * Returns the article's image if the active user can access it or `null`.
+	 * 
+	 * @return	ViewableMedia|null
 	 */
 	public function getImage() {
 		if ($this->image === null) {
 			if ($this->imageID) {
 				$this->image = ViewableMedia::getMedia($this->imageID);
-				
-				$this->image->setLinkParameters(['articleID' => $this->articleID]);
 			}
 		}
 		
+		if ($this->image === null || !$this->image->isAccessible()) {
+			return null;
+		}
+		
 		return $this->image;
 	}
 	
@@ -95,6 +82,19 @@ class ViewableArticleContent extends DatabaseObjectDecorator {
 	 */
 	public function setImage(ViewableMedia $image) {
 		$this->image = $image;
-		$this->image->setLinkParameters(['articleID' => $this->articleID]);
+	}
+	
+	/**
+	 * Returns a specific article content decorated as viewable article content.
+	 * 
+	 * @param	integer		$articleContentID
+	 * @return	ViewableArticleContent
+	 */
+	public static function getArticleContent($articleContentID) {
+		$list = new ViewableArticleContentList();
+		$list->setObjectIDs([$articleContentID]);
+		$list->readObjects();
+		
+		return $list->search($articleContentID);
 	}
 }
diff --git a/wcfsetup/install/files/lib/data/box/Box.class.php b/wcfsetup/install/files/lib/data/box/Box.class.php
index f6511043f5..35bd9c0156 100644
--- a/wcfsetup/install/files/lib/data/box/Box.class.php
+++ b/wcfsetup/install/files/lib/data/box/Box.class.php
@@ -28,7 +28,7 @@ use wcf\system\WCF;
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	WoltLabSuite\Core\Data\Box
  * @since	3.0
- *
+ * 
  * @property-read	integer		$boxID
  * @property-read	integer|null	$objectTypeID		id of the box controller object type
  * @property-read	string		$identifier
@@ -107,6 +107,17 @@ class Box extends DatabaseObject {
 	 */
 	public $boxContents;
 	
+	/**
+	 * @var	IMenuPageHandler
+	 */
+	protected $linkPageHandler;
+	
+	/**
+	 * page object
+	 * @var	Page
+	 */
+	protected $linkPage;
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -133,17 +144,6 @@ class Box extends DatabaseObject {
 		}
 	}
 	
-	/**
-	 * @var	IMenuPageHandler
-	 */
-	protected $linkPageHandler;
-	
-	/**
-	 * page object
-	 * @var	Page
-	 */
-	protected $linkPage;
-	
 	/**
 	 * Returns true if the active user can delete this box.
 	 * 
@@ -323,56 +323,37 @@ class Box extends DatabaseObject {
 	 * @return	ViewableMedia
 	 */
 	public function getImage() {
-		if ($this->boxType == 'system') {
-			return $this->getController()->getImage();
-		}
-		else if ($this->boxType == 'menu') {
+		if ($this->boxType === 'menu') {
 			return null;
 		}
 		
-		if ($this->image !== null) {
-			return $this->image;
-		}
-		
-		$this->getBoxContents();
-		if ($this->isMultilingual) {
-			if (isset($this->boxContents[WCF::getLanguage()->languageID]) && $this->boxContents[WCF::getLanguage()->languageID]->imageID) {
-				$this->image = ViewableMedia::getMedia($this->boxContents[WCF::getLanguage()->languageID]->imageID);
+		if ($this->image === null) {
+			if ($this->boxType === 'system') {
+				$this->image = $this->getController()->getImage();
+			}
+			else {
+				$this->getBoxContents();
+				if ($this->isMultilingual) {
+					if (isset($this->boxContents[WCF::getLanguage()->languageID]) && $this->boxContents[WCF::getLanguage()->languageID]->imageID) {
+						$this->image = ViewableMedia::getMedia($this->boxContents[WCF::getLanguage()->languageID]->imageID);
+					}
+				}
+				else if (isset($this->boxContents[0]) && $this->boxContents[0]->imageID) {
+					$this->image = ViewableMedia::getMedia($this->boxContents[0]->imageID);
+				}
 			}
-		}
-		else if (isset($this->boxContents[0]) && $this->boxContents[0]->imageID) {
-			$this->image = ViewableMedia::getMedia($this->boxContents[0]->imageID);
-		}
-		
-		$this->image->setLinkParameters(['boxID' => $this->boxID]);
-		
-		return $this->image;
-	}
-	
-	/**
-	 * Returns true if this box has an image.
-	 * 
-	 * @return	boolean
-	 */
-	public function hasImage() {
-		if ($this->boxType == 'system') {
-			return $this->getController()->hasImage();
-		}
-		else if ($this->boxType == 'menu') {
-			return false;
 		}
 		
-		$this->getBoxContents();
-		if ($this->isMultilingual) {
-			return (isset($this->boxContents[WCF::getLanguage()->languageID]) && $this->boxContents[WCF::getLanguage()->languageID]->imageID);
+		if ($this->image === null || !$this->image->isAccessible()) {
+			return null;
 		}
 		
-		return (isset($this->boxContents[0]) && $this->boxContents[0]->imageID);
+		return $this->image;
 	}
 	
 	/**
 	 * Returns the URL of this box.
-	 *
+	 * 
 	 * @return	string
 	 */
 	public function getLink() {
diff --git a/wcfsetup/install/files/lib/data/media/Media.class.php b/wcfsetup/install/files/lib/data/media/Media.class.php
index 18caa5934b..57037182a2 100644
--- a/wcfsetup/install/files/lib/data/media/Media.class.php
+++ b/wcfsetup/install/files/lib/data/media/Media.class.php
@@ -3,6 +3,7 @@ namespace wcf\data\media;
 use wcf\data\DatabaseObject;
 use wcf\data\ILinkableObject;
 use wcf\data\IThumbnailFile;
+use wcf\system\acl\simple\SimpleAclResolver;
 use wcf\system\request\IRouteController;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
@@ -53,12 +54,6 @@ class Media extends DatabaseObject implements ILinkableObject, IRouteController,
 	 */
 	protected $i18nData;
 	
-	/**
-	 * parameters used to build the link to the media file
-	 * @var	array
-	 */
-	protected $linkParameters = [];
-	
 	/**
 	 * @inheritDoc
 	 */
@@ -100,18 +95,7 @@ class Media extends DatabaseObject implements ILinkableObject, IRouteController,
 	 * @inheritDoc
 	 */
 	public function getLink() {
-		return LinkHandler::getInstance()->getLink('Media', array_merge($this->linkParameters, [
-			'object' => $this
-		]));
-	}
-	
-	/**
-	 * Sets additional parameters used to build the link to the media file.
-	 * 
-	 * @param	array		$parameters
-	 */
-	public function setLinkParameters(array $parameters) {
-		$this->linkParameters = $parameters;
+		return LinkHandler::getInstance()->getLink('Media', ['object' => $this]);
 	}
 	
 	/**
@@ -133,10 +117,10 @@ class Media extends DatabaseObject implements ILinkableObject, IRouteController,
 			return $this->getLink();
 		}
 		
-		return LinkHandler::getInstance()->getLink('Media', array_merge($this->linkParameters, [
+		return LinkHandler::getInstance()->getLink('Media', [
 			'object' => $this,
 			'thumbnail' => $size
-		]));
+		]);
 	}
 	
 	/**
@@ -224,6 +208,15 @@ class Media extends DatabaseObject implements ILinkableObject, IRouteController,
 		return $this->i18nData;
 	}
 	
+	/**
+	 * Returns true if the media file can be accessed by the active user.
+	 * 
+	 * @return	boolean
+	 */
+	public function isAccessible() {
+		return WCF::getSession()->getPermission('admin.content.cms.canManageMedia') || SimpleAclResolver::getInstance()->canAccess('com.woltlab.wcf.media', $this->mediaID);
+	}
+	
 	/**
 	 * Returns the storage path of the media files.
 	 * 
diff --git a/wcfsetup/install/files/lib/data/media/MediaAction.class.php b/wcfsetup/install/files/lib/data/media/MediaAction.class.php
index 475c12530d..0c40ecabcc 100644
--- a/wcfsetup/install/files/lib/data/media/MediaAction.class.php
+++ b/wcfsetup/install/files/lib/data/media/MediaAction.class.php
@@ -3,6 +3,7 @@ namespace wcf\data\media;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\ISearchAction;
 use wcf\data\IUploadAction;
+use wcf\system\acl\simple\SimpleAclHandler;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\PermissionDeniedException;
@@ -238,6 +239,8 @@ class MediaAction extends AbstractDatabaseObjectAction implements ISearchAction,
 	 */
 	public function validateGetEditorDialog() {
 		WCF::getSession()->checkPermissions(['admin.content.cms.canManageMedia']);
+		
+		$this->getSingleObject();
 	}
 	
 	/**
@@ -246,15 +249,21 @@ class MediaAction extends AbstractDatabaseObjectAction implements ISearchAction,
 	 * @return	string[]
 	 */
 	public function getEditorDialog() {
-		I18nHandler::getInstance()->register('title');
-		I18nHandler::getInstance()->register('caption');
-		I18nHandler::getInstance()->register('altText');
+		$media = new ViewableMedia($this->getSingleObject()->getDecoratedObject());
+		
+		I18nHandler::getInstance()->register('title_' . $media->mediaID);
+		I18nHandler::getInstance()->register('caption_' . $media->mediaID);
+		I18nHandler::getInstance()->register('altText_' . $media->mediaID);
 		I18nHandler::getInstance()->assignVariables();
 		
 		return [
 			'template' => WCF::getTPL()->fetch('mediaEditor', 'wcf', [
+				'__aclSimplePrefix' => 'mediaEditor_' . $media->mediaID . '_',
+				'aclValues' => SimpleAclHandler::getInstance()->getValues('com.woltlab.wcf.media', $media->mediaID),
+				'__languageChooserPrefix' => 'mediaEditor_' . $media->mediaID . '_',
 				'languageID' => WCF::getUser()->languageID,
-				'languages' => LanguageFactory::getInstance()->getLanguages()
+				'languages' => LanguageFactory::getInstance()->getLanguages(),
+				'media' => $media
 			])
 		];
 	}
@@ -362,6 +371,10 @@ class MediaAction extends AbstractDatabaseObjectAction implements ISearchAction,
 					]);
 				}
 			}
+			
+			if (!empty($this->parameters['aclValues'])) {
+				SimpleAclHandler::getInstance()->setValues('com.woltlab.wcf.media', $media->mediaID, $this->parameters['aclValues']);
+			}
 		}
 	}
 	
diff --git a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
index f301489031..2568f41e58 100644
--- a/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
+++ b/wcfsetup/install/files/lib/data/media/ViewableMedia.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\data\media;
+use wcf\data\user\UserProfile;
 use wcf\data\DatabaseObjectDecorator;
+use wcf\system\cache\runtime\UserProfileRuntimeCache;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 
@@ -20,6 +22,12 @@ use wcf\util\StringUtil;
  * @property-read	string|null	$altText
  */
 class ViewableMedia extends DatabaseObjectDecorator {
+	/**
+	 * user profile of the user who uploaded the media file
+	 * @var	UserProfile
+	 */
+	protected $userProfile;
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -70,6 +78,24 @@ class ViewableMedia extends DatabaseObjectDecorator {
 		return '<img src="'.StringUtil::encodeHTML($this->getThumbnailLink($size)).'" alt="'.StringUtil::encodeHTML($this->altText).'" '.($this->title ? 'title="'.StringUtil::encodeHTML($this->title).'" ' : '').'style="width: ' . $this->getThumbnailWidth($size) . 'px; height: ' . $this->getThumbnailHeight($size) . 'px;">';
 	}
 	
+	/**
+	 * Returns the user profile of the user who uploaded the media file.
+	 * 
+	 * @return	UserProfile
+	 */
+	public function getUserProfile() {
+		if ($this->userProfile === null) {
+			if ($this->userID) {
+				$this->userProfile = UserProfileRuntimeCache::getInstance()->getObject($this->userID);
+			}
+			else {
+				$this->userProfile = UserProfile::getGuestUserProfile($this->username);
+			}
+		}
+		
+		return $this->userProfile;
+	}
+	
 	/**
 	 * Returns the viewable media file with the given id.
 	 * 
diff --git a/wcfsetup/install/files/lib/page/MediaPage.class.php b/wcfsetup/install/files/lib/page/MediaPage.class.php
index 514573882c..ddf24739b2 100644
--- a/wcfsetup/install/files/lib/page/MediaPage.class.php
+++ b/wcfsetup/install/files/lib/page/MediaPage.class.php
@@ -23,30 +23,6 @@ use wcf\util\StringUtil;
  * @since	3.0
  */
 class MediaPage extends AbstractPage {
-	/**
-	 * article which uses the media file as the main article image
-	 * @var	Article|null
-	 */
-	public $article;
-	
-	/**
-	 * id of the article which uses the media file as the main article image
-	 * @var	integer
-	 */
-	public $articleID = 0;
-	
-	/**
-	 * box which uses the media file as box image
-	 * @var	Box
-	 */
-	public $box;
-	
-	/**
-	 * id of the box which uses the media file as box image
-	 * @var	integer
-	 */
-	public $boxID = 0;
-	
 	/**
 	 * etag for the media file
 	 * @var	string
@@ -65,24 +41,6 @@ class MediaPage extends AbstractPage {
 	 */
 	public $media;
 	
-	/**
-	 * message in which the media is embedded
-	 * @var	IMessage
-	 */
-	public $message;
-	
-	/**
-	 * id of the message in which the media is embedded
-	 * @var	integer
-	 */
-	public $messageID = 0;
-	
-	/**
-	 * name of the object type of the message in which the media is embedded
-	 * @var	string
-	 */
-	public $messageObjectType = '';
-	
 	/**
 	 * id of the requested media file
 	 * @var	integer
@@ -113,46 +71,6 @@ class MediaPage extends AbstractPage {
 		'image/pjpeg'
 	];
 	
-	/**
-	 * @inheritDoc
-	 */
-	public function checkPermissions() {
-		parent::checkPermissions();
-		
-		if (!WCF::getSession()->getPermission('admin.content.cms.canManageMedia')) {
-			if ($this->articleID) {
-				$this->article = new Article($this->articleID);
-				
-				if (!$this->article->articleID || !$this->article->canRead()) {
-					throw new PermissionDeniedException();
-				}
-			}
-			else if ($this->boxID) {
-				$this->box = BoxHandler::getInstance()->getBox($this->boxID);
-				
-				if ($this->box === null || !$this->box->isAccessible()) {
-					throw new PermissionDeniedException();
-				}
-			}
-			else if ($this->messageID) {
-				MessageEmbeddedObjectManager::getInstance()->loadObjects($this->messageObjectType, [$this->messageID]);
-				$this->message = MessageEmbeddedObjectManager::getInstance()->getObject($this->messageObjectType, $this->messageID);
-				if ($this->message === null || !($this->message instanceof IMessage) || !$this->message->isVisible()) {
-					throw new PermissionDeniedException();
-				}
-			}
-			else {
-				$parameters = ['canAccess' => false];
-				
-				EventHandler::getInstance()->fireAction($this, 'checkMediaAccess', $parameters);
-				
-				if (empty($parameters['canAccess'])) {
-					throw new PermissionDeniedException();
-				}
-			}
-		}
-	}
-	
 	/**
 	 * @inheritDoc
 	 */
@@ -201,6 +119,9 @@ class MediaPage extends AbstractPage {
 		if (!$this->media->mediaID) {
 			throw new IllegalLinkException();
 		}
+		if (!$this->media->isAccessible()) {
+			throw new PermissionDeniedException();
+		}
 		
 		if (isset($_REQUEST['thumbnail'])) $this->thumbnail = StringUtil::trim($_REQUEST['thumbnail']);
 		if ($this->thumbnail && !isset(Media::getThumbnailSizes()[$this->thumbnail])) {
@@ -210,18 +131,6 @@ class MediaPage extends AbstractPage {
 		if ($this->thumbnail && !$this->media->{$this->thumbnail.'ThumbnailType'}) {
 			$this->thumbnail = '';
 		}
-		
-		// read context parameters
-		if (isset($_REQUEST['articleID'])) {
-			$this->articleID = intval($_REQUEST['articleID']);
-		}
-		else if (isset($_REQUEST['boxID'])) {
-			$this->boxID = intval($_REQUEST['boxID']);
-		}
-		else if (isset($_REQUEST['messageObjectType']) && isset($_REQUEST['messageID'])) {
-			$this->messageObjectType = StringUtil::trim($_REQUEST['messageObjectType']);
-			$this->messageID = intval($_REQUEST['messageID']);
-		}
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/box/AbstractBoxController.class.php b/wcfsetup/install/files/lib/system/box/AbstractBoxController.class.php
index 8b8a9671ef..73742704eb 100644
--- a/wcfsetup/install/files/lib/system/box/AbstractBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/AbstractBoxController.class.php
@@ -69,13 +69,6 @@ abstract class AbstractBoxController implements IBoxController {
 		return null;
 	}
 	
-	/**
-	 * @inheritDoc
-	 */
-	public function hasImage() {
-		return false;
-	}
-	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/box/IBoxController.class.php b/wcfsetup/install/files/lib/system/box/IBoxController.class.php
index fc06a71f1d..f279bd020c 100644
--- a/wcfsetup/install/files/lib/system/box/IBoxController.class.php
+++ b/wcfsetup/install/files/lib/system/box/IBoxController.class.php
@@ -4,7 +4,7 @@ use wcf\data\box\Box;
 
 /**
  * Default interface for box controllers.
- *
+ * 
  * @author	Marcel Werk
  * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
@@ -28,18 +28,13 @@ interface IBoxController {
 	
 	/**
 	 * Returns the image of this box.
+	 * 
+	 * Note: The box itself checks if the active user can access the returned media file.
 	 *
 	 * @return	\wcf\data\media\ViewableMedia
 	 */
 	public function getImage();
 	
-	/**
-	 * Returns true if this box has an image.
-	 *
-	 * @return	boolean
-	 */
-	public function hasImage();
-	
 	/**
 	 * Returns the title link of this box.
 	 *
diff --git a/wcfsetup/install/files/style/ui/media.scss b/wcfsetup/install/files/style/ui/media.scss
index a2a7abda8c..55b8e5db3c 100644
--- a/wcfsetup/install/files/style/ui/media.scss
+++ b/wcfsetup/install/files/style/ui/media.scss
@@ -110,9 +110,10 @@
 	}
 }
 
-#mediaEditor {
-	#mediaThumbnail {
+[id^=mediaEditor] {
+	.mediaThumbnail {
 		text-align: center;
+		margin-bottom: 20px;
 		
 		+ .box48 > dl {
 			font-size: $wcfFontSizeSmall;
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 8161f6a8b6..aeb409af4c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2478,7 +2478,7 @@ Errors are:
 		<item name="wcf.media.filename"><![CDATA[Filename]]></item>
 		<item name="wcf.media.filesize"><![CDATA[Filesize]]></item>
 		<item name="wcf.media.imageDimensions"><![CDATA[Dimensions]]></item>
-		<item name="wcf.media.imageDimensions.value"><![CDATA[{#$width}×{#$height}]]></item>
+		<item name="wcf.media.imageDimensions.value"><![CDATA[{#$media->width}×{#$media->height}]]></item>
 		<item name="wcf.media.insert"><![CDATA[Insert File]]></item>
 		<item name="wcf.media.insert.imageSize"><![CDATA[Image Size]]></item>
 		<item name="wcf.media.insert.imageSize.large"><![CDATA[Large Thumbnail]]></item>