From 4a9b28a58c43273b0910748c5419198995e1c00b Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 18 Mar 2019 16:08:30 +0100
Subject: [PATCH] Add ad support for articles

Close #2707
---
 com.woltlab.wcf/objectType.xml                | 36 +++++++++++++++
 com.woltlab.wcf/templates/article.tpl         |  6 ++-
 .../templates/articleListItems.tpl            | 46 ++++++++++++++++++-
 com.woltlab.wcf/templates/boxArticleList.tpl  |  2 +-
 wcfsetup/install/lang/de.xml                  |  7 +++
 wcfsetup/install/lang/en.xml                  |  7 +++
 6 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 5c2d5844c2..8da42098fb 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -1018,6 +1018,42 @@
 			<categoryname>com.woltlab.wcf.global</categoryname>
 			<cssclassname>wcfAdLocationFooterBottom</cssclassname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.article.inArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationInArticle</cssclassname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.article.after1stArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfter1stArticle</cssclassname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.article.afterEvery2ndArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfterEvery2ndArticle</cssclassname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.article.afterEvery3rdArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfterEvery3rdArticle</cssclassname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.article.afterEvery5thArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfterEvery5thArticle</cssclassname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.article.afterEvery10thArticle</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.article</categoryname>
+			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfterEvery10thArticle</cssclassname>
+		</type>
 		<!-- /ad locations -->
 		<!-- ad conditions -->
 		<type>
diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index e0ad68e213..824aec8d0b 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -132,10 +132,14 @@
 	
 	<div class="section articleContent" {@$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.likeableArticle', $article->articleID)}>
 		<div class="htmlContent">
+			{if MODULE_WCF_AD}
+				{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.inArticle')}
+			{/if}
+			
 			{if $articleContent->teaser}
 				<p class="articleTeaser">{@$articleContent->getFormattedTeaser()}</p>
 			{/if}
-		
+			
 			{@$articleContent->getFormattedContent()}
 			
 			{event name='htmlArticleContent'}
diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl
index 5067b8e89d..22cfaf345a 100644
--- a/com.woltlab.wcf/templates/articleListItems.tpl
+++ b/com.woltlab.wcf/templates/articleListItems.tpl
@@ -1,5 +1,7 @@
+{if !$disableAds|isset}{assign var='disableAds' value=false}{/if}
+
 <ul class="articleList">
-	{foreach from=$objects item='article'}
+	{foreach from=$objects item='article' name=articles}
 		<li>
 			<a href="{$article->getLink()}">
 				{if $article->getTeaserImage() && $article->getTeaserImage()->hasThumbnail('tiny')}
@@ -60,5 +62,47 @@
 				{event name='articleListEntry'}
 			</a>
 		</li>
+		
+		{if MODULE_WCF_AD && !$disableAds}
+			{if $tpl[foreach][articles][iteration] === 1}
+				{hascontent}
+					<li>
+						{content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.after1stArticle')}{/content}
+					</li>
+				{/hascontent}
+			{else}
+				{if $tpl[foreach][articles][iteration] % 2 === 0}
+					{hascontent}
+						<li>
+							{content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery2ndArticle')}{/content}
+						</li>
+					{/hascontent}
+				{/if}
+				
+				{if $tpl[foreach][articles][iteration] % 3 === 0}
+					{hascontent}
+						<li>
+							{content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery3rdArticle')}{/content}
+						</li>
+					{/hascontent}
+				{/if}
+				
+				{if $tpl[foreach][articles][iteration] % 5 === 0}
+					{hascontent}
+						<li>
+							{content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery5thArticle')}{/content}
+						</li>
+					{/hascontent}
+				{/if}
+				
+				{if $tpl[foreach][articles][iteration] % 10 === 0}
+					{hascontent}
+						<li>
+							{content}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.article.afterEvery10thArticle')}{/content}
+						</li>
+					{/hascontent}
+				{/if}
+			{/if}
+		{/if}
 	{/foreach}
 </ul>
diff --git a/com.woltlab.wcf/templates/boxArticleList.tpl b/com.woltlab.wcf/templates/boxArticleList.tpl
index ac166e7b6d..c639d38c59 100644
--- a/com.woltlab.wcf/templates/boxArticleList.tpl
+++ b/com.woltlab.wcf/templates/boxArticleList.tpl
@@ -51,5 +51,5 @@
 		{/foreach}
 	</ul>
 {else}
-	{include file='articleListItems' objects=$boxArticleList}
+	{include file='articleListItems' objects=$boxArticleList disableAds=true}
 {/if}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index ed1ca12705..54e2ed0c23 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -46,6 +46,13 @@
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.bottom"><![CDATA[Sidebar (unten)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.footer.bottom"><![CDATA[Seitenende]]></item>
 		<item name="wcf.acp.ad.showOrder.description"><![CDATA[Legt die Reihenfolge fest, in der die Werbungen angezeigt werden.]]></item>
+		<item name="wcf.acp.ad.location.category.com.woltlab.wcf.article"><![CDATA[Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.after1stArticle"><![CDATA[Nach dem ersten Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery10thArticle"><![CDATA[Nach jedem 10. Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery2ndArticle"><![CDATA[Nach jedem 2. Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery3rdArticle"><![CDATA[Nach jedem 3. Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery5thArticle"><![CDATA[Nach jedem 5. Artikel]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.inArticle"><![CDATA[Innerhalb des Artikels]]></item>
 	</category>
 	<category name="wcf.acp.application">
 		<item name="wcf.acp.application.cookie"><![CDATA[Cookie-Einstellungen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0d47ec7b0b..3c317844aa 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -46,6 +46,13 @@
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.bottom"><![CDATA[Sidebar (bottom)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.footer.bottom"><![CDATA[End of Page]]></item>
 		<item name="wcf.acp.ad.showOrder.description"><![CDATA[Choose display order of ads.]]></item>
+		<item name="wcf.acp.ad.location.category.com.woltlab.wcf.article"><![CDATA[Articles]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.after1stArticle"><![CDATA[After the first article]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery10thArticle"><![CDATA[After every 10. article]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery2ndArticle"><![CDATA[After every 2. article]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery3rdArticle"><![CDATA[After every 3. article]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.afterEvery5thArticle"><![CDATA[After every 5. article]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.article.inArticle"><![CDATA[In the article]]></item>
 	</category>
 	<category name="wcf.acp.application">
 		<item name="wcf.acp.application.cookie"><![CDATA[Cookie Settings]]></item>
-- 
2.20.1