Added missing permission

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 2486d60c757bbfaf37a8b2298f292c0eaadc2d1c..e9e8c7355c75249b4246f9630ea6ffff3263b305 100644 (file)
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -159,6 +159,12 @@
                                <defaultvalue>0</defaultvalue>
                                <admindefaultvalue>1</admindefaultvalue>
                        </option>
+                       <option name="admin.user.canBanUser">
+                               <categoryname>admin.user.user</categoryname>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>0</defaultvalue>
+                               <admindefaultvalue>1</admindefaultvalue>
+                       </option>
                        <option name="admin.user.canMailUser">
                                <categoryname>admin.user.user</categoryname>
                                <optiontype>boolean</optiontype>

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 5987cc6f84579170cde6bfbbeb1128c6202270cc..2746aab6a1a013e5b9ab66f8781cbf71e67c4320 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -155,7 +155,7 @@
                                </fieldset>
                        {/if}
                        
-                       {if $action == 'edit'}
+                       {if $action == 'edit' && $__wcf->session->getPermission('admin.user.canBanUser')}
                                <fieldset>
                                        <legend>{lang}wcf.acp.user.banUser{/lang}</legend>
                                        

diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index f43fe121988c3ad67859a207f5c11e747ba42240..c52f724ae6ec36602514305840268bab8ca4c797 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@ -163,6 +163,10 @@ class UserEditForm extends UserAddForm {
                // save user
                $saveOptions = $this->optionHandler->save();
                $this->additionalFields['languageID'] = $this->languageID;
+               if (WCF::getSession()->getPermission('admin.user.canBanUser')) {
+                       $this->additionalFields['banned'] = $this->banned;
+                       $this->additionalFields['banReason'] = $this->banReason;
+               }
                $data = array(
                        'data' => array_merge($this->additionalFields, array(
                                'username' => $this->username,