Renamed MODULE_AD -> MODULE_WCF_AD

The previous name caused adblockers to go wild and hide the checkbox required to toggle the ad system.

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 69229f1cbeee03ab12c17c359f63ee0cde1e58b2..82ae29176fca2a7b23b79c08acbbef9d86419cb3 100644 (file)
--- 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 41f7023858e18086c693191d87890567865b64f0..6d8a8a86ea11d8281f2a4b6cb3b4b36e4b93aa8c 100644 (file)
--- 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 791d6e85ca16cdc188842b2450ba15340924c1aa..cb662b6db9c88f52c397563a8f4e976240350966 100644 (file)
--- 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 524e5bd957534418f30328ef09ae95c9b89d9eb9..df548d93e9c21f8d04c107222338af72d55ea03e 100644 (file)
--- 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 a4ada361f8bec3518543ebe03c63a1c6aebd9ed7..5f8004f4a13df05b41b41b2d80e0dd1e4b19c947 100644 (file)
--- 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 9dff25e6d57cab31bdc843b0304a39a53484e1b7..79d03fdda4d8796bc5ee09be01b1e79a3b4fd019 100644 (file)
--- 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 7865f6effc8a65d94308d7012ea0b9a5f9b2d7a4..cc4b3dc104ff372f4d5a2394008fa818f397a989 100644 (file)
--- 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 f47f2185eea871c8a8fccb39e56d97cb258179a7..a421751632e21f74d7ea2572fa8e91d4fa12098c 100644 (file)
--- 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>