From 315c6dc0d6c20cebcfeeb9d8b411f96b41aedd94 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 29 Apr 2013 19:09:02 +0200
Subject: [PATCH] Group option overhaul

---
 com.woltlab.wcf/acpMenu.xml                   | 12 ++---
 com.woltlab.wcf/userGroupOption.xml           | 28 ++----------
 .../install/files/acp/templates/styleAdd.tpl  | 32 ++++++--------
 .../files/acp/templates/styleImport.tpl       | 20 +++------
 .../install/files/acp/templates/styleList.tpl | 44 +++++++------------
 .../acp/form/LanguageServerAddForm.class.php  |  2 +-
 .../acp/form/LanguageServerEditForm.class.php |  2 +-
 .../files/lib/acp/form/StyleAddForm.class.php |  2 +-
 .../lib/acp/form/StyleEditForm.class.php      |  2 +-
 .../lib/acp/form/StyleExportForm.class.php    |  2 +-
 .../lib/acp/form/StyleImportForm.class.php    |  2 +-
 .../form/UserOptionCategoryAddForm.class.php  |  2 +-
 .../acp/page/LanguageServerListPage.class.php |  2 +-
 .../lib/acp/page/StyleListPage.class.php      |  2 +-
 .../page/UserOptionCategoryListPage.class.php |  2 +-
 .../server/LanguageServerAction.class.php     |  6 +--
 .../lib/data/style/StyleAction.class.php      | 10 ++---
 .../UserOptionCategoryAction.class.php        |  6 +--
 wcfsetup/install/lang/de.xml                  |  1 -
 wcfsetup/install/lang/en.xml                  |  1 -
 20 files changed, 66 insertions(+), 114 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 39de7fadec..9d52085e89 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -250,12 +250,12 @@
 		<acpmenuitem name="wcf.acp.menu.link.user.option.category.list">
 			<controller><![CDATA[wcf\acp\page\UserOptionCategoryListPage]]></controller>
 			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOptionCategory</permissions>
+			<permissions>admin.user.canManageUserOption</permissions>
 		</acpmenuitem>
 		<acpmenuitem name="wcf.acp.menu.link.user.option.category.add">
 			<controller><![CDATA[wcf\acp\form\UserOptionCategoryAddForm]]></controller>
 			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOptionCategory</permissions>
+			<permissions>admin.user.canManageUserOption</permissions>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.user.option.setDefaults">
@@ -298,21 +298,21 @@
 		<acpmenuitem name="wcf.acp.menu.link.style.list">
 			<controller><![CDATA[wcf\acp\page\StyleListPage]]></controller>
 			<parent>wcf.acp.menu.link.style</parent>
-			<permissions>admin.style.canEditStyle,admin.style.canDeleteStyle</permissions>
+			<permissions>admin.style.canManageStyle</permissions>
 			<showorder>1</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.style.add">
 			<controller><![CDATA[wcf\acp\form\StyleAddForm]]></controller>
 			<parent>wcf.acp.menu.link.style</parent>
-			<permissions>admin.style.canAddStyle</permissions>
+			<permissions>admin.style.canManageStyle</permissions>
 			<showorder>2</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.style.import">
 			<controller><![CDATA[wcf\acp\form\StyleImportForm]]></controller>
 			<parent>wcf.acp.menu.link.style</parent>
-			<permissions>admin.style.canAddStyle</permissions>
+			<permissions>admin.style.canManageStyle</permissions>
 			<showorder>3</showorder>
 		</acpmenuitem>
 		<!-- /style -->
@@ -379,7 +379,7 @@
 		<acpmenuitem name="wcf.acp.menu.link.language.server.list">
 			<controller><![CDATA[wcf\acp\page\LanguageServerListPage]]></controller>
 			<parent>wcf.acp.menu.link.language.server</parent>
-			<permissions>admin.language.canManageServer</permissions>
+			<permissions>admin.language.canManageLanguage</permissions>
 		</acpmenuitem>
 		<!-- /language -->
 		
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index c40358e2bd..2486d60c75 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -183,12 +183,6 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.user.canManageUserOptionCategory">
-				<categoryname>admin.user.option</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
 			
 			<option name="admin.language.canManageLanguage">
 				<categoryname>admin.language</categoryname>
@@ -196,26 +190,8 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canManageServer">
-				<categoryname>admin.language</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
 			
-			<option name="admin.style.canAddStyle">
-				<categoryname>admin.style</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.style.canEditStyle">
-				<categoryname>admin.style</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.style.canDeleteStyle">
+			<option name="admin.style.canManageStyle">
 				<categoryname>admin.style</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
@@ -227,12 +203,14 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			
 			<option name="admin.display.canManagePageMenu">
 				<categoryname>admin.display.pageMenu</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			
 			<option name="admin.template.canManageTemplate">
 				<categoryname>admin.template</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 7ae6405d91..cd19b73b70 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -32,7 +32,7 @@
 		});
 		new WCF.ACP.Style.ImageUpload(0, '{$tmpHash}');
 		
-		{if $action == 'edit' && $__wcf->getSession()->getPermission('admin.style.canAddStyle')}
+		{if $action == 'edit'}
 			new WCF.ACP.Style.CopyStyle({@$style->styleID});
 			
 			WCF.Language.addObject({
@@ -56,24 +56,18 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $action == 'edit'}
-						<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button"><span class="icon icon16 icon-download-alt"></span> <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
-						{if $__wcf->getSession()->getPermission('admin.style.canAddStyle')}<li><a class="jsCopyStyle button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.style.copyStyle{/lang}</span></a></li>{/if}
-					{/if}
-					
-					{if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
-						<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			{if $action == 'edit'}
+				<li><a href="{link controller='StyleExport' id=$style->styleID}{/link}" class="button"><span class="icon icon16 icon-download-alt"></span> <span>{lang}wcf.acp.style.exportStyle{/lang}</span></a></li>
+				<li><a class="jsCopyStyle button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.style.copyStyle{/lang}</span></a></li>
+			{/if}
+			
+			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit' id=$styleID}{/link}{/if}">
diff --git a/wcfsetup/install/files/acp/templates/styleImport.tpl b/wcfsetup/install/files/acp/templates/styleImport.tpl
index 1edabb9fd0..eabeba1a58 100644
--- a/wcfsetup/install/files/acp/templates/styleImport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleImport.tpl
@@ -9,19 +9,13 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.style.canDeleteStyle') || $__wcf->session->getPermission('admin.style.canEditStyle')}
-						<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='StyleList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.style.list{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form method="post" action="{link controller='StyleImport'}{/link}" enctype="multipart/form-data">
diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index 3d20862808..9c374dd93a 100644
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -17,20 +17,14 @@
 <div class="contentNavigation">
 	{pages print=true assign=pagesLinks controller="StyleList" link="pageNo=%d"}
 	
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.style.canAddStyle')}
-						<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
-						<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 icon-upload-alt"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtonsTop'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
+			<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 icon-upload-alt"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
 </div>
 
 <div class="container marginTop">
@@ -78,20 +72,14 @@
 <div class="contentNavigation">
 	{@$pagesLinks}
 	
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.style.canAddStyle')}
-						<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
-						<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 icon-upload-alt"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtonsBottom'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='StyleAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.style.add{/lang}</span></a></li>
+			<li><a href="{link controller='StyleImport'}{/link}" class="button"><span class="icon icon16 icon-upload-alt"></span> <span>{lang}wcf.acp.menu.link.style.import{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtonsBottom'}
+		</ul>
+	</nav>
 </div>
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
index a6f9df90ab..e19cf5dba3 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
@@ -27,7 +27,7 @@ class LanguageServerAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canManageServer');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * server url
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
index 45533aa202..2d6c600e0b 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
@@ -25,7 +25,7 @@ class LanguageServerEditForm extends LanguageServerAddForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canManageServer');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * language server id
diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index 7ca219682a..9a14217efc 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@ -114,7 +114,7 @@ class StyleAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.style.canAddStyle');
+	public $neededPermissions = array('admin.style.canManageStyle');
 	
 	/**
 	 * last change date
diff --git a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
index ba27ccdca1..8ce2966401 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
@@ -26,7 +26,7 @@ class StyleEditForm extends StyleAddForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.style.canEditStyle');
+	public $neededPermissions = array('admin.style.canManageStyle');
 	
 	/**
 	 * style object
diff --git a/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
index aeb737343e..64c7aba2ec 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php
@@ -58,7 +58,7 @@ class StyleExportForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.style.canEditStyle');
+	public $neededPermissions = array('admin.style.canManageStyle');
 	
 	/**
 	 * package identifier
diff --git a/wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php
index b4449f41b7..30ab01af77 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php
@@ -25,7 +25,7 @@ class StyleImportForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.style.canAddStyle');
+	public $neededPermissions = array('admin.style.canManageStyle');
 	
 	/**
 	 * upload data
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
index 6187b6d447..a7163c443d 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
@@ -26,7 +26,7 @@ class UserOptionCategoryAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.user.canManageUserOptionCategory');
+	public $neededPermissions = array('admin.user.canManageUserOption');
 	
 	/**
 	 * category name
diff --git a/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
index aee4adb10f..ce2ea448ec 100644
--- a/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
@@ -27,7 +27,7 @@ class LanguageServerListPage extends SortablePage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canManageServer');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/files/lib/acp/page/StyleListPage.class.php b/wcfsetup/install/files/lib/acp/page/StyleListPage.class.php
index 2a24d2bfde..f6f080f1d5 100644
--- a/wcfsetup/install/files/lib/acp/page/StyleListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/StyleListPage.class.php
@@ -21,7 +21,7 @@ class StyleListPage extends MultipleLinkPage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.style.canEditStyle', 'admin.style.canDeleteStyle');
+	public $neededPermissions = array('admin.style.canManageStyle');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
index 741311a896..c8ed7ef291 100644
--- a/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
@@ -21,7 +21,7 @@ class UserOptionCategoryListPage extends SortablePage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.user.canManageUserOptionCategory');
+	public $neededPermissions = array('admin.user.canManageUserOption');
 	
 	/**
 	 * @see wcf\page\SortablePage::$defaultSortField
diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
index ddd66aa40c..52b8744be7 100644
--- a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
@@ -22,17 +22,17 @@ class LanguageServerAction extends AbstractDatabaseObjectAction implements ITogg
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.language.canManageServer');
+	protected $permissionsCreate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.language.canManageServer');
+	protected $permissionsDelete = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.language.canManageServer');
+	protected $permissionsUpdate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\IToggleAction::toggle()
diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
index 1af9e58542..7f5fe73bb6 100644
--- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
@@ -39,12 +39,12 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.style.canDeleteStyle');
+	protected $permissionsDelete = array('admin.style.canManageStyle');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.style.canEditStyle');
+	protected $permissionsUpdate = array('admin.style.canManageStyle');
 	
 	/**
 	 * style object
@@ -239,7 +239,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction
 	 */
 	public function validateUpload() {
 		// check upload permissions
-		if (!WCF::getSession()->getPermission('admin.style.canAddStyle')) {
+		if (!WCF::getSession()->getPermission('admin.style.canManageStyle')) {
 			throw new PermissionDeniedException();
 		}
 		
@@ -313,7 +313,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction
 	 * Validates parameters to assign a new default style.
 	 */
 	public function validateSetAsDefault() {
-		if (!WCF::getSession()->getPermission('admin.style.canEditStyle')) {
+		if (!WCF::getSession()->getPermission('admin.style.canManageStyle')) {
 			throw new PermissionDeniedException();
 		}
 		
@@ -341,7 +341,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction
 	 * Validates parameters to copy a style.
 	 */
 	public function validateCopy() {
-		if (!WCF::getSession()->getPermission('admin.style.canAddStyle')) {
+		if (!WCF::getSession()->getPermission('admin.style.canManageStyle')) {
 			throw new PermissionDeniedException();
 		}
 		
diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php
index c20e5ae043..4f610dc0b7 100644
--- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryAction.class.php
@@ -21,15 +21,15 @@ class UserOptionCategoryAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.user.canManageUserOptionCategory');
+	protected $permissionsCreate = array('admin.user.canManageUserOption');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.user.canManageUserOptionCategory');
+	protected $permissionsDelete = array('admin.user.canManageUserOption');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.user.canManageUserOptionCategory');
+	protected $permissionsUpdate = array('admin.user.canManageUserOption');
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f29ccb4dd9..d69fbc9214 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -126,7 +126,6 @@
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Mitglieder dieser Benutzergruppe können die Administrationsoberfläche betreten und dort abhängig von den weiteren Zugriffsrechten verschiedene Aktionen durchführen. Diese Option muss aktiviert sein, wenn diesen Benutzern andere administrative Funktionen erlaubt werden sollen.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Kann versteckte Profilinformationen sehen]]></item>
 		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Kann Sprachen verwalten]]></item>
-		<item name="wcf.acp.group.option.admin.language.canManageServer"><![CDATA[Kann Sprach-Update-Server verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Kann allgemeine Einstellungen vornehmen]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Kann deaktivierte Stile benutzen]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Kann Protokolle abrufen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 15b7418c3f..d261a9ce41 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -126,7 +126,6 @@
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Users of this group may access the Administration Control Panel based upon their granted permissions. This option must be enabled if you wish to grant access to any administrative option.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Can view private user options]]></item>
 		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Can manage languages]]></item>
-		<item name="wcf.acp.group.option.admin.language.canManageServer"><![CDATA[Can manage language servers]]></item>
 		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Can edit system options]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view log files]]></item>
-- 
2.20.1