Group option overhaul

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 39de7fadec9c6b7180876bb7d6d9ca9d2407a832..9d52085e89a57f9ebf21a43a6fd0b9f76bb66ffe 100644 (file)
--- 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 c40358e2bd2b6fe98fa74d991df906c00d2407a7..2486d60c757bbfaf37a8b2298f292c0eaadc2d1c 100644 (file)
--- 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 7ae6405d910e9ce902a9da49fc278030a9b0fca1..cd19b73b7025ad12ba90ee4ebd94b673602f2bf4 100644 (file)
--- 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 1edabb9fd06c7b7fa98c67ceb33e2f7b91382029..eabeba1a58d213656c7a3ae55eddfe4607efff5c 100644 (file)
--- 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 3d20862808f166c5bd52741cbb30be261ff67686..9c374dd93ad4ff1c7221ec61073639fb3e1218e1 100644 (file)
--- 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 a6f9df90abdac45da0a1c249e801563cf7c13bc3..e19cf5dba3f519cca6df1cdadbfa8be79bc16ccb 100644 (file)
--- 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 45533aa2026a1b7ffb36932b85ce618a322e5c9f..2d6c600e0b8947e63581840f1fb501e1717cfe48 100644 (file)
--- 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 7ca219682afe5952db0c66ac6a33868f1581919d..9a14217efcb347d7fddd5dc1774a51d65febefca 100644 (file)
--- 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 ba27ccdca134fc9f34cb830d86bde2a0adf0b1e2..8ce29664011fc896c78b50667a1d39e0d84aefd1 100644 (file)
--- 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 aeb737343e9f2495b8c16e965ed5ffbea17cff64..64c7aba2ecafd9f0f7b2a2e34979d2200a4d946a 100644 (file)
--- 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 b4449f41b716844c5afbc1b283572c5a4ed70167..30ab01af77dab617d2744608c932e26f9c2fa045 100644 (file)
--- 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 6187b6d44766c4ec60a16b1ad492974152b40923..a7163c443d563622b60b8e49bfdd35c6b0d901f2 100644 (file)
--- 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 aee4adb10f5eb6898b34df6ed5fbc10eb8a2f01d..ce2ea448ec6fc148f492b61b8b688d24237a0e2a 100644 (file)
--- 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 2a24d2bfdea4865dbf037516b672cac37ba8a765..f6f080f1d59e072210e30c49a1c872a472768419 100644 (file)
--- 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 741311a8960474b40cf029a446982eb696bead63..c8ed7ef2919ed50b2510a761a38751be9942f9d5 100644 (file)
--- 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 ddd66aa40cba2252dee9f66216dd7d8dd7031ba9..52b8744be7ee18e881daaa5decce68852fa8c9f6 100644 (file)
--- 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 1af9e585424d3348738a66afb429ff79c589a797..7f5fe73bb6404748a8ef49e57974a43ded0b0ef5 100644 (file)
--- 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 c20e5ae043cf7976082ef28be5a74cec6d6a8c34..4f610dc0b7b30ad6d6e7919d8ee3041ea8e908c4 100644 (file)
--- 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 f29ccb4dd93d13c4f63381817e1195c73882dad4..d69fbc9214b7e6173f5c9019ac0ff160e0f6ee66 100644 (file)
--- 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 15b7418c3f86f3614b3de3782afee099bec032d5..d261a9ce41fe825848e619721627e022aa90b713 100644 (file)
--- 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>