Disabled ad locations on non-content pages

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 48b0d0daac20f0b0ce5b79d84aac356df92dc477..41a5e762f706b2e239e5af29b78207ffd1158d2d 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_WCF_AD}
+                               {if MODULE_WCF_AD && $__disableAds|empty}
                                        {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')}
                                {/if}
                        </section>
@@ -40,7 +40,7 @@
                        {event name='copyright'}
                </div>
                
-               {if MODULE_WCF_AD}
+               {if MODULE_WCF_AD && $__disableAds|empty}
                        {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}
                {/if}
        </div>

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index bb52801524cf07c12b79a927745d25238a56c0bd..00377dda8ac50543218be56e81822ac28b8998b7 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -20,7 +20,7 @@
                </nav>
                
                <div id="logo" class="logo">
-                       {if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if}
+                       {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if}
                        
                        <a href="{link}{/link}">
                                {if $__wcf->getStyleHandler()->getStyle()->getPageLogo()}
@@ -56,7 +56,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_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}{/if}
+                                                       {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}{/if}
                                                        
                                                        {event name='sidebarBoxesTop'}
                                                        
@@ -64,7 +64,7 @@
                                                        
                                                        {event name='sidebarBoxesBottom'}
                                                        
-                                                       {if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
+                                                       {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
                                                </div>
                                        </aside>
                                        
@@ -85,7 +85,7 @@
                        {/if}
                        
                        <section id="content" class="content">
-                               {if MODULE_WCF_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
+                               {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
                                
                                {event name='contents'}
                                

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 8a5a2479412a63971d01d0359a4d603c293c2525..72025b2d8146c2abf78417dbaedeaccd6d9e5cb4 100644 (file)
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -15,7 +15,7 @@
 </head>
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
-{include file='header' __disableLoginLink=true}
+{include file='header' __disableLoginLink=true __disableAds=true}
 
 <header class="boxHeadline">
        <h1>{lang}wcf.user.login{/lang}</h1>
@@ -160,7 +160,7 @@
        </div>
 </form>
 
-{include file='footer'}
+{include file='footer' __disableAds=true}
 
 </body>
 </html>

diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/templates/redirect.tpl
index c34cd4040182b88e58a69997e6c3487e5b5cfdfe..7d3c62e98b5c17e8f232647a444c28c8595f78ae 100644 (file)
--- a/com.woltlab.wcf/templates/redirect.tpl
+++ b/com.woltlab.wcf/templates/redirect.tpl
@@ -10,14 +10,14 @@
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{include file='header'}
+{include file='header' __disableAds=true}
 
 <div class="{if !$status|empty}{@$status}{else}success{/if}">
        <p>{@$message}</p>
        <a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a>
 </div>
 
-{include file='footer'}
+{include file='footer' __disableAds=true}
 
 </body>
 </html>

diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 9b24e4b646ae5d6d36bce52c90a502cdb8923469..b04be1a47a90f1c1d4357628f0b6ec8c7775e554 100644 (file)
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -7,7 +7,7 @@
 
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 
-{include file='header'}
+{include file='header' __disableAds=true}
        
 <p id="errorMessage" class="error">
        {@$message}
@@ -28,7 +28,7 @@
        -->
 {/if}
 
-{include file='footer'}
+{include file='footer' __disableAds=true}
 
 </body>
 </html>