From 4aa7e0ef2e66ec49b0fe66a253081e40b22f1eea Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 12 Sep 2014 20:21:59 +0200
Subject: [PATCH] Renamed MODULE_AD -> MODULE_WCF_AD

The previous name caused adblockers to go wild and hide the checkbox required to toggle the ad system.
---
 com.woltlab.wcf/acpMenu.xml                              | 3 ++-
 com.woltlab.wcf/option.xml                               | 2 +-
 com.woltlab.wcf/templates/footer.tpl                     | 4 ++--
 com.woltlab.wcf/templates/header.tpl                     | 8 ++++----
 wcfsetup/install/files/lib/acp/form/AdAddForm.class.php  | 2 +-
 wcfsetup/install/files/lib/acp/page/AdListPage.class.php | 2 +-
 wcfsetup/install/lang/de.xml                             | 2 +-
 wcfsetup/install/lang/en.xml                             | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 69229f1cbe..82ae29176f 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -436,7 +436,8 @@
 		
 		<acpmenuitem name="wcf.acp.menu.link.ad">
 			<parent>wcf.acp.menu.link.display</parent>
-			<options>module_ad</options>
+			<!-- do NOT use 'module_ad', the ACP checkbox is incorrectly recognized by adblockers -->
+			<options>module_wcf_ad</options>
 			<showorder>6</showorder>
 		</acpmenuitem>
 		<acpmenuitem name="wcf.acp.menu.link.ad.list">
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 41f7023858..6d8a8a86ea 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -357,7 +357,7 @@
 				<defaultvalue>1</defaultvalue>
 			</option>
 			
-			<option name="module_ad">
+			<option name="module_wcf_ad">
 				<categoryname>module.display</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 791d6e85ca..cb662b6db9 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -2,7 +2,7 @@
 				
 				{if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if}
 				
-				{if MODULE_AD}
+				{if MODULE_WCF_AD}
 					{hascontent}
 						<div class="marginTop">
 							{content}
@@ -46,7 +46,7 @@
 			{event name='copyright'}
 		</div>
 		
-		{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}{/if}
+		{if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}{/if}
 	</div>
 </footer>
 
diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 524e5bd957..df548d93e9 100644
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -25,7 +25,7 @@
 				{event name='headerLogo'}
 			</a>
 			
-			{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if}
+			{if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if}
 		</div>
 		
 		{event name='headerContents'}
@@ -54,7 +54,7 @@
 				{if $sidebar|isset}
 					<aside class="sidebar"{if $sidebarOrientation|isset && $sidebarOrientation == 'right'} data-is-open="{if $sidebarCollapsed}false{else}true{/if}" data-sidebar-name="{$sidebarName}"{/if}>
 						<div>
-							{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}{/if}
+							{if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}{/if}
 							
 							{event name='sidebarBoxesTop'}
 							
@@ -62,7 +62,7 @@
 							
 							{event name='sidebarBoxesBottom'}
 							
-							{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
+							{if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
 						</div>
 					</aside>
 					
@@ -83,7 +83,7 @@
 			{/if}
 			
 			<section id="content" class="content">
-				{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
+				{if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
 				
 				{event name='contents'}
 				
diff --git a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
index a4ada361f8..5f8004f4a1 100644
--- a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
@@ -33,7 +33,7 @@ class AdAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('MODULE_AD');
+	public $neededModules = array('MODULE_WCF_AD');
 	
 	/**
 	 * html code of the ad
diff --git a/wcfsetup/install/files/lib/acp/page/AdListPage.class.php b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
index 9dff25e6d5..79d03fdda4 100644
--- a/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
@@ -26,7 +26,7 @@ class AdListPage extends MultipleLinkPage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('MODULE_AD');
+	public $neededModules = array('MODULE_WCF_AD');
 	
 	/**
 	 * @see	\wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7865f6effc..cc4b3dc104 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1002,7 +1002,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 </ul>]]></item>
 		<item name="wcf.acp.option.url_to_lowercase"><![CDATA[Durchgehende Kleinschreibung in Links aktivieren]]></item>
 		<item name="wcf.acp.option.url_to_lowercase.description"><![CDATA[Links verwenden keine Großbuchstaben mehr, aus „Thread/1-Dies-ist-ein-Test/“ wird „thread/1-dies-ist-ein-test/“.]]></item>
-		<item name="wcf.acp.option.module_ad"><![CDATA[Werbung]]></item>
+		<item name="wcf.acp.option.module_wcf_ad"><![CDATA[Werbung]]></item>
 		<item name="wcf.acp.option.captcha_type"><![CDATA[Captcha-Art]]></item>
 		<item name="wcf.acp.option.register_use_captcha"><![CDATA[Captcha in Registrierung aktivieren]]></item>
 		<item name="wcf.acp.option.lost_password_use_captcha"><![CDATA[Captcha in „Kennwort vergessen“ aktivieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index f47f2185ee..a421751632 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1001,7 +1001,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 </ul>]]></item>
 		<item name="wcf.acp.option.url_to_lowercase"><![CDATA[Force lower-case links]]></item>
 		<item name="wcf.acp.option.url_to_lowercase.description"><![CDATA[Links will no longer contain uppercase letters turning links like “Thread/1-Hello-I-am-John-Doe/” into “thread/1-hello-i-am-john-doe/”.]]></item>
-		<item name="wcf.acp.option.module_ad"><![CDATA[Ads]]></item>
+		<item name="wcf.acp.option.module_wcf_ad"><![CDATA[Ads]]></item>
 		<item name="wcf.acp.option.captcha_type"><![CDATA[Captcha Type]]></item>
 		<item name="wcf.acp.option.register_use_captcha"><![CDATA[Enable Captcha protection during registration]]></item>
 		<item name="wcf.acp.option.lost_password_use_captcha"><![CDATA[Enable Captcha protection for “Lost Password”]]></item>
-- 
2.20.1