From a82f9b2c4feab9e8af72411a66a06978c3408c00 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 11 May 2013 20:22:40 +0200
Subject: [PATCH] User bulk processing overhaul

---
 com.woltlab.wcf/acpMenu.xml                   |   4 +-
 .../acp/templates/userBulkProcessing.tpl      | 291 +++++++++++++++++
 .../acp/templates/usersMassProcessing.tpl     | 292 ------------------
 ...s.php => UserBulkProcessingForm.class.php} |   8 +-
 wcfsetup/install/lang/de.xml                  |  12 +-
 wcfsetup/install/lang/en.xml                  |  12 +-
 6 files changed, 309 insertions(+), 310 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
 delete mode 100644 wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
 rename wcfsetup/install/files/lib/acp/form/{UsersMassProcessingForm.class.php => UserBulkProcessingForm.class.php} (98%)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 09dad4fbc5..e2f5f25089 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -173,8 +173,8 @@
 			<showorder>2</showorder>
 		</acpmenuitem>
 		
-		<acpmenuitem name="wcf.acp.menu.link.user.massProcessing">
-			<controller><![CDATA[wcf\acp\form\UsersMassProcessingForm]]></controller>
+		<acpmenuitem name="wcf.acp.menu.link.user.bulkProcessing">
+			<controller><![CDATA[wcf\acp\form\UserBulkProcessingForm]]></controller>
 			<parent>wcf.acp.menu.link.user.management.additional</parent>
 			<permissions>admin.user.canEditUser,admin.user.canDeleteUser,admin.user.canMailUser</permissions>
 			<showorder>1</showorder>
diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
new file mode 100644
index 0000000000..6b51ae3197
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -0,0 +1,291 @@
+{include file='header' pageTitle='wcf.acp.user.bulkProcessing'}
+
+<script type="text/javascript">
+	//<![CDATA[
+	$(function() {
+		function toggleContainer(value) {
+			for (var $name in $targetContainers) {
+				if ($name === value) {
+					$targetContainers[$name].show();
+				}
+				else {
+					$targetContainers[$name].hide();
+				}
+			}
+		}
+		
+		var $targetContainers = { };
+		$('input[name=action]').each(function(index, input) {
+			var $input = $(input);
+			var $value = $input.prop('value');
+			
+			if (!$targetContainers[$value]) {
+				var $container = $('#' + $.wcfEscapeID($value + 'Div'));
+				if ($container.length) {
+					$targetContainers[$value] = $container;
+				}
+			}
+			
+			$input.change(function(event) {
+				toggleContainer($(event.currentTarget).prop('value'));
+			});
+		});
+		
+		function setFileType(newType) {
+			if (newType === 'csv') {
+				$('#separatorDiv').show().next().show();
+			}
+			else {
+				$('#separatorDiv').hide().next().hide();
+			}
+		}
+		
+		$('input[name=fileType]').each(function(index, input) {
+			var $input = $(input);
+			
+			$input.change(function(event) {
+				setFileType($input.prop('value'));
+			});
+		});
+		
+		toggleContainer('{@$action}');
+		setFileType('{@$fileType}');
+		
+		new WCF.Search.User($('#username'), function(data) {
+			$('#username').val(data.label);
+			return false;
+		}, false);
+		WCF.TabMenu.init();
+	});
+	//]]>
+</script>
+
+<header class="boxHeadline">
+	<h1>{lang}wcf.acp.user.bulkProcessing{/lang}</h1>
+</header>
+
+{if $errorField}
+	<p class="error">{lang}wcf.global.form.error{/lang}</p>
+{/if}
+
+<p class="warning">{lang}wcf.acp.user.bulkProcessing.warning{/lang}</p>
+
+{if $affectedUsers|isset}
+	<p class="success">{lang}wcf.acp.user.bulkProcessing.success{/lang}</p>
+{/if}
+
+<div class="contentNavigation">
+	{hascontent}
+		<nav>
+			<ul>
+				{content}
+					{event name='contentNavigationButtons'}
+				{/content}
+			</ul>
+		</nav>
+	{/hascontent}
+</div>
+
+<form method="post" action="{link controller='UserBulkProcessing'}{/link}">
+	<div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
+		<nav class="tabMenu">
+			<ul>
+				<li><a href="{@$__wcf->getAnchor('conditions')}">{lang}wcf.acp.user.search.conditions{/lang}</a></li>
+				
+				{if $options|count}
+					<li><a href="{@$__wcf->getAnchor('profile')}">{lang}wcf.acp.user.search.conditions.profile{/lang}</a></li>
+				{/if}
+				
+				<li><a href="{@$__wcf->getAnchor('action')}">{lang}wcf.acp.user.bulkProcessing.action{/lang}</a></li>
+				{event name='tabMenuTabs'}
+			</ul>
+		</nav>
+	
+		<div id="conditions" class="container containerPadding tabMenuContainer tabMenuContent">
+			<fieldset>
+				<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
+				
+				<dl>
+					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+					<dd>
+						<input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium" />
+					</dd>
+				</dl>
+				
+				{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
+					<dl>
+						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+						<dd>
+							<input type="email" id="email" name="email" value="{$email}" class="medium" />
+						</dd>
+					</dl>
+				{/if}
+				
+				{if $availableGroups|count}
+					<dl>
+						<dt><label>{lang}wcf.acp.user.groups{/lang}</label></dt>
+						<dd>
+							{htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
+							
+							<label class="marginTop"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
+						</dd>
+					</dl>
+				{/if}
+				
+				{if $availableLanguages|count > 1}
+					<dl>
+						<dt><label>{lang}wcf.user.language{/lang}</label></dt>
+						<dd>
+							{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
+						</dd>
+					</dl>
+				{/if}
+				
+				{event name='generalFields'}
+			</fieldset>
+		</div>
+		
+		{if $options|count}
+			<div id="profile" class="container containerPadding tabMenuContainer tabMenuContent">
+				<fieldset>
+					<legend>{lang}wcf.acp.user.search.conditions.profile{/lang}</legend>
+			
+					{include file='optionFieldList' langPrefix='wcf.user.option.'}
+				</fieldset>
+			</div>
+		{/if}
+	
+		<div id="action" class="container containerPadding tabMenuContainer tabMenuContent">
+			<fieldset{if $errorField == 'action'} class="formError"{/if}>
+				<legend>{lang}wcf.acp.user.bulkProcessing.action{/lang}</legend>
+				
+				<dl>
+					<dd>
+						{if $__wcf->session->getPermission('admin.user.canMailUser')}
+							<label><input type="radio" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label>
+							<label><input type="radio" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label>
+						{/if}
+						{if $__wcf->session->getPermission('admin.user.canEditUser')}
+							<label><input type="radio" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label>
+						{/if}
+						{if $__wcf->session->getPermission('admin.user.canDeleteUser')}
+							<label><input type="radio" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label>
+						{/if}
+						
+						{event name='additionalActions'}
+						
+						{if $errorField == 'action'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+			</fieldset>
+			
+			<div id="sendMailDiv">
+				<fieldset>
+					<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+					
+					<dl{if $errorField == 'from'} class="formError"{/if}>
+						<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+						<dd>
+							<input type="email" id="from" name="from" value="{$from}" class="medium" />
+							{if $errorField == 'from'}
+								<small class="innerError">
+									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+								</small>
+							{/if}
+							<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
+						</dd>
+					</dl>
+					
+					<dl{if $errorField == 'subject'} class="formError"{/if}>
+						<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
+						<dd>
+							<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+							{if $errorField == 'subject'}
+								<small class="innerError">
+									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+								</small>
+							{/if}
+							<small>{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+						</dd>
+					</dl>
+					
+					<dl{if $errorField == 'text'} class="formError"{/if}>
+						<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+						<dd>
+							<textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
+							{if $errorField == 'text'}
+								<small class="innerError" class="long">
+									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+								</small>
+							{/if}
+							<small>{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+						</dd>
+					</dl>
+					
+					<dl>
+						<dd>
+							<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+						</dd>
+					</dl>
+				</fieldset>
+			</div>
+			
+			<div id="exportMailAddressDiv">
+				<fieldset>
+					<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
+					
+					<dl>
+						<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
+						<dd>
+							<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+							<label><input type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+						</dd>
+					</dl>
+					
+					<dl id="separatorDiv">
+						<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
+						<dd>
+							<input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
+						</dd>
+					</dl>
+					
+					<dl id="textSeparatorDiv">
+						<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
+						<dd>
+							<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+						</dd>
+					</dl>
+				</fieldset>
+			</div>
+			
+			<div id="assignToGroupDiv">
+				<fieldset>
+					<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+					
+					<dl>
+						<dd{if $errorField == 'assignToGroupIDArray'} class="formError"{/if}>
+							{htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
+							{if $errorField == 'assignToGroupIDArray'}
+								<small class="innerError">
+									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+				</fieldset>
+			</div>
+			
+			{event name='actionSettings'}
+		</div>
+	</div>
+	
+	<div class="formSubmit">
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+	</div>
+</form>
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
deleted file mode 100644
index 5725649353..0000000000
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ /dev/null
@@ -1,292 +0,0 @@
-{include file='header' pageTitle='wcf.acp.user.massProcessing'}
-
-<script type="text/javascript">
-	//<![CDATA[
-	$(function() {
-		function toggleContainer(value) {
-			for (var $name in $targetContainers) {
-				if ($name === value) {
-					$targetContainers[$name].show();
-				}
-				else {
-					$targetContainers[$name].hide();
-				}
-			}
-		}
-		
-		var $targetContainers = { };
-		$('input[name=action]').each(function(index, input) {
-			var $input = $(input);
-			var $value = $input.prop('value');
-			
-			if (!$targetContainers[$value]) {
-				var $container = $('#' + $.wcfEscapeID($value + 'Div'));
-				if ($container.length) {
-					$targetContainers[$value] = $container;
-				}
-			}
-			
-			$input.change(function(event) {
-				toggleContainer($(event.currentTarget).prop('value'));
-			});
-		});
-		
-		function setFileType(newType) {
-			if (newType === 'csv') {
-				$('#separatorDiv').show().next().show();
-			}
-			else {
-				$('#separatorDiv').hide().next().hide();
-			}
-		}
-		
-		$('input[name=fileType]').each(function(index, input) {
-			var $input = $(input);
-			
-			$input.change(function(event) {
-				setFileType($input.prop('value'));
-			});
-		});
-		
-		toggleContainer('{@$action}');
-		setFileType('{@$fileType}');
-		
-		new WCF.Search.User($('#username'), function(data) {
-			$('#username').val(data.label);
-			return false;
-		}, false);
-		WCF.TabMenu.init();
-	});
-	//]]>
-</script>
-
-<header class="boxHeadline">
-	<h1>{lang}wcf.acp.user.massProcessing{/lang}</h1>
-</header>
-
-{if $errorField}
-	<p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
-
-<p class="warning">{lang}wcf.acp.user.massProcessing.warning{/lang}</p>
-
-{if $affectedUsers|isset}
-	<p class="success">{lang}wcf.acp.user.massProcessing.success{/lang}</p>
-{/if}
-
-<div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
-</div>
-
-<form method="post" action="{link controller='UsersMassProcessing'}{/link}">
-	<div class="container containerPadding marginTop">
-		<fieldset>
-			<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
-			
-			<dl>
-				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-				<dd>
-					<input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium" />
-				</dd>
-			</dl>
-			
-			{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-				<dl>
-					<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
-					<dd>
-						<input type="email" id="email" name="email" value="{$email}" class="medium" />
-					</dd>
-				</dl>
-			{/if}
-			
-			{if $availableGroups|count}
-				<dl>
-					<dt><label>{lang}wcf.acp.user.groups{/lang}</label></dt>
-					<dd>
-						{htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
-						
-						<label class="marginTop"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-					</dd>
-				</dl>
-			{/if}
-			
-			{if $availableLanguages|count > 1}
-				<dl>
-					<dt><label>{lang}wcf.user.language{/lang}</label></dt>
-					<dd>
-						{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
-					</dd>
-				</dl>
-			{/if}
-			
-			{event name='generalFields'}
-		</fieldset>
-		
-		{event name='fieldsets'}
-		
-		{hascontent}
-			<div class="tabMenuContainer">
-				<nav class="tabMenu">
-					<ul>
-						{content}
-							{if $options|count}
-								<li><a href="{@$__wcf->getAnchor('profile')}">{lang}wcf.acp.user.search.conditions.profile{/lang}</a></li>
-							{/if}
-							
-							{event name='tabMenuTabs'}
-						{/content}
-					</ul>
-				</nav>
-				
-				{if $options|count}
-					<fieldset id="profile" class="container containerPadding tabMenuContent hidden">
-						{include file='optionFieldList' langPrefix='wcf.user.option.'}
-					</fieldset>
-				{/if}
-				
-				{event name='tabMenuContents'}
-			</div>
-		{/hascontent}
-	</div>
-	
-	<div class="container containerPadding marginTop">
-		<fieldset{if $errorField == 'action'} class="formError"{/if}>
-			<legend>{lang}wcf.acp.user.massProcessing.action{/lang}</legend>
-			
-			<dl>
-				<dd>
-					{if $__wcf->session->getPermission('admin.user.canMailUser')}
-						<label><input type="radio" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label>
-						<label><input type="radio" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label>
-					{/if}
-					{if $__wcf->session->getPermission('admin.user.canEditUser')}
-						<label><input type="radio" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label>
-					{/if}
-					{if $__wcf->session->getPermission('admin.user.canDeleteUser')}
-						<label><input type="radio" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label>
-					{/if}
-					
-					{event name='additionalActions'}
-					
-					{if $errorField == 'action'}
-						<small class="innerError">
-							{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-		</fieldset>
-		
-		<div id="sendMailDiv">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
-				
-				<dl{if $errorField == 'from'} class="formError"{/if}>
-					<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
-					<dd>
-						<input type="email" id="from" name="from" value="{$from}" class="medium" />
-						{if $errorField == 'from'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-							</small>
-						{/if}
-						<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl{if $errorField == 'subject'} class="formError"{/if}>
-					<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
-					<dd>
-						<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
-						{if $errorField == 'subject'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-							</small>
-						{/if}
-						<small>{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl{if $errorField == 'text'} class="formError"{/if}>
-					<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
-					<dd>
-						<textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
-						{if $errorField == 'text'}
-							<small class="innerError" class="long">
-								{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-							</small>
-						{/if}
-						<small>{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl>
-					<dd>
-						<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
-					</dd>
-				</dl>
-			</fieldset>
-		</div>
-		
-		<div id="exportMailAddressDiv">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
-				
-				<dl>
-					<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
-					<dd>
-						<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-						<label><input type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
-					</dd>
-				</dl>
-				
-				<dl id="separatorDiv">
-					<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
-					<dd>
-						<input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
-					</dd>
-				</dl>
-				
-				<dl id="textSeparatorDiv">
-					<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
-					<dd>
-						<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
-					</dd>
-				</dl>
-			</fieldset>
-		</div>
-		
-		<div id="assignToGroupDiv">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-				
-				<dl>
-					<dd{if $errorField == 'assignToGroupIDArray'} class="formError"{/if}>
-						{htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
-						{if $errorField == 'assignToGroupIDArray'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
-			</fieldset>
-		</div>
-		
-		{event name='actionSettings'}
-	</div>
-	
-	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-	</div>
-</form>
-
-{include file='footer'}
diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
similarity index 98%
rename from wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
rename to wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
index 2bdffc3d54..9a42489fe6 100644
--- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
@@ -18,16 +18,16 @@ use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
 /**
- * Shows the users mass processing form.
+ * Shows the user bulk processing form.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2012 WoltLab GmbH
+ * @copyright	2001-2013 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class UsersMassProcessingForm extends UserOptionListForm {
+class UserBulkProcessingForm extends UserOptionListForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
@@ -418,7 +418,7 @@ class UsersMassProcessingForm extends UserOptionListForm {
 	 */
 	public function show() {
 		// set active menu item
-		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.user.massProcessing');
+		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.user.bulkProcessing');
 		
 		// check master password
 		WCFACP::checkMasterPassword();
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f691b0725a..f5935f2f82 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -264,7 +264,7 @@
 		<item name="wcf.acp.menu.link.user.list"><![CDATA[Benutzer auflisten]]></item>
 		<item name="wcf.acp.menu.link.user.mail"><![CDATA[E-Mail an alle Benutzer]]></item>
 		<item name="wcf.acp.menu.link.user.management"><![CDATA[Benutzer]]></item>
-		<item name="wcf.acp.menu.link.user.massProcessing"><![CDATA[Benutzer-Massenbearbeitung]]></item>
+		<item name="wcf.acp.menu.link.user.bulkProcessing"><![CDATA[Benutzer-Massenbearbeitung]]></item>
 		<item name="wcf.acp.menu.link.user.search"><![CDATA[Benutzer suchen]]></item>
 		<item name="wcf.acp.menu.link.user.option"><![CDATA[Benutzerprofilfelder]]></item>
 		<item name="wcf.acp.menu.link.user.option.list"><![CDATA[Benutzerprofilfelder auflisten]]></item>
@@ -708,11 +708,11 @@
 		<item name="wcf.acp.user.list"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.user.list.all"><![CDATA[Alle Benutzer]]></item>
 		<item name="wcf.acp.user.list.count"><![CDATA[{#$items} Benutzer]]></item>
-		<item name="wcf.acp.user.massProcessing"><![CDATA[Benutzer-Massenbearbeitung]]></item>
-		<item name="wcf.acp.user.massProcessing.action"><![CDATA[Aktion]]></item>
-		<item name="wcf.acp.user.massProcessing.conditions"><![CDATA[Bedingungen]]></item>
-		<item name="wcf.acp.user.massProcessing.success"><![CDATA[Die gewählte Aktion wurde erfolgreich auf {#$affectedUsers} Benutzer ausgeführt.]]></item>
-		<item name="wcf.acp.user.massProcessing.warning"><![CDATA[Die Massenbearbeitung von Benutzern führt die unten ausgewählte Aktion <b>ohne zusätzliche Sicherheitsabfrage</b> auf alle Benutzer aus, die unter die eingestellten Bedingungen fallen. Die Bearbeitungen können unter Umständen sehr rechenintensiv werden und sollten deshalb möglichst nur dann ausgeführt werden, wenn sich die Seite im Wartungsmodus befindet! Die Veränderungen können nicht rückgängig gemacht werden. Bitte benutzen Sie diese Funktion mit der nötigen Vorsicht!]]></item>
+		<item name="wcf.acp.user.bulkProcessing"><![CDATA[Benutzer-Massenbearbeitung]]></item>
+		<item name="wcf.acp.user.bulkProcessing.action"><![CDATA[Aktion]]></item>
+		<item name="wcf.acp.user.bulkProcessing.conditions"><![CDATA[Bedingungen]]></item>
+		<item name="wcf.acp.user.bulkProcessing.success"><![CDATA[Die gewählte Aktion wurde erfolgreich auf {#$affectedUsers} Benutzer ausgeführt.]]></item>
+		<item name="wcf.acp.user.bulkProcessing.warning"><![CDATA[Die Massenbearbeitung von Benutzern führt die unten ausgewählte Aktion <b>ohne zusätzliche Sicherheitsabfrage</b> auf alle Benutzer aus, die unter die eingestellten Bedingungen fallen. Die Bearbeitungen können unter Umständen sehr rechenintensiv werden und sollten deshalb möglichst nur dann ausgeführt werden, wenn sich die Seite im Wartungsmodus befindet! Die Veränderungen können nicht rückgängig gemacht werden. Bitte benutzen Sie diese Funktion mit der nötigen Vorsicht!]]></item>
 		<item name="wcf.acp.user.search"><![CDATA[Benutzer suchen]]></item>
 		<item name="wcf.acp.user.search.conditions.general"><![CDATA[Allgemein]]></item>
 		<item name="wcf.acp.user.search.conditions.profile"><![CDATA[Profil]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0e2729538c..535f2532e8 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -264,7 +264,7 @@
 		<item name="wcf.acp.menu.link.user.list"><![CDATA[List Users]]></item>
 		<item name="wcf.acp.menu.link.user.mail"><![CDATA[Email Users]]></item>
 		<item name="wcf.acp.menu.link.user.management"><![CDATA[Users]]></item>
-		<item name="wcf.acp.menu.link.user.massProcessing"><![CDATA[Bulk Processing]]></item>
+		<item name="wcf.acp.menu.link.user.bulkProcessing"><![CDATA[Bulk Processing]]></item>
 		<item name="wcf.acp.menu.link.user.search"><![CDATA[Search Users]]></item>
 		<item name="wcf.acp.menu.link.user.option"><![CDATA[Custom User Fields]]></item>
 		<item name="wcf.acp.menu.link.user.option.list"><![CDATA[List Custom User Fields]]></item>
@@ -708,11 +708,11 @@
 		<item name="wcf.acp.user.list"><![CDATA[Users]]></item>
 		<item name="wcf.acp.user.list.all"><![CDATA[All Users]]></item>
 		<item name="wcf.acp.user.list.count"><![CDATA[{#$items} Users]]></item>
-		<item name="wcf.acp.user.massProcessing"><![CDATA[Bulk Processing]]></item>
-		<item name="wcf.acp.user.massProcessing.action"><![CDATA[Actions]]></item>
-		<item name="wcf.acp.user.massProcessing.conditions"><![CDATA[Conditions]]></item>
-		<item name="wcf.acp.user.massProcessing.success"><![CDATA[Executed action affected {#$affectedUsers} user{if $affectedUsers != 1}s{/if}.]]></item>
-		<item name="wcf.acp.user.massProcessing.warning"><![CDATA[Heads up! The bulk processing executes all actions below without any further confirmation prompt! Processing can be fairly slow if many users are affected by your conditions, it is recommended to enable “Maintenance Mode” in first place. Any change cannot be undone, please be careful!]]></item>
+		<item name="wcf.acp.user.bulkProcessing"><![CDATA[Bulk Processing]]></item>
+		<item name="wcf.acp.user.bulkProcessing.action"><![CDATA[Actions]]></item>
+		<item name="wcf.acp.user.bulkProcessing.conditions"><![CDATA[Conditions]]></item>
+		<item name="wcf.acp.user.bulkProcessing.success"><![CDATA[Executed action affected {#$affectedUsers} user{if $affectedUsers != 1}s{/if}.]]></item>
+		<item name="wcf.acp.user.bulkProcessing.warning"><![CDATA[Heads up! The bulk processing executes all actions below without any further confirmation prompt! Processing can be fairly slow if many users are affected by your conditions, it is recommended to enable “Maintenance Mode” in first place. Any change cannot be undone, please be careful!]]></item>
 		<item name="wcf.acp.user.search"><![CDATA[Search Users]]></item>
 		<item name="wcf.acp.user.search.conditions.general"><![CDATA[General]]></item>
 		<item name="wcf.acp.user.search.conditions.profile"><![CDATA[Profile]]></item>
-- 
2.20.1