From c6d240266dc0c13bf3e4efc5979b2d28226f23f4 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 22 Apr 2013 02:04:19 +0200
Subject: [PATCH] Added user option administration (WIP)

---
 com.woltlab.wcf/acpMenu.xml                   |  35 +++
 com.woltlab.wcf/userGroupOption.xml           |  15 +
 .../files/acp/templates/userOptionAdd.tpl     | 228 ++++++++++++++
 .../acp/templates/userOptionCategoryAdd.tpl   |  68 +++++
 .../acp/templates/userOptionCategoryList.tpl  |  84 +++++
 .../files/acp/templates/userOptionList.tpl    |  87 ++++++
 .../acp/templates/userOptionSetDefaults.tpl   |  62 ++++
 .../lib/acp/form/UserOptionAddForm.class.php  | 287 ++++++++++++++++++
 .../form/UserOptionCategoryAddForm.class.php  | 124 ++++++++
 .../form/UserOptionCategoryEditForm.class.php |  96 ++++++
 .../form/UserOptionSetDefaultsForm.class.php  | 128 ++++++++
 .../page/UserOptionCategoryListPage.class.php |  50 +++
 .../lib/acp/page/UserOptionListPage.class.php |  49 +++
 .../user/option/UserOptionAction.class.php    |  15 +
 .../user/option/UserOptionEditor.class.php    |  14 +-
 .../UserOptionCategoryAction.class.php        |  15 +
 16 files changed, 1351 insertions(+), 6 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/templates/userOptionAdd.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/userOptionList.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
 create mode 100644 wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/page/UserOptionListPage.class.php

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index db13987056..e2b0691afe 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -242,6 +242,41 @@
 		</acpmenuitem>
 		<!-- user groups -->
 		
+		<!-- user options -->
+		<acpmenuitem name="wcf.acp.menu.link.user.option">
+			<parent>wcf.acp.menu.link.user</parent>
+			<showorder>3</showorder>
+		</acpmenuitem>
+		
+		<acpmenuitem name="wcf.acp.menu.link.user.option.list">
+			<controller><![CDATA[wcf\acp\page\UserOptionListPage]]></controller>
+			<parent>wcf.acp.menu.link.user.option</parent>
+			<permissions>admin.user.canManageUserOption</permissions>
+		</acpmenuitem>
+		<acpmenuitem name="wcf.acp.menu.link.user.option.add">
+			<controller><![CDATA[wcf\acp\form\UserOptionAddForm]]></controller>
+			<parent>wcf.acp.menu.link.user.option</parent>
+			<permissions>admin.user.canManageUserOption</permissions>
+		</acpmenuitem>
+		
+		<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>
+		</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>
+		</acpmenuitem>
+		
+		<acpmenuitem name="wcf.acp.menu.link.user.option.setDefaults">
+			<controller><![CDATA[wcf\acp\form\UserOptionSetDefaultsForm]]></controller>
+			<parent>wcf.acp.menu.link.user.option</parent>
+			<permissions>admin.user.canManageUserOption</permissions>
+		</acpmenuitem>
+		<!-- /user options -->
+		
 		<acpmenuitem name="wcf.acp.menu.link.display">
 			<showorder>3</showorder>
 		</acpmenuitem>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index b3b11e2078..faafa5c716 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -34,6 +34,9 @@
 			<category name="admin.user.group">
 				<parent>admin.user</parent>
 			</category>
+			<category name="admin.user.option">
+				<parent>admin.user</parent>
+			</category>
 			
 			<category name="admin.display">
 				<parent>admin</parent>
@@ -171,6 +174,18 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			<option name="admin.user.canManageUserOption">
+				<categoryname>admin.user.option</categoryname>
+				<optiontype>boolean</optiontype>
+				<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>
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
new file mode 100644
index 0000000000..64f57c0159
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -0,0 +1,228 @@
+{include file='header'}
+
+<header class="boxHeadline">
+	<hgroup>
+		<h1>{lang}wcf.acp.user.option.{$action}{/lang}</h1>
+	</hgroup>
+</header>
+
+{if $errorField}
+	<p class="error">{lang}wcf.global.form.error{/lang}</p>
+{/if}
+
+{if $success|isset}
+	<p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
+{/if}
+
+<div class="contentNavigation">
+	<nav>
+		<ul>
+			<li><a href="{link controller='UserOptionList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.user.option.list{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
+</div>
+
+<form method="post" action="{if $action == 'add'}{link controller='UserOptionAdd'}{/link}{else}{link controller='UserOptionEdit' id=$optionID}{/link}{/if}">
+	<div class="container containerPadding marginTop">
+		<fieldset>
+			<legend>{lang}wcf.global.form.data{/lang}</legend>
+			
+			<dl{if $errorField == 'optionName'} class="formError"{/if}>
+				<dt><label for="optionName">{lang}wcf.global.name{/lang}</label></dt>
+				<dd>
+					<input type="text" id="optionName" name="optionName" value="{$optionName}" required="required" autofocus="autofocus" class="long" />
+					{if $errorField == 'optionName'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.name.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			{include file='multipleLanguageInputJavascript' elementIdentifier='optionName' forceSelection=true}
+			
+			<dl{if $errorField == 'optionDescription'} class="formError"{/if}>
+				<dt><label for="optionDescription">{lang}wcf.acp.user.option.description{/lang}</label></dt>
+				<dd>
+					<textarea name="optionDescription" id="optionDescription" cols="40" rows="10">{$optionDescription}</textarea>
+					{if $errorField == 'optionDescription'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.description.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			{include file='multipleLanguageInputJavascript' elementIdentifier='optionDescription' forceSelection=true}
+			
+			<dl{if $errorField == 'categoryName'} class="formError"{/if}>
+				<dt><label for="categoryName">{lang}wcf.acp.user.option.categoryName{/lang}</label></dt>
+				<dd>
+					<select name="categoryName" id="categoryName">
+						{foreach from=$availableCategories item=availableCategory}
+							<option value="{$availableCategory->categoryName}"{if $availableCategory->categoryName == $categoryName} selected="selected"{/if}>{lang}wcf.user.option.category.{$availableCategory->categoryName}{/lang}</option>
+						{/foreach}
+					</select>
+					
+					{if $errorField == 'categoryName'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.categoryName.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="showOrder">{lang}wcf.acp.user.option.showOrder{/lang}</label></dt>
+				<dd>
+					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+				</dd>
+			</dl>
+			
+			{event name='dataFields'}
+		</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.option.typeData{/lang}</legend>
+			
+			<dl{if $errorField == 'optionType'} class="formError"{/if}>
+				<dt><label for="optionType">{lang}wcf.acp.user.option.optionType{/lang}</label></dt>
+				<dd>
+					<select name="optionType" id="optionType">
+						{foreach from=$availableOptionTypes item=availableOptionType}
+							<option value="{$availableOptionType}"{if $availableOptionType == $optionType} selected="selected"{/if}>{$availableOptionType}</option>
+						{/foreach}
+					</select>
+					
+					{if $errorField == 'optionType'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.optionType.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="defaultValue">{lang}wcf.acp.user.option.defaultValue{/lang}</label></dt>
+				<dd>
+					<input type="text" id="defaultValue" name="defaultValue" value="{$defaultValue}" class="long" />
+				</dd>
+			</dl>
+			
+			<dl{if $errorField == 'selectOptions'} class="formError"{/if}>
+				<dt><label for="selectOptions">{lang}wcf.acp.user.option.selectOptions{/lang}</label></dt>
+				<dd>
+					<textarea name="selectOptions" id="selectOptions" cols="40" rows="10">{$selectOptions}</textarea>
+					{if $errorField == 'selectOptions'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.selectOptions.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl{if $errorField == 'outputClass'} class="formError"{/if}>
+				<dt><label for="outputClass">{lang}wcf.acp.user.option.outputClass{/lang}</label></dt>
+				<dd>
+					<input type="text" id="outputClass" name="outputClass" value="{$outputClass}" class="long" />
+					{if $errorField == 'outputClass'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.outputClass.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			{event name='typeDataFields'}
+		</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.option.access{/lang}</legend>
+		
+			<dl>
+				<dt><label for="editable">{lang}wcf.acp.user.option.editable{/lang}</label></dt>
+				<dd>
+					<select name="editable" id="editable">
+						<option value="0"{if $editable == 0} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.0{/lang}</option>
+						<option value="1"{if $editable == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.1{/lang}</option>
+						<option value="2"{if $editable == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.2{/lang}</option>
+						<option value="3"{if $editable == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.3{/lang}</option>
+					</select>
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="visible">{lang}wcf.acp.user.option.visible{/lang}</label></dt>
+				<dd>
+					<select name="visible" id="visible">
+						<option value="0"{if $visible == 0} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.0{/lang}</option>
+						<option value="1"{if $visible == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.1{/lang}</option>
+						<option value="2"{if $visible == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.2{/lang}</option>
+						<option value="3"{if $visible == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.3{/lang}</option>
+						<option value="7"{if $visible == 7} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.7{/lang}</option>
+						<option value="15"{if $visible == 15} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.15{/lang}</option>
+					</select>
+				</dd>
+			</dl>
+			
+			<dl{if $errorField == 'validationPattern'} class="formError"{/if}>
+				<dt><label for="validationPattern">{lang}wcf.acp.user.option.validationPattern{/lang}</label></dt>
+				<dd>
+					<input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long" />
+					{if $errorField == 'validationPattern'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.validationPattern.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl>
+				<dd>
+					<label><input type="checkbox" name="required" id="required" value="1" {if $required == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.required{/lang}</label>
+					<label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1" {if $askDuringRegistration == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
+					<label><input type="checkbox" name="searchable" id="searchable" value="1" {if $searchable == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.searchable{/lang}</label>
+				</dd>
+			</dl>
+			
+			{event name='accessFields'}
+		</fieldset>
+			
+		{event name='fieldsets'}
+	</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/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
new file mode 100644
index 0000000000..3dd319b3b2
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -0,0 +1,68 @@
+{include file='header'}
+
+<header class="boxHeadline">
+	<hgroup>
+		<h1>{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
+	</hgroup>
+</header>
+
+{if $errorField}
+	<p class="error">{lang}wcf.global.form.error{/lang}</p>
+{/if}
+
+{if $success|isset}
+	<p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
+{/if}
+
+<div class="contentNavigation">
+	<nav>
+		<ul>
+			<li><a href="{link controller='UserOptionCategoryList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.user.option.category.list{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
+</div>
+
+<form method="post" action="{if $action == 'add'}{link controller='UserOptionCategoryAdd'}{/link}{else}{link controller='UserOptionCategoryEdit' id=$categoryID}{/link}{/if}">
+	<div class="container containerPadding marginTop">
+		<fieldset>
+			<legend>{lang}wcf.global.form.data{/lang}</legend>
+			
+			<dl{if $errorField == 'categoryName'} class="formError"{/if}>
+				<dt><label for="categoryName">{lang}wcf.global.name{/lang}</label></dt>
+				<dd>
+					<input type="text" id="categoryName" name="categoryName" value="{$categoryName}" required="required" autofocus="autofocus" class="long" />
+					{if $errorField == 'categoryName'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.user.option.category.name.error.{@$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			{include file='multipleLanguageInputJavascript' elementIdentifier='categoryName' forceSelection=true}
+			
+			<dl>
+				<dt><label for="showOrder">{lang}wcf.acp.user.option.category.showOrder{/lang}</label></dt>
+				<dd>
+					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+				</dd>
+			</dl>
+			
+			{event name='dataFields'}
+		</fieldset>
+		
+		{event name='fieldsets'}
+	</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/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
new file mode 100644
index 0000000000..149b5273d0
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -0,0 +1,84 @@
+{include file='header' pageTitle='wcf.acp.user.option.category.list'}
+
+<header class="boxHeadline">
+	<hgroup>
+		<h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
+	</hgroup>
+	
+	<script type="text/javascript">
+		//<![CDATA[
+		$(function() {
+			new WCF.Action.Delete('wcf\\data\\user\\option\\category\\UserOptionCategoryAction', '.jsCategoryRow');
+		});
+		//]]>
+	</script>
+</header>
+
+<div class="contentNavigation">
+	{pages print=true assign=pagesLinks controller="UserOptionCategoryList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+	
+	<nav>
+		<ul>
+			<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
+</div>
+
+{if $objects|count}
+	<div class="tabularBox tabularBoxTitle marginTop">
+		<hgroup>
+			<h1>{lang}wcf.acp.user.option.category.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
+		</hgroup>
+		
+		<table class="table">
+			<thead>
+				<tr>
+					<th class="columnID columnCategoryID{if $sortField == 'categoryID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='UserOptionCategoryList'}pageNo={@$pageNo}&sortField=categoryID&sortOrder={if $sortField == 'categoryID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
+					<th class="columnTitle columnCategoryName{if $sortField == 'categoryName'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionCategoryList'}pageNo={@$pageNo}&sortField=categoryName&sortOrder={if $sortField == 'categoryName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.name{/lang}</a></th>
+					<th class="columnDigits columnOptions{if $sortField == 'options'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionCategoryList'}pageNo={@$pageNo}&sortField=options&sortOrder={if $sortField == 'options' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.option.category.options{/lang}</a></th>
+					<th class="columnDigits columnShowOrder{if $sortField == 'showOrder'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionCategoryList'}pageNo={@$pageNo}&sortField=showOrder&sortOrder={if $sortField == 'showOrder' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.option.category.showOrder{/lang}</a></th>
+					
+					{event name='columnHeads'}
+				</tr>
+			</thead>
+			
+			<tbody>
+				{foreach from=$objects item=category}
+					<tr class="jsCategoryRow">
+						<td class="columnIcon">
+							<a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
+							<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$category->categoryID}" data-confirm-message="{lang}wcf.acp.user.option.category.delete.sure{/lang}"></span>
+							
+							{event name='rowButtons'}
+						</td>
+						<td class="columnID">{@$category->categoryID}</td>
+						<td class="columnTitle columnCategoryName"><a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}">{lang}wcf.user.option.category.{$category->categoryName}{/lang}</a></td>
+						<td class="columnDigits columnOptions">{#$category->userOptions}</td>
+						<td class="columnDigits columnShowOrder">{#$category->showOrder}</td>
+						
+						{event name='columns'}
+					</tr>
+				{/foreach}
+			</tbody>
+		</table>
+		
+	</div>
+	
+	<div class="contentNavigation">
+		{@$pagesLinks}
+		
+		<nav>
+			<ul>
+				<li><a href="{link controller='UserOptionCategoryAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.option.category.add{/lang}</span></a></li>
+			
+				{event name='contentNavigationButtonsBottom'}
+			</ul>
+		</nav>
+	</div>
+{else}
+	<p class="info">{lang}wcf.acp.user.option.category.noItems{/lang}</p>
+{/if}
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
new file mode 100644
index 0000000000..5cf08b6264
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -0,0 +1,87 @@
+{include file='header' pageTitle='wcf.acp.user.option.list'}
+
+<header class="boxHeadline">
+	<hgroup>
+		<h1>{lang}wcf.acp.user.option.list{/lang}</h1>
+	</hgroup>
+	
+	<script type="text/javascript">
+		//<![CDATA[
+		$(function() {
+			new WCF.Action.Delete('wcf\\data\\user\\option\\UserOptionAction', '.jsOptionRow');
+			new WCF.Action.Toggle('wcf\\data\\user\\option\\UserOptionAction', $('.jsOptionRow'));
+		});
+		//]]>
+	</script>
+</header>
+
+<div class="contentNavigation">
+	{pages print=true assign=pagesLinks controller="UserOptionList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+	
+	<nav>
+		<ul>
+			<li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
+</div>
+
+{if $objects|count}
+	<div class="tabularBox tabularBoxTitle marginTop">
+		<hgroup>
+			<h1>{lang}wcf.acp.user.option.list{/lang} <span class="badge badgeInverse">{#$items}</span></h1>
+		</hgroup>
+		
+		<table class="table">
+			<thead>
+				<tr>
+					<th class="columnID columnOptionID{if $sortField == 'optionID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='UserOptionList'}pageNo={@$pageNo}&sortField=optionID&sortOrder={if $sortField == 'optionID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
+					<th class="columnTitle columnOptionName{if $sortField == 'optionName'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionList'}pageNo={@$pageNo}&sortField=optionName&sortOrder={if $sortField == 'optionName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.name{/lang}</a></th>
+					<th class="columnText columnCategoryName{if $sortField == 'categoryName'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionList'}pageNo={@$pageNo}&sortField=categoryName&sortOrder={if $sortField == 'categoryName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.option.categoryName{/lang}</a></th>
+					<th class="columnText columnOptionType{if $sortField == 'optionType'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionList'}pageNo={@$pageNo}&sortField=optionType&sortOrder={if $sortField == 'optionType' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.option.optionType{/lang}</a></th>
+					<th class="columnDigits columnShowOrder{if $sortField == 'showOrder'} active {@$sortOrder}{/if}"><a href="{link controller='UserOptionList'}pageNo={@$pageNo}&sortField=showOrder&sortOrder={if $sortField == 'showOrder' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.user.option.showOrder{/lang}</a></th>
+					
+					{event name='columnHeads'}
+				</tr>
+			</thead>
+			
+			<tbody>
+				{foreach from=$objects item=option}
+					<tr class="jsOptionRow">
+						<td class="columnIcon">
+							<span class="icon icon16 icon-{if $option->isDisabled}off{else}circle-blank{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $option->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$option->optionID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
+							<a href="{link controller='UserOptionEdit' id=$option->optionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
+							<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$option->optionID}" data-confirm-message="{lang}wcf.acp.user.option.delete.sure{/lang}"></span>
+							
+							{event name='rowButtons'}
+						</td>
+						<td class="columnID">{@$option->optionID}</td>
+						<td class="columnTitle columnOptionName"><a href="{link controller='UserOptionEdit' id=$option->optionID}{/link}">{lang}wcf.user.option.{$option->optionName}{/lang}</a></td>
+						<td class="columnText columnCategoryName">{lang}wcf.user.option.category.{$option->categoryName}{/lang}</td>
+						<td class="columnText columnOptionType">{$option->optionType}</td>
+						<td class="columnDigits columnShowOrder">{#$option->showOrder}</td>
+						
+						{event name='columns'}
+					</tr>
+				{/foreach}
+			</tbody>
+		</table>
+	</div>
+	
+	<div class="contentNavigation">
+		{@$pagesLinks}
+		
+		<nav>
+			<ul>
+				<li><a href="{link controller='UserOptionAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.option.add{/lang}</span></a></li>
+				
+				{event name='contentNavigationButtonsBottom'}
+			</ul>
+		</nav>
+	</div>
+{else}
+	<p class="info">{lang}wcf.acp.user.option.noItems{/lang}</p>
+{/if}
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
new file mode 100644
index 0000000000..c38179e5f3
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -0,0 +1,62 @@
+{include file='header'}
+
+<header class="boxHeadline">
+	<hgroup>
+		<h1>{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
+	</hgroup>
+</header>
+
+{if $errorField}
+	<p class="error">{lang}wcf.global.form.error{/lang}</p>
+{/if}
+
+{if $success|isset}
+	<p class="success">{lang}wcf.global.success.edit{/lang}</p>
+{/if}
+
+{hascontent}
+	<div class="contentNavigation">
+		<nav>
+			<ul>
+				{content}
+					{event name='contentNavigationButtons'}
+				{/content}
+			</ul>
+		</nav>
+	</div>
+{/hascontent}
+
+<form method="post" action="{link controller='UserOptionSetDefaults'}{/link}">
+	<div class="container containerPadding marginTop">
+		<fieldset>
+			<dl>
+				<dd>
+					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1" {if $applyChangesToExistingUsers}checked="checked" {/if}/> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
+					<small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>	
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{foreach from=$optionTree[0][categories] item=optionCategory}
+			<fieldset>
+				<legend>{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}</legend>
+				
+				{include file='optionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'}
+				
+				{if $optionCategory[categories]|count}
+					{foreach from=$optionCategory[categories] item=optionCategory2}
+						{include file='optionFieldList' options=$optionCategory2[options] langPrefix='wcf.user.option.'}
+					{/foreach}
+				{/if}
+			</fieldset>
+		{/foreach}
+		
+		{event name='fieldsets'}
+	</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/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
new file mode 100644
index 0000000000..444647c13f
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
@@ -0,0 +1,287 @@
+<?php
+namespace wcf\acp\form;
+use wcf\data\user\option\category\UserOptionCategoryList;
+use wcf\data\user\option\UserOptionEditor;
+use wcf\data\user\option\UserOptionAction;
+use wcf\form\AbstractForm;
+use wcf\system\cache\builder\UserOptionCacheBuilder;
+use wcf\system\exception\UserInputException;
+use wcf\system\language\I18nHandler;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Shows the user option add form.
+ * 
+ * @author	Marcel Werk
+ * @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 UserOptionAddForm extends AbstractForm {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option.add';
+	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.user.canManageUserOption');
+	
+	/**
+	 * option name
+	 * @var string
+	 */
+	public $optionName = '';
+	
+	/**
+	 * option description
+	 * @var string
+	 */
+	public $optionDescription = '';
+	
+	/**
+	 * category name
+	 * @var string
+	 */
+	public $categoryName = '';
+	
+	/**
+	 * option type
+	 * @var string
+	 */
+	public $optionType = 'text';
+	
+	/**
+	 * option default value
+	 * @var string
+	 */
+	public $defaultValue = '';
+	
+	/**
+	 * validation pattern
+	 * @var string
+	 */
+	public $validationPattern = '';
+	
+	/**
+	 * select options
+	 * @var string
+	 */
+	public $selectOptions = '';
+	
+	/**
+	 * field is required
+	 * @var boolean
+	 */
+	public $required = 0;
+	
+	/**
+	 * shows this field in the registration process 
+	 * @var boolean
+	 */
+	public $askDuringRegistration = 0;
+	
+	/**
+	 * edit permission bitmask
+	 * @var integer
+	 */
+	public $editable = 0;
+	
+	/**
+	 * view permission bitmask
+	 * @var integer
+	 */
+	public $visible = 0;
+	
+	/**
+	 * field is searchable
+	 * @var boolean
+	 */
+	public $searchable = 0;
+	
+	/**
+	 * show order
+	 * @var integer
+	 */
+	public $showOrder = 0;
+	
+	/**
+	 * output class
+	 * @var string
+	 */
+	public $outputClass = '';
+	
+	/**
+	 * available option categories
+	 * @var array<wcf\data\user\option\UserOptionCategory>
+	 */
+	public $availableCategories = array();
+	
+	/**
+	 * available option types
+	 * @var array<string>
+	 */
+	public static $availableOptionTypes = array('birthday', 'boolean', 'date', 'integer', 'float', 'password', 'multiselect', 'radiobuttons', 'select', 'text', 'textarea', 'message');
+	
+	/**
+	 * list of option type that require select options
+	 * @var array<string>
+	 */
+	public static $optionTypesUsingSelectOptions = array('multiselect', 'radiobuttons', 'select');
+	
+	/**
+	 * @see	wcf\page\IPage::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+	
+		I18nHandler::getInstance()->register('optionName');
+		I18nHandler::getInstance()->register('optionDescription');
+		
+		// get available categories
+		$categoryList = new UserOptionCategoryList();
+		$categoryList->getConditionBuilder()->add('parentCategoryName = ?', array('profile'));
+		$categoryList->readObjects();
+		$this->availableCategories = $categoryList->getObjects();
+	}
+	
+	/**
+	 * @see wcf\form\IForm::readFormParameters()
+	 */
+	public function readFormParameters() {
+		parent::readFormParameters();
+	
+		I18nHandler::getInstance()->readValues();
+		
+		if (I18nHandler::getInstance()->isPlainValue('optionName')) $this->optionName = I18nHandler::getInstance()->getValue('optionName');
+		if (I18nHandler::getInstance()->isPlainValue('optionDescription')) $this->optionDescription = I18nHandler::getInstance()->getValue('optionDescription');
+		if (isset($_POST['categoryName'])) $this->categoryName = $_POST['categoryName'];
+		if (isset($_POST['optionType'])) $this->optionType = $_POST['optionType'];
+		if (isset($_POST['defaultValue'])) $this->defaultValue = $_POST['defaultValue'];
+		if (isset($_POST['validationPattern'])) $this->validationPattern = $_POST['validationPattern'];
+		if (isset($_POST['selectOptions'])) $this->selectOptions = $_POST['selectOptions'];
+		if (isset($_POST['required'])) $this->required = intval($_POST['required']);
+		if (isset($_POST['askDuringRegistration'])) $this->askDuringRegistration = intval($_POST['askDuringRegistration']);
+		if (isset($_POST['editable'])) $this->editable = intval($_POST['editable']);
+		if (isset($_POST['visible'])) $this->visible = intval($_POST['visible']);
+		if (isset($_POST['searchable'])) $this->searchable = intval($_POST['searchable']);
+		if (isset($_POST['showOrder'])) $this->showOrder = intval($_POST['showOrder']);
+		if (isset($_POST['outputClass'])) $this->outputClass = StringUtil::trim($_POST['outputClass']);
+	}
+	
+	/**
+	 * @see wcf\form\IForm::validate()
+	 */
+	public function validate() {
+		parent::validate();
+	
+		// option name
+		if (!I18nHandler::getInstance()->validateValue('optionName', true)) {
+			throw new UserInputException('optionName');
+		}
+		
+		// category name
+		if (empty($this->categoryName)) {
+			throw new UserInputException('categoryName');
+		}
+		$sql = "SELECT	categoryID
+			FROM	wcf".WCF_N."_user_option_category
+			WHERE	categoryName = ?";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute(array($this->categoryName));
+		if ($statement->fetchArray() === false) {
+			throw new UserInputException('categoryName');
+		}
+		
+		// option type
+		if (!in_array($this->optionType, self::$availableOptionTypes)) {
+			throw new UserInputException('optionType');
+		}
+		
+		// select options
+		if (in_array($this->optionType, self::$optionTypesUsingSelectOptions) && empty($this->selectOptions)) {
+			throw new UserInputException('selectOptions');
+		}
+	}
+	
+	/**
+	 * @see	wcf\form\IForm::save()
+	 */
+	public function save() {
+		parent::save();
+	
+		$this->objectAction = new UserOptionAction(array(), 'create', array('data' => array(
+			'optionName' => StringUtil::getRandomID(),
+			'categoryName' => $this->categoryName,
+			'optionType' => $this->optionType,
+			'defaultValue' => $this->defaultValue,
+			'showOrder' => $this->showOrder,
+			'outputClass' => $this->outputClass,
+			'validationPattern' => $this->validationPattern,
+			'selectOptions' => $this->selectOptions,
+			'required' => $this->required,
+			'askDuringRegistration' => $this->askDuringRegistration,
+			'searchable' => $this->searchable,
+			'editable' => $this->editable,
+			'visible' => $this->visible,
+			'packageID' => 1
+		)));
+		$this->objectAction->executeAction();
+	
+		$returnValues = $this->objectAction->getReturnValues();
+		$userOption = $returnValues['returnValues'];
+		
+		// save language vars
+		I18nHandler::getInstance()->save('optionName', 'wcf.user.option.option'.$userOption->optionID, 'wcf.user.option');
+		I18nHandler::getInstance()->save('optionDescription', 'wcf.user.option.option'.$userOption->optionID.'.description', 'wcf.user.option');
+		$editor = new UserOptionEditor($userOption);
+		$editor->update(array(
+			'optionName' => 'option'.$userOption->optionID
+		));
+		
+		// reset cache
+		UserOptionCacheBuilder::getInstance()->reset();
+		$this->saved();
+	
+		// reset values
+		$this->optionName = $this->optionDescription = $this->categoryName = $this->optionType = $this->defaultValue = $this->validationPattern = $this->optionType = $this->selectOptions = $this->outputClass = '';
+		$this->required = $this->editable = $this->visible = $this->searchable = $this->showOrder = $this->askDuringRegistration = 0;
+		
+		// show success
+		WCF::getTPL()->assign('success', true);
+	}
+	
+	/**
+	 * @see wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+	
+		I18nHandler::getInstance()->assignVariables();
+		
+		WCF::getTPL()->assign(array(
+			'optionName' => $this->optionName,
+			'optionDescription' => $this->optionDescription,
+			'categoryName' => $this->categoryName,
+			'optionType' => $this->optionType,
+			'defaultValue' => $this->defaultValue,
+			'validationPattern' => $this->validationPattern,
+			'optionType' => $this->optionType,
+			'selectOptions' => $this->selectOptions,
+			'required' => $this->required,
+			'askDuringRegistration' => $this->askDuringRegistration,
+			'editable' => $this->editable,
+			'visible' => $this->visible,
+			'searchable' => $this->searchable,
+			'showOrder' => $this->showOrder,
+			'outputClass' => $this->outputClass,
+			'action' => 'add',
+			'availableCategories' => $this->availableCategories,
+			'availableOptionTypes' => self::$availableOptionTypes
+		));
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
new file mode 100644
index 0000000000..6187b6d447
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryAddForm.class.php
@@ -0,0 +1,124 @@
+<?php
+namespace wcf\acp\form;
+use wcf\data\user\option\category\UserOptionCategoryAction;
+use wcf\data\user\option\category\UserOptionCategoryEditor;
+use wcf\form\AbstractForm;
+use wcf\system\exception\UserInputException;
+use wcf\system\language\I18nHandler;
+use wcf\system\WCF;
+
+/**
+ * Shows the form for adding new user option categories.
+ *
+ * @author	Marcel Werk
+ * @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 UserOptionCategoryAddForm extends AbstractForm {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option.category.add';
+	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.user.canManageUserOptionCategory');
+	
+	/**
+	 * category name
+	 * @var string
+	 */
+	public $categoryName = '';
+	
+	/**
+	 * show order
+	 * @var integer
+	 */
+	public $showOrder = 0;
+	
+	/**
+	 * @see	wcf\page\IPage::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+	
+		I18nHandler::getInstance()->register('categoryName');
+	}
+	
+	/**
+	 * @see	wcf\form\IForm::readFormParameters()
+	 */
+	public function readFormParameters() {
+		parent::readFormParameters();
+		
+		I18nHandler::getInstance()->readValues();
+		
+		if (I18nHandler::getInstance()->isPlainValue('categoryName')) $this->categoryName = I18nHandler::getInstance()->getValue('categoryName');
+		if (isset($_POST['showOrder'])) $this->showOrder = intval($_POST['showOrder']);
+	}
+	
+	/**
+	 * @see	wcf\form\IForm::validate()
+	 */
+	public function validate() {
+		parent::validate();
+		
+		if (!I18nHandler::getInstance()->validateValue('categoryName', true)) {
+			throw new UserInputException('categoryName');
+		}
+	}
+	
+	/**
+	 * @see	wcf\form\IForm::save()
+	 */
+	public function save() {
+		parent::save();
+		
+		// save label
+		$this->objectAction = new UserOptionCategoryAction(array(), 'create', array('data' => array(
+			'parentCategoryName' => 'profile',
+			'categoryName' => $this->categoryName,
+			'showOrder' => $this->showOrder
+		)));
+		$this->objectAction->executeAction();
+		
+		// update name
+		$returnValues = $this->objectAction->getReturnValues();
+		$categoryID = $returnValues['returnValues']->categoryID;
+		I18nHandler::getInstance()->save('categoryName', 'wcf.user.option.category.category'.$categoryID, 'wcf.user.option');
+		$categoryEditor = new UserOptionCategoryEditor($returnValues['returnValues']);
+		$categoryEditor->update(array(
+			'categoryName' => 'category'.$categoryID
+		));
+		$this->saved();
+		
+		// reset values
+		$this->categoryName = '';
+		$this->showOrder = 0;
+		I18nHandler::getInstance()->disableAssignValueVariables();
+		
+		// show success
+		WCF::getTPL()->assign(array(
+			'success' => true
+		));
+	}
+	
+	/**
+	 * @see	wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+		
+		I18nHandler::getInstance()->assignVariables();
+		
+		WCF::getTPL()->assign(array(
+			'action' => 'add',
+			'categoryName' => $this->categoryName,
+			'showOrder' => $this->showOrder
+		));
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
new file mode 100644
index 0000000000..84ecd2b313
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionCategoryEditForm.class.php
@@ -0,0 +1,96 @@
+<?php
+namespace wcf\acp\form;
+use wcf\data\user\option\category\UserOptionCategoryAction;
+use wcf\data\user\option\category\UserOptionCategory;
+use wcf\form\AbstractForm;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\language\I18nHandler;
+use wcf\system\WCF;
+
+/**
+ * Shows the form for editing user option categories.
+ * 
+ * @author	Marcel Werk
+ * @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 UserOptionCategoryEditForm extends UserOptionCategoryAddForm {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option';
+	
+	/**
+	 * category id
+	 * @var integer
+	 */
+	public $categoryID = 0;
+	
+	/**
+	 * category object
+	 * @var	wcf\data\user\option\category\UserOptionCategory
+	 */
+	public $category = null;
+	
+	/**
+	 * @see wcf\page\IPage::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+		
+		if (isset($_REQUEST['id'])) $this->categoryID = intval($_REQUEST['id']);
+		$this->category = new UserOptionCategory($this->categoryID);
+		if (!$this->category->categoryID) {
+			throw new IllegalLinkException();
+		}
+	}
+	
+	/**
+	 * @see	wcf\form\IForm::save()
+	 */
+	public function save() {
+		AbstractForm::save();
+		
+		I18nHandler::getInstance()->save('categoryName', 'wcf.user.option.category.'.$this->category->categoryName, 'wcf.user.option');
+		
+		$this->objectAction = new UserOptionCategoryAction(array($this->category), 'update', array('data' => array(
+			'showOrder' => $this->showOrder
+		)));
+		$this->objectAction->executeAction();
+		
+		$this->saved();
+		
+		WCF::getTPL()->assign('success', true);
+	}
+	
+	/**
+	 * @see wcf\page\IPage::readData()
+	 */
+	public function readData() {
+		parent::readData();
+		
+		I18nHandler::getInstance()->setOptions('categoryName', 1, 'wcf.user.option.category.'.$this->category->categoryName, 'wcf.user.option.category.category\d+');
+		
+		if (!count($_POST)) {
+			$this->showOrder = $this->category->showOrder;
+		}
+	}
+	
+	/**
+	 * @see wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+		
+		I18nHandler::getInstance()->assignVariables(!empty($_POST));
+		
+		WCF::getTPL()->assign(array(
+			'action' => 'edit',
+			'categoryID' => $this->categoryID,
+			'category' => $this->category
+		));
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
new file mode 100644
index 0000000000..4ee00b5343
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
@@ -0,0 +1,128 @@
+<?php
+namespace wcf\acp\form;
+use wcf\form\AbstractForm;
+use wcf\system\cache\builder\UserOptionCacheBuilder;
+use wcf\system\option\user\UserOptionHandler;
+use wcf\system\WCF;
+
+/**
+ * Provides functions to set the default values of user options.
+ *
+ * @author	Marcel Werk
+ * @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 UserOptionSetDefaultsForm extends AbstractForm {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option.setDefaults';
+	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.user.canManageUserOption');
+	
+	/**
+	 * user option handler
+	 * @var	wcf\system\option\user\UserOptionHandler
+	 */
+	public $optionHandler = null;
+	
+	/**
+	 * true to apply change to existing users
+	 * @var boolean
+	 */
+	public $applyChangesToExistingUsers = 0;
+	
+	/**
+	 * @see	wcf\page\AbstractPage::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+	
+		$this->optionHandler = new UserOptionHandler(false, '', 'settings');
+		$this->optionHandler->init();
+	}
+	
+	/**
+	 * @see wcf\form\IForm::readFormParameters()
+	 */
+	public function readFormParameters() {
+		parent::readFormParameters();
+		
+		$this->optionHandler->readUserInput($_POST);
+		
+		if (isset($_POST['applyChangesToExistingUsers'])) $this->applyChangesToExistingUsers = intval($_POST['applyChangesToExistingUsers']);
+	}
+	
+	/**
+	 * @see	wcf\form\AbstractForm::validate()
+	 */
+	public function validate() {
+		parent::validate();
+	
+		$this->optionHandler->validate();
+	}
+	
+	/**
+	 * @see	wcf\form\AbstractForm::save()
+	 */
+	public function save() {
+		parent::save();
+	
+		// get new values
+		$saveOptions = $this->optionHandler->save();
+		
+		// save values
+		$sql = "UPDATE	wcf".WCF_N."_user_option
+			SET	defaultValue = ?
+			WHERE	optionID = ?";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		foreach ($saveOptions as $optionID => $value) {
+			$statement->execute(array($value, $optionID));
+		}
+		
+		// apply changes
+		if ($this->applyChangesToExistingUsers) {
+			$optionIDs = array_keys($saveOptions);
+			$sql = "UPDATE	wcf".WCF_N."_user_option_value
+				SET	userOption".implode(' = ?, userOption', $optionIDs)." = ?";
+			$statement = WCF::getDB()->prepareStatement($sql);
+			$statement->execute(array_merge($saveOptions));
+		}
+		
+		// reset cache
+		UserOptionCacheBuilder::getInstance()->reset();
+		
+		$this->saved();
+	
+		WCF::getTPL()->assign('success', true);
+	}
+	
+	/**
+	 * @see	wcf\page\IPage::readData()
+	 */
+	public function readData() {
+		parent::readData();
+	
+		if (empty($_POST)) {
+			$this->optionHandler->readData();
+		}
+	}
+	
+	/**
+	 * @see	wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+	
+		WCF::getTPL()->assign(array(
+			'optionTree' => $this->optionHandler->getOptionTree(),
+			'applyChangesToExistingUsers' => $this->applyChangesToExistingUsers
+		));
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
new file mode 100644
index 0000000000..741311a896
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/page/UserOptionCategoryListPage.class.php
@@ -0,0 +1,50 @@
+<?php
+namespace wcf\acp\page;
+use wcf\page\SortablePage;
+
+/**
+ * Shows a list of user option categories.
+ * 
+ * @author	Marcel Werk
+ * @copyright	2001-2013 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	acp.page
+ * @category	Community Framework
+ */
+class UserOptionCategoryListPage extends SortablePage {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option.category.list';
+	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.user.canManageUserOptionCategory');
+	
+	/**
+	 * @see wcf\page\SortablePage::$defaultSortField
+	 */
+	public $defaultSortField = 'showOrder';
+	
+	/**
+	 * @see wcf\page\MultipleLinkPage::$objectListClassName
+	 */
+	public $objectListClassName = 'wcf\data\user\option\category\UserOptionCategoryList';
+	
+	/**
+	 * @see wcf\page\SortablePage::$defaultSortField
+	 */
+	public $validSortFields = array('categoryID', 'categoryName', 'showOrder', 'userOptions');
+	
+	/**
+	 * @see wcf\page\MultipleLinkPage::initObjectList
+	 */
+	protected function initObjectList() {
+		parent::initObjectList();
+		
+		$this->objectList->sqlSelects = "(SELECT COUNT(*) FROM wcf".WCF_N."_user_option WHERE categoryName = user_option_category.categoryName) AS userOptions";
+		$this->objectList->getConditionBuilder()->add('user_option_category.parentCategoryName = ?', array('profile'));
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/page/UserOptionListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserOptionListPage.class.php
new file mode 100644
index 0000000000..6ace1c8095
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/page/UserOptionListPage.class.php
@@ -0,0 +1,49 @@
+<?php
+namespace wcf\acp\page;
+use wcf\page\SortablePage;
+
+/**
+ * Shows a list of installed user options.
+ * 
+ * @author	Marcel Werk
+ * @copyright	2001-2013 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	acp.page
+ * @category	Community Framework
+ */
+class UserOptionListPage extends SortablePage {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.user.option.list';
+	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.user.canManageUserOption');
+	
+	/**
+	 * @see wcf\page\SortablePage::$defaultSortField
+	 */
+	public $defaultSortField = 'showOrder';
+	
+	/**
+	 * @see wcf\page\MultipleLinkPage::$objectListClassName
+	 */
+	public $objectListClassName = 'wcf\data\user\option\UserOptionList';
+	
+	/**
+	 * @see wcf\page\SortablePage::$defaultSortField
+	 */
+	public $validSortFields = array('optionID', 'optionName', 'categoryName', 'optionType', 'showOrder');
+	
+	/**
+	 * @see wcf\page\MultipleLinkPage::initObjectList
+	 */
+	protected function initObjectList() {
+		parent::initObjectList();
+	
+		$this->objectList->getConditionBuilder()->add("option_table.categoryName IN (SELECT categoryName FROM wcf".WCF_N."_user_option_category WHERE parentCategoryName = ?)", array('profile'));
+	}
+}
diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php
index 6707906288..99463e458d 100644
--- a/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/UserOptionAction.class.php
@@ -17,4 +17,19 @@ class UserOptionAction extends AbstractDatabaseObjectAction {
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$className
 	 */
 	protected $className = 'wcf\data\user\option\UserOptionEditor';
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
+	 */
+	protected $permissionsCreate = array('admin.user.canManageUserOption');
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 */
+	protected $permissionsDelete = array('admin.user.canManageUserOption');
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 */
+	protected $permissionsUpdate = array('admin.user.canManageUserOption');
 }
diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
index 6048d546f5..7e2b3795c2 100644
--- a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
@@ -46,12 +46,14 @@ class UserOptionEditor extends DatabaseObjectEditor {
 		parent::update($parameters);
 		
 		// alter the table "wcf".WCF_N."_user_option_value" with this new option
-		WCF::getDB()->getEditor()->alterColumn(
-			'wcf'.WCF_N.'_user_option_value',
-			'userOption'.$this->optionID,
-			'userOption'.$this->optionID,
-			self::getColumnDefinition($parameters['optionType'])
-		);
+		if (isset($parameters['optionType']) && $parameters['optionType'] != $this->optionType) {
+			WCF::getDB()->getEditor()->alterColumn(
+				'wcf'.WCF_N.'_user_option_value',
+				'userOption'.$this->optionID,
+				'userOption'.$this->optionID,
+				self::getColumnDefinition($parameters['optionType'])
+			);
+		}
 	}
 	
 	/**
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 80733cb51e..9b2b2bb0cd 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
@@ -17,4 +17,19 @@ class UserOptionCategoryAction extends AbstractDatabaseObjectAction {
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$className
 	 */
 	protected $className = 'wcf\data\user\option\category\UserOptionCategoryEditor';
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
+	 */
+	protected $permissionsCreate = array('admin.user.canManageUserOptionCategory');
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	*/
+	protected $permissionsDelete = array('admin.user.canManageUserOptionCategory');
+	
+	/**
+	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	*/
+	protected $permissionsUpdate = array('admin.user.canManageUserOptionCategory');
 }
-- 
2.20.1