From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 1 May 2013 21:44:50 +0000 (+0200)
Subject: Added missing permission
X-Git-Tag: 2.0.0_Beta_1~267
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd7969b56ef8dfd13e5f9a53a14e2aef74cb9e8e;p=GitHub%2FWoltLab%2FWCF.git

Added missing permission
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 2486d60c75..e9e8c7355c 100644
--- 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 5987cc6f84..2746aab6a1 100644
--- 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 f43fe12198..c52f724ae6 100755
--- 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,