From d802ca93dd49463642a35489e8be5423aee86ede Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 7 Sep 2014 20:24:44 +0200
Subject: [PATCH] Option/user option/ACP menu overhaul

---
 com.woltlab.wcf/acpMenu.xml                   | 117 +++++++++---------
 com.woltlab.wcf/option.xml                    |  10 +-
 com.woltlab.wcf/userGroupOption.xml           |  98 +++++++--------
 .../files/lib/acp/form/AdAddForm.class.php    |   2 +-
 .../lib/acp/form/NoticeAddForm.class.php      |   2 +-
 .../files/lib/acp/page/AdListPage.class.php   |   2 +-
 .../lib/acp/page/NoticeListPage.class.php     |   2 +-
 .../files/lib/data/ad/AdAction.class.php      |   4 +-
 .../lib/data/notice/NoticeAction.class.php    |   4 +-
 .../files/lib/form/RecaptchaForm.class.php    |   2 +-
 .../system/captcha/RecaptchaHandler.class.php |   2 +-
 wcfsetup/install/lang/de.xml                  |  10 +-
 wcfsetup/install/lang/en.xml                  |  10 +-
 13 files changed, 123 insertions(+), 142 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 3f4cc03c92..69229f1cbe 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -81,10 +81,25 @@
 		</acpmenuitem>
 		<!-- /cronjobs -->
 		
+		<acpmenuitem name="wcf.acp.menu.link.captcha">
+			<parent>wcf.acp.menu.link.system</parent>
+			<showorder>4</showorder>
+		</acpmenuitem>
+		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
+			<parent>wcf.acp.menu.link.captcha</parent>
+			<controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
+			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+		</acpmenuitem>
+		<acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
+			<parent>wcf.acp.menu.link.captcha</parent>
+			<controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
+			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+		</acpmenuitem>
+		
 		<!-- maintenance -->
 		<acpmenuitem name="wcf.acp.menu.link.maintenance">
 			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>4</showorder>
+			<showorder>5</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.maintenance.cache">
@@ -109,7 +124,7 @@
 		<!-- log -->
 		<acpmenuitem name="wcf.acp.menu.link.log">
 			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>5</showorder>
+			<showorder>6</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.log.session">
@@ -277,14 +292,40 @@
 		</acpmenuitem>
 		<!-- /user options -->
 		
+		<acpmenuitem name="wcf.acp.menu.link.notice">
+			<parent>wcf.acp.menu.link.user</parent>
+			<showorder>5</showorder>
+		</acpmenuitem>
+		<acpmenuitem name="wcf.acp.menu.link.notice.list">
+			<controller><![CDATA[wcf\acp\page\NoticeListPage]]></controller>
+			<parent>wcf.acp.menu.link.notice</parent>
+			<permissions>admin.notice.canManageNotice</permissions>
+		</acpmenuitem>
+		<acpmenuitem name="wcf.acp.menu.link.notice.add">
+			<controller><![CDATA[wcf\acp\form\NoticeAddForm]]></controller>
+			<parent>wcf.acp.menu.link.notice</parent>
+			<permissions>admin.notice.canManageNotice</permissions>
+		</acpmenuitem>
+		
 		<acpmenuitem name="wcf.acp.menu.link.display">
 			<showorder>3</showorder>
 		</acpmenuitem>
 		
+		<acpmenuitem name="wcf.acp.menu.link.dashboard">
+			<parent>wcf.acp.menu.link.display</parent>
+			<showorder>1</showorder>
+		</acpmenuitem>
+		
+		<acpmenuitem name="wcf.acp.menu.link.dashboard.list">
+			<parent>wcf.acp.menu.link.dashboard</parent>
+			<controller><![CDATA[wcf\acp\page\DashboardListPage]]></controller>
+			<permissions>admin.content.dashboard.canEditDashboard</permissions>
+		</acpmenuitem>
+		
 		<!-- style -->
 		<acpmenuitem name="wcf.acp.menu.link.style">
 			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>1</showorder>
+			<showorder>2</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.style.list">
@@ -309,7 +350,7 @@
 		<!-- page menu -->
 		<acpmenuitem name="wcf.acp.menu.link.pageMenu">
 			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>2</showorder>
+			<showorder>3</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.pageMenu.list">
@@ -328,7 +369,7 @@
 		<!-- template -->
 		<acpmenuitem name="wcf.acp.menu.link.template">
 			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>3</showorder>
+			<showorder>4</showorder>
 		</acpmenuitem>
 		<acpmenuitem name="wcf.acp.menu.link.template.list">
 			<controller><![CDATA[wcf\acp\page\TemplateListPage]]></controller>
@@ -355,7 +396,7 @@
 		<!-- language -->
 		<acpmenuitem name="wcf.acp.menu.link.language">
 			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>4</showorder>
+			<showorder>5</showorder>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.language.list">
@@ -391,22 +432,23 @@
 			<parent>wcf.acp.menu.link.language.server</parent>
 			<permissions>admin.language.canManageLanguage</permissions>
 		</acpmenuitem>-->
+		<!-- /language -->
 		
-		<acpmenuitem name="wcf.acp.menu.link.captcha">
+		<acpmenuitem name="wcf.acp.menu.link.ad">
 			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>5</showorder>
+			<options>module_ad</options>
+			<showorder>6</showorder>
 		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
-			<parent>wcf.acp.menu.link.captcha</parent>
-			<controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+		<acpmenuitem name="wcf.acp.menu.link.ad.list">
+			<controller><![CDATA[wcf\acp\page\AdListPage]]></controller>
+			<parent>wcf.acp.menu.link.ad</parent>
+			<permissions>admin.ad.canManageAd</permissions>
 		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
-			<parent>wcf.acp.menu.link.captcha</parent>
-			<controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+		<acpmenuitem name="wcf.acp.menu.link.ad.add">
+			<controller><![CDATA[wcf\acp\form\AdAddForm]]></controller>
+			<parent>wcf.acp.menu.link.ad</parent>
+			<permissions>admin.ad.canManageAd</permissions>
 		</acpmenuitem>
-		<!-- /language -->
 		
 		<acpmenuitem name="wcf.acp.menu.link.content">
 			<showorder>4</showorder>
@@ -517,49 +559,8 @@
 			<permissions>admin.attachment.canManageAttachment</permissions>
 		</acpmenuitem>
 		
-		<acpmenuitem name="wcf.acp.menu.link.notice">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.notice.list">
-			<controller><![CDATA[wcf\acp\page\NoticeListPage]]></controller>
-			<parent>wcf.acp.menu.link.notice</parent>
-			<permissions>admin.content.notice.canManageNotice</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.notice.add">
-			<controller><![CDATA[wcf\acp\form\NoticeAddForm]]></controller>
-			<parent>wcf.acp.menu.link.notice</parent>
-			<permissions>admin.content.notice.canManageNotice</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.ad">
-			<parent>wcf.acp.menu.link.content</parent>
-			<options>module_ad</options>
-			<showorder>7</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.ad.list">
-			<controller><![CDATA[wcf\acp\page\AdListPage]]></controller>
-			<parent>wcf.acp.menu.link.ad</parent>
-			<permissions>admin.content.ad.canManageAd</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.ad.add">
-			<controller><![CDATA[wcf\acp\form\AdAddForm]]></controller>
-			<parent>wcf.acp.menu.link.ad</parent>
-			<permissions>admin.content.ad.canManageAd</permissions>
-		</acpmenuitem>
-		
 		<acpmenuitem name="wcf.acp.menu.link.community">
 			<showorder>5</showorder>
 		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.dashboard">
-			<parent>wcf.acp.menu.link.community</parent>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.dashboard.list">
-			<parent>wcf.acp.menu.link.dashboard</parent>
-			<controller><![CDATA[wcf\acp\page\DashboardListPage]]></controller>
-			<permissions>admin.content.dashboard.canEditDashboard</permissions>
-		</acpmenuitem>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 3de93ba5a8..a119536fff 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -155,7 +155,6 @@
 					</category>
 					<category name="security.antispam.recaptcha">
 						<parent>security.antispam</parent>
-						<options>module_system_recaptcha</options>
 					</category>
 				
 				<category name="security.censorship">
@@ -264,10 +263,11 @@
 				<defaultvalue>0</defaultvalue>
 			</option>
 			
-			<option name="module_system_recaptcha">
+			<option name="module_system_recaptcha"><!-- @deprecated -->
 				<categoryname>module.system</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
+				<hidden>1</hidden>
 			</option>
 			
 			<option name="module_privacy_policy_page">
@@ -325,7 +325,7 @@
 				<defaultvalue>1</defaultvalue>
 			</option>
 			<option name="module_dashboard_page">
-				<categoryname>module.community</categoryname>
+				<categoryname>module.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
@@ -355,9 +355,9 @@
 			</option>
 			
 			<option name="module_ad">
-				<categoryname>module.content</categoryname>
+				<categoryname>module.display</categoryname>
 				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
+				<defaultvalue>1</defaultvalue>
 			</option>
 			
 			<!-- general.page -->
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 944c3525a4..a547ae68ba 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -59,61 +59,52 @@
 			<category name="admin.user.group">
 				<parent>admin.user</parent>
 			</category>
-			<category name="admin.user.option">
+			<category name="admin.user.option"><!-- @deprecated -->
 				<parent>admin.user</parent>
 			</category>
-			<category name="admin.user.rank">
+			<category name="admin.user.rank"><!-- @deprecated -->
 				<parent>admin.user</parent>
 			</category>
 			
 			<category name="admin.display">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.style">
+			<category name="admin.style"><!-- @deprecated -->
 				<parent>admin.display</parent>
 			</category>
-			<category name="admin.display.pageMenu">
+			<category name="admin.display.pageMenu"><!-- @deprecated -->
 				<parent>admin.display</parent>
 			</category>
-			<category name="admin.template">
-				<parent>admin.display</parent>
-			</category>
-			<category name="admin.display.captcha">
+			<category name="admin.template"><!-- @deprecated -->
 				<parent>admin.display</parent>
 			</category>
 			
 			<category name="admin.content">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.attachment">
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.bbcode">
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.smiley">
+			<category name="admin.attachment"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
-			<category name="admin.content.dashboard">
+			<category name="admin.content.bbcode"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
-			<category name="admin.content.label">
+			<category name="admin.content.smiley"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
-			<category name="admin.content.tag">
+			<category name="admin.content.dashboard"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
-			<category name="admin.content.notice">
+			<category name="admin.content.label"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
-			<category name="admin.content.ad">
+			<category name="admin.content.tag"><!-- @deprecated -->
 				<parent>admin.content</parent>
 			</category>
 			
 			<category name="admin.community">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.language">
+			<category name="admin.language"><!-- @deprecated -->
 				<parent>admin.display</parent>
 			</category>
 		</categories>
@@ -148,7 +139,7 @@
 				<usersonly>1</usersonly>
 			</option>
 			<option name="admin.system.canManageApplication">
-				<categoryname>admin.system</categoryname>
+				<categoryname>admin.system.package</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -297,15 +288,15 @@
 			</option>
 			
 			<option name="admin.user.canManageUserOption">
-				<categoryname>admin.user.option</categoryname>
+				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.language.canManageLanguage">
-				<categoryname>admin.language</categoryname>
+			<option name="admin.content.dashboard.canEditDashboard">
+				<categoryname>admin.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -313,14 +304,14 @@
 			</option>
 			
 			<option name="admin.style.canManageStyle">
-				<categoryname>admin.style</categoryname>
+				<categoryname>admin.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			<option name="admin.style.canUseDisabledStyle">
-				<categoryname>admin.style</categoryname>
+				<categoryname>admin.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -328,7 +319,7 @@
 			</option>
 			
 			<option name="admin.display.canManagePageMenu">
-				<categoryname>admin.display.pageMenu</categoryname>
+				<categoryname>admin.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -336,7 +327,23 @@
 			</option>
 			
 			<option name="admin.template.canManageTemplate">
-				<categoryname>admin.template</categoryname>
+				<categoryname>admin.display</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
+			<option name="admin.language.canManageLanguage">
+				<categoryname>admin.display</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
+			<option name="admin.ad.canManageAd">
+				<categoryname>admin.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -376,7 +383,7 @@ pdf]]></defaultvalue>
 			</option>
 			
 			<option name="admin.attachment.canManageAttachment">
-				<categoryname>admin.attachment</categoryname>
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -385,7 +392,7 @@ pdf]]></defaultvalue>
 			</option>
 			
 			<option name="admin.content.bbcode.canManageBBCode">
-				<categoryname>admin.content.bbcode</categoryname>
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -393,7 +400,7 @@ pdf]]></defaultvalue>
 			</option>
 			
 			<option name="admin.content.smiley.canManageSmiley">
-				<categoryname>admin.content.smiley</categoryname>
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -463,15 +470,8 @@ pdf]]></defaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.dashboard.canEditDashboard">
-				<categoryname>admin.content.dashboard</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
 			<option name="admin.user.rank.canManageRank">
-				<categoryname>admin.user.rank</categoryname>
+				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -704,7 +704,7 @@ png]]></defaultvalue>
 			</option>
 			
 			<option name="admin.content.label.canManageLabel">
-				<categoryname>admin.content.label</categoryname>
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -712,23 +712,15 @@ png]]></defaultvalue>
 			</option>
 			
 			<option name="admin.content.tag.canManageTag">
-				<categoryname>admin.content.tag</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
-			<option name="admin.content.notice.canManageNotice">
-				<categoryname>admin.content.notice</categoryname>
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.ad.canManageAd">
-				<categoryname>admin.content.ad</categoryname>
+			<option name="admin.notice.canManageNotice">
+				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -736,7 +728,7 @@ png]]></defaultvalue>
 			</option>
 			
 			<option name="admin.captcha.canManageCaptchaQuestion">
-				<categoryname>admin.display.captcha</categoryname>
+				<categoryname>admin.system</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
diff --git a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
index aa0a5bdce0..a4ada361f8 100644
--- a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
@@ -28,7 +28,7 @@ class AdAddForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.content.ad.canManageAd');
+	public $neededPermissions = array('admin.ad.canManageAd');
 	
 	/**
 	 * @see	wcf\page\AbstractPage::$neededModules
diff --git a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
index 529e96f940..27ce84b1e0 100644
--- a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
@@ -72,7 +72,7 @@ class NoticeAddForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.content.notice.canManageNotice');
+	public $neededPermissions = array('admin.notice.canManageNotice');
 	
 	/**
 	 * name of the notice
diff --git a/wcfsetup/install/files/lib/acp/page/AdListPage.class.php b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
index 7a867fc4be..9dff25e6d5 100644
--- a/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
@@ -21,7 +21,7 @@ class AdListPage extends MultipleLinkPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.content.ad.canManageAd');
+	public $neededPermissions = array('admin.ad.canManageAd');
 	
 	/**
 	 * @see	wcf\page\AbstractPage::$neededModules
diff --git a/wcfsetup/install/files/lib/acp/page/NoticeListPage.class.php b/wcfsetup/install/files/lib/acp/page/NoticeListPage.class.php
index 11dde8b71a..ffd8e2746e 100644
--- a/wcfsetup/install/files/lib/acp/page/NoticeListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/NoticeListPage.class.php
@@ -26,7 +26,7 @@ class NoticeListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.content.notice.canManageNotice');
+	public $neededPermissions = array('admin.notice.canManageNotice');
 	
 	/**
 	 * @see	\wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/files/lib/data/ad/AdAction.class.php b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
index cac6f0483b..28ce906a72 100644
--- a/wcfsetup/install/files/lib/data/ad/AdAction.class.php
+++ b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
@@ -20,12 +20,12 @@ class AdAction extends AbstractDatabaseObjectAction implements ISortableAction,
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.content.ad.canManageAd');
+	protected $permissionsDelete = array('admin.ad.canManageAd');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.content.ad.canManageAd');
+	protected $permissionsUpdate = array('admin.ad.canManageAd');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
diff --git a/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php b/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
index 21a2ac19cb..4cf8995ee4 100644
--- a/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
+++ b/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
@@ -26,12 +26,12 @@ class NoticeAction extends AbstractDatabaseObjectAction implements ISortableActi
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.content.notice.canManageNotice');
+	protected $permissionsDelete = array('admin.notice.canManageNotice');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.content.notice.canManageNotice');
+	protected $permissionsUpdate = array('admin.notice.canManageNotice');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
diff --git a/wcfsetup/install/files/lib/form/RecaptchaForm.class.php b/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
index 12e49384a3..99b2f3b741 100644
--- a/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
+++ b/wcfsetup/install/files/lib/form/RecaptchaForm.class.php
@@ -40,7 +40,7 @@ abstract class RecaptchaForm extends AbstractForm {
 	public function readParameters() {
 		parent::readParameters();
 		
-		if (!MODULE_SYSTEM_RECAPTCHA || WCF::getUser()->userID || WCF::getSession()->getVar('recaptchaDone')) {
+		if (WCF::getUser()->userID || WCF::getSession()->getVar('recaptchaDone')) {
 			$this->useCaptcha = false;
 		}
 	}
diff --git a/wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php b/wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php
index 42eb32c5ad..4ac88a0810 100644
--- a/wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php
+++ b/wcfsetup/install/files/lib/system/captcha/RecaptchaHandler.class.php
@@ -39,7 +39,7 @@ class RecaptchaHandler implements ICaptchaHandler {
 	 * @see	\wcf\system\captcha\ICaptchaHandler::isAvailable()
 	 */
 	public function isAvailable() {
-		return MODULE_SYSTEM_RECAPTCHA && RECAPTCHA_PUBLICKEY && RECAPTCHA_PRIVATEKEY;
+		return RECAPTCHA_PUBLICKEY && RECAPTCHA_PRIVATEKEY;
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 4bcff344df..3756f53a18 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -296,7 +296,6 @@
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups.description"><![CDATA[Mitglieder dieser Benutzergruppe haben auf diese Gruppen Zugriff. Zusätzlich muss angegeben werden, ob z.B. die Benutzergruppe bearbeitet werden darf.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddGroup"><![CDATA[Kann neue Benutzergruppen erstellen]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddUser"><![CDATA[Kann neue Benutzer erstellen]]></item>
-		<item name="wcf.acp.group.option.admin.user.canAddUser.description"><![CDATA[Ist bei „Zugängliche Benutzergruppen“ eine Option aktiviert, kann diese Gruppe beim Erstellen des Benutzers zugewiesen werden.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canDeleteGroup"><![CDATA[Kann Benutzergruppen löschen]]></item>
 		<item name="wcf.acp.group.option.admin.user.canDeleteUser"><![CDATA[Kann Benutzer löschen]]></item>
 		<item name="wcf.acp.group.option.admin.user.canEditGroup"><![CDATA[Kann Benutzergruppen bearbeiten]]></item>
@@ -427,14 +426,11 @@
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatische Benutzergruppen-Zuordnungen]]></item>
 		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[Benutzergruppe]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Automatische Zuordnung deaktivieren]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.notice"><![CDATA[Hinweise]]></item>
-		<item name="wcf.acp.group.option.admin.content.notice.canManageNotice"><![CDATA[Kann Hinweise verwalten]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.ad"><![CDATA[Werbung]]></item>
-		<item name="wcf.acp.group.option.admin.content.ad.canManageAd"><![CDATA[Kann Werbung verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.notice.canManageNotice"><![CDATA[Kann Hinweise verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.ad.canManageAd"><![CDATA[Kann Werbung verwalten]]></item>
 		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[Maximallänge „Über mich“]]></item>
 		<item name="wcf.acp.group.option.user.profile.canReportContent"><![CDATA[Kann Inhalte melden]]></item>
 		<item name="wcf.acp.group.option.admin.captcha.canManageCaptchaQuestion"><![CDATA[Kann Captcha-Fragen verwalten]]></item>
-		<item name="wcf.acp.group.option.category.admin.display.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.group.button.copy"><![CDATA[Benutzergruppe kopieren]]></item>
 		<item name="wcf.acp.group.copy.confirmMessage"><![CDATA[Wollen Sie diese Benutzergruppe wirklich kopieren?]]></item>
 		<item name="wcf.acp.group.copy.copyACLOptions"><![CDATA[Objekt-Berechtigungen kopieren]]></item>
@@ -821,8 +817,6 @@
 		<item name="wcf.acp.option.package_server_auth_code"><![CDATA[Authentifizierung-Code]]></item>
 		<item name="wcf.acp.option.package_server_auth_code.description"><![CDATA[Ihren Authentifizierung-Code finden Sie in Ihrem Kundenkonto auf woltlab.com.]]></item>
 		<item name="wcf.acp.option.enable_woltlab_news"><![CDATA[WoltLab-Nachrichten auf der Startseite der Administrationsoberfläche anzeigen]]></item>
-		<item name="wcf.acp.option.module_system_recaptcha"><![CDATA[Sicherheitsabfragen („reCAPTCHA“)]]></item>
-		<item name="wcf.acp.option.module_system_recaptcha.description"><![CDATA[Aktiviert Sicherheitsabfragen, um das automatisierte Absenden von Formularen durch so genannte Bots zu verhindern.]]></item>
 		<item name="wcf.acp.option.category.security.antispam.recaptcha"><![CDATA[reCAPTCHA]]></item>
 		<item name="wcf.acp.option.recaptcha_publickey"><![CDATA[Public-API-Key]]></item>
 		<item name="wcf.acp.option.recaptcha_publickey.description"><![CDATA[Einen eigenen API-Key für die Nutzung der reCAPTCHA-Funktion können Sie auf der Website von <a href="https://www.google.com/recaptcha/admin/create" class="externalURL">reCAPTCHA</a> beantragen.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e2fd64c1d2..2254340456 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -295,7 +295,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups.description"><![CDATA[Users of this group have access to these groups, furthermore you need to specify if these users are allowed to edit these groups.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddGroup"><![CDATA[Can add user groups]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddUser"><![CDATA[Can add users]]></item>
-		<item name="wcf.acp.group.option.admin.user.canAddUser.description"><![CDATA[If any group within “Accessible User Groups” is checked, users may assign these groups to newly created users.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canDeleteGroup"><![CDATA[Can delete user groups]]></item>
 		<item name="wcf.acp.group.option.admin.user.canDeleteUser"><![CDATA[Can delete users]]></item>
 		<item name="wcf.acp.group.option.admin.user.canEditGroup"><![CDATA[Can edit user groups]]></item>
@@ -426,14 +425,11 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatic User Group Assignments]]></item>
 		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[User Group]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Disable Automatic Assignment]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.notice"><![CDATA[Notices]]></item>
-		<item name="wcf.acp.group.option.admin.content.notice.canManageNotice"><![CDATA[Can manage notices]]></item>
-		<item name="wcf.acp.group.option.category.admin.content.ad"><![CDATA[Ads]]></item>
-		<item name="wcf.acp.group.option.admin.content.ad.canManageAd"><![CDATA[Can manage ads]]></item>
+		<item name="wcf.acp.group.option.admin.notice.canManageNotice"><![CDATA[Can manage notices]]></item>
+		<item name="wcf.acp.group.option.admin.ad.canManageAd"><![CDATA[Can manage ads]]></item>
 		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[“About Me” maximum length]]></item>
 		<item name="wcf.acp.group.option.user.profile.canReportContent"><![CDATA[Can report content]]></item>
 		<item name="wcf.acp.group.option.admin.captcha.canManageCaptchaQuestion"><![CDATA[Can manage captcha questions]]></item>
-		<item name="wcf.acp.group.option.category.admin.display.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.group.button.copy"><![CDATA[Copy User Group]]></item>
 		<item name="wcf.acp.group.copy.confirmMessage"><![CDATA[Do you really want to copy this user group?]]></item>
 		<item name="wcf.acp.group.copy.copyACLOptions"><![CDATA[Copy Object Permissions]]></item>
@@ -820,8 +816,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.package_server_auth_code"><![CDATA[Authentication Code]]></item>
 		<item name="wcf.acp.option.package_server_auth_code.description"><![CDATA[Your authentication code is available in the customers area on woltlab.com.]]></item>
 		<item name="wcf.acp.option.enable_woltlab_news"><![CDATA[Show WoltLab news on the administration control panel’s start page.]]></item>
-		<item name="wcf.acp.option.module_system_recaptcha"><![CDATA[Verification (“reCAPTCHA”)]]></item>
-		<item name="wcf.acp.option.module_system_recaptcha.description"><![CDATA[Enables security measures to prevent automatic form submission for bots.]]></item>
 		<item name="wcf.acp.option.category.security.antispam.recaptcha"><![CDATA[reCAPTCHA]]></item>
 		<item name="wcf.acp.option.recaptcha_publickey"><![CDATA[Public API Key]]></item>
 		<item name="wcf.acp.option.recaptcha_publickey.description"><![CDATA[You can request an own API-Key for using reCAPTCHA on the <a href="https://www.google.com/recaptcha/admin/create" class="externalURL">reCAPTCHA website</a>.]]></item>
-- 
2.20.1