From e866b80eaf22f02e6e5be9f7c77ac13207232f0a Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 7 Jun 2014 21:07:36 +0200
Subject: [PATCH] Add ad system

---
 com.woltlab.wcf/acpMenu.xml                   |  15 ++
 com.woltlab.wcf/coreObject.xml                |   4 +
 com.woltlab.wcf/objectType.xml                | 140 +++++++++-
 com.woltlab.wcf/objectTypeDefinition.xml      |   9 +
 com.woltlab.wcf/option.xml                    |   6 +
 com.woltlab.wcf/templates/footer.tpl          |  11 +
 com.woltlab.wcf/templates/header.tpl          |   7 +
 com.woltlab.wcf/userGroupOption.xml           |  10 +
 wcfsetup/install/files/acp/js/WCF.ACP.js      |  74 ++++++
 .../install/files/acp/templates/adAdd.tpl     | 159 ++++++++++++
 .../install/files/acp/templates/adList.tpl    |  70 +++++
 wcfsetup/install/files/js/WCF.js              |  18 ++
 .../files/lib/acp/form/AdAddForm.class.php    | 240 ++++++++++++++++++
 .../files/lib/acp/form/AdEditForm.class.php   | 135 ++++++++++
 .../files/lib/acp/page/AdListPage.class.php   |  30 +++
 .../install/files/lib/data/ad/Ad.class.php    |  61 +++++
 .../files/lib/data/ad/AdAction.class.php      | 119 +++++++++
 .../files/lib/data/ad/AdEditor.class.php      |  71 ++++++
 .../files/lib/data/ad/AdList.class.php        |  15 ++
 .../files/lib/system/ad/AdHandler.class.php   | 137 ++++++++++
 .../cache/builder/AdCacheBuilder.class.php    |  36 +++
 .../MultiPageControllerCondition.class.php    |  16 ++
 .../system/condition/TimeCondition.class.php  |   8 +-
 wcfsetup/install/lang/de.xml                  |  34 +++
 wcfsetup/setup/db/install.sql                 |  12 +
 25 files changed, 1432 insertions(+), 5 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/templates/adAdd.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/adList.tpl
 create mode 100644 wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
 create mode 100644 wcfsetup/install/files/lib/acp/page/AdListPage.class.php
 create mode 100644 wcfsetup/install/files/lib/data/ad/Ad.class.php
 create mode 100644 wcfsetup/install/files/lib/data/ad/AdAction.class.php
 create mode 100644 wcfsetup/install/files/lib/data/ad/AdEditor.class.php
 create mode 100644 wcfsetup/install/files/lib/data/ad/AdList.class.php
 create mode 100644 wcfsetup/install/files/lib/system/ad/AdHandler.class.php
 create mode 100644 wcfsetup/install/files/lib/system/cache/builder/AdCacheBuilder.class.php

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 6242c7da17..e633b3fc94 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -508,6 +508,21 @@
 			<permissions>admin.content.notice.canManageNotice</permissions>
 		</acpmenuitem>
 		
+		<acpmenuitem name="wcf.acp.menu.link.ad">
+			<parent>wcf.acp.menu.link.content</parent>
+			<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>
diff --git a/com.woltlab.wcf/coreObject.xml b/com.woltlab.wcf/coreObject.xml
index d02ca2b9c2..634629004e 100644
--- a/com.woltlab.wcf/coreObject.xml
+++ b/com.woltlab.wcf/coreObject.xml
@@ -53,5 +53,9 @@
 		<coreobject>
 			<objectname><![CDATA[wcf\system\notice\NoticeHandler]]></objectname>
 		</coreobject>
+		
+		<coreobject>
+			<objectname><![CDATA[wcf\system\ad\AdHandler]]></objectname>
+		</coreobject>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 072155d839..a594532b57 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -705,6 +705,144 @@
 			<conditionobject>com.woltlab.wcf.user</conditionobject>
 			<conditiongroup>userOptions</conditiongroup>
 		</type>
-		<!-- /user group assignment conditions -->
+		<!-- /notice conditions -->
+		
+		<!-- ad locations -->
+		<type>
+			<name>com.woltlab.wcf.logo</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.header.content</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.footer.content</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.sidebar.top</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.sidebar.bottom</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.footer.bottom</name>
+			<definitionname>com.woltlab.wcf.adLocation</definitionname>
+			<categoryname>com.woltlab.wcf.global</categoryname>
+		</type>
+		<!-- /ad locations -->
+		
+		<!-- ad conditions -->
+		<type>
+			<name>com.woltlab.wcf.page.controller</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\MultiPageControllerCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.page</conditionobject>
+		</type>
+		
+		<type>
+			<name>com.woltlab.wcf.pointInTime.daysOfWeek</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\DaysOfWeekCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.pointInTime.time</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\TimeCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
+		</type>
+		
+		<type>
+			<name>com.woltlab.wcf.user.username</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserUsernameCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.email</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserEmailCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.userGroup</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserGroupCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+			<includeguests>1</includeguests>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.languages</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserLanguageCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.registrationDate</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserRegistrationDateCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.registrationDateInterval</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserRegistrationDateIntervalCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.avatar</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserAvatarCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.state</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserStateCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>general</conditiongroup>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.activityPoints</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>contents</conditiongroup>
+			<propertyname>activityPoints</propertyname>
+			<minvalue>0</minvalue>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.likesReceived</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserIntegerPropertyCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>contents</conditiongroup>
+			<propertyname>likesReceived</propertyname>
+			<minvalue>0</minvalue>
+		</type>
+		<type>
+			<name>com.woltlab.wcf.user.userOptions</name>
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+			<classname><![CDATA[wcf\system\condition\UserOptionsCondition]]></classname>
+			<conditionobject>com.woltlab.wcf.user</conditionobject>
+			<conditiongroup>userOptions</conditiongroup>
+		</type>
+		<!-- /ad conditions -->
 	</import>
 </data>
diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index 10a1bd08eb..8cfd6268ca 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -162,5 +162,14 @@
 			<name>com.woltlab.wcf.condition.notice</name>
 			<interfacename><![CDATA[wcf\system\condition\IContentCondition]]></interfacename>
 		</definition>
+		
+		<definition>
+			<name>com.woltlab.wcf.adLocation</name>
+		</definition>
+		
+		<definition>
+			<name>com.woltlab.wcf.condition.ad</name>
+			<interfacename><![CDATA[wcf\system\condition\IContentCondition]]></interfacename>
+		</definition>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9564a4c433..50883b1d62 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -338,6 +338,12 @@
 				<defaultvalue>1</defaultvalue>
 			</option>
 			
+			<option name="module_ad">
+				<categoryname>module.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+			</option>
+			
 			<!-- general.page -->
 			<option name="page_title">
 				<categoryname>general.page</categoryname>
diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 761cc395b0..791d6e85ca 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -2,6 +2,15 @@
 				
 				{if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if}
 				
+				{if MODULE_AD}
+					{hascontent}
+						<div class="marginTop">
+							{content}
+								{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')}
+							{/content}
+						</div>
+					{/hascontent}
+				{/if}
 			</section>
 			
 			{if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
@@ -36,6 +45,8 @@
 			
 			{event name='copyright'}
 		</div>
+		
+		{if MODULE_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 8055d6ab2b..ea61c06933 100644
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -24,6 +24,8 @@
 				{/if}
 				{event name='headerLogo'}
 			</a>
+			
+			{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if}
 		</div>
 		
 		{event name='headerContents'}
@@ -52,11 +54,15 @@
 				{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}
+							
 							{event name='sidebarBoxesTop'}
 							
 							{@$sidebar}
 							
 							{event name='sidebarBoxesBottom'}
+							
+							{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
 						</div>
 					</aside>
 					
@@ -77,6 +83,7 @@
 			{/if} 
 			
 			<section id="content" class="content">
+				{if MODULE_AD}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
 				
 				{event name='contents'}
 				
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 156b2b4364..eec0272d5a 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -103,6 +103,9 @@
 			<category name="admin.content.notice">
 				<parent>admin.content</parent>
 			</category>
+			<category name="admin.content.ad">
+				<parent>admin.content</parent>
+			</category>
 			
 			<category name="admin.community">
 				<parent>admin</parent>
@@ -637,6 +640,13 @@ png]]></defaultvalue>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			
+			<option name="admin.content.ad.canManageAd">
+				<categoryname>admin.content.ad</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+			</option>
 		</options>
 	</import>
 </data>
diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 2f73a8847c..54e2696019 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -2660,3 +2660,77 @@ WCF.ACP.Stat.Chart = Class.extend({
 		});
 	}
 });
+
+/**
+ * Namespace for ACP ad management.
+ */
+WCF.ACP.Ad = { };
+
+/**
+ * Handles the location of an ad during ad creation/editing.
+ */
+WCF.ACP.Ad.LocationHandler = Class.extend({
+	/**
+	 * fieldset of the page conditions
+	 * @var	jQuery
+	 */
+	_pageConditions: null,
+	
+	/**
+	 * select element for the page controller condition
+	 * @var	jQuery
+	 */
+	_pageControllers: null,
+	
+	/**
+	 * Initializes a new WCF.ACP.Ad.LocationHandler object.
+	 */
+	init: function() {
+		this._pageConditions = $('#pageConditions');
+		this._pageControllers = $('#pageControllers');
+		
+		// hide the page controller element
+		this._pageControllers.parents('dl:eq(0)').hide();
+		
+		// fix the margin of a potentially next page condition element
+		this._pageControllers.parents('dl:eq(0)').next('dl').css('margin-top', 0);
+		
+		$('#objectTypeID').on('change', $.proxy(this._setPageController, this));
+		
+		this._setPageController();
+		
+		$('#adForm').submit($.proxy(this._submit, this));
+	},
+	
+	/**
+	 * Sets the page controller based on the selected ad location.
+	 */
+	_setPageController: function() {
+		var $option = $('#objectTypeID').find('option:checked');
+		
+		// check if the selected ad location is bound to a specific page
+		if ($option.data('page')) {
+			// select the related page
+			this._pageControllers.val([this._pageControllers.children('option[data-object-type="' + $option.data('page') + '"]').val()]).change();
+		}
+		else {
+			this._pageControllers.val([]).change();
+		}
+	},
+	
+	/**
+	 * Handles submitting the ad form.
+	 */
+	_submit: function() {
+		if (this._pageConditions.is(':hidden')) {
+			// remove hidden page condition form elements to avoid creation
+			// of these conditions
+			this._pageConditions.find('select, input').remove();
+		}
+		else {
+			// reset page controller conditions to avoid creation of
+			// unnecessary conditions
+			this._pageControllers.val([]);
+		}
+	}
+});
diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
new file mode 100644
index 0000000000..897934e169
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -0,0 +1,159 @@
+{include file='header' pageTitle='wcf.acp.ad.'|concat:$action}
+
+<script data-relocate="true">
+	//<![CDATA[
+	$(function() {
+		WCF.TabMenu.init();
+		
+		new WCF.ACP.Ad.LocationHandler();
+	});
+	//]]>
+</script>
+
+<header class="boxHeadline">
+	<h1>{lang}wcf.acp.ad.{$action}{/lang}</h1>
+</header>
+
+{include file='formError'}
+
+{if $success|isset}
+	<p class="success">{lang}wcf.global.success.{$action}{/lang}</p>
+{/if}
+
+<div class="contentNavigation">
+	<nav>
+		<ul>
+			<li><a href="{link controller='AdList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.ad.list{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
+</div>
+
+<form id="adForm" method="post" action="{if $action == 'add'}{link controller='AdAdd'}{/link}{else}{link controller='AdEdit' object=$adObject}{/link}{/if}">
+	<div class="container containerPadding marginTop">
+		<fieldset>
+			<legend>{lang}wcf.global.form.data{/lang}</legend>
+			
+			<dl{if $errorField == 'adName'} class="formError"{/if}>
+				<dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
+				<dd>
+					<input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long" />
+					{if $errorField == 'adName'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.ad.adName.error.{$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl{if $errorField == 'ad'} class="formError"{/if}>
+				<dt><label for="ad">{lang}wcf.acp.ad.ad{/lang}</label></dt>
+				<dd>
+					<textarea id="ad" name="ad" cols="40" rows="10">{$ad}</textarea>
+					<small>{lang}wcf.acp.ad.ad.description{/lang}</small>
+					{if $errorField == 'ad'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.acp.ad.ad.error.{$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt></dt>
+				<dd>
+					<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.ad.isDisabled{/lang}</label>
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="objectTypeID">{lang}wcf.acp.ad.location{/lang}</label></dt>
+				<dd>
+					<select name="objectTypeID" id="objectTypeID">
+						<option value="0"{if !$objectTypeID} checked="checked"{/if}>{lang}wcf.global.noSelection{/lang}</option>
+						{foreach from=$locations key='locationGroupLabel' item='locationGroup'}
+							<optgroup label="{$locationGroupLabel}">
+								{foreach from=$locationGroup key='locationID' item='location'}
+									<option value="{@$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected="selected"{/if}>{$location}</option>
+								{/foreach}
+							</optgroup>
+						{/foreach}
+					</select>
+					{if $errorField == 'objectTypeID'}
+						<small class="innerError">
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{elseif $errorType == 'noValidSelection'}
+								{lang}wcf.global.form.error.noValidSelection{/lang}
+							{else}
+								{lang}wcf.acp.ad.location.error.{$errorType}{/lang}
+							{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="position">{lang}wcf.acp.ad.showOrder{/lang}</label></dt>
+				<dd>
+					<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
+					<small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			{event name='dataFields'}
+		</fieldset>
+		
+		{event name='fieldsets'}
+	</div>
+	
+	<header class="boxHeadline boxSubHeadline">
+		<h2>{lang}wcf.acp.ad.conditions{/lang}</h2>
+		<small>{lang}wcf.acp.ad.conditions.description{/lang}</small>
+	</header>
+	
+	<div class="container containerPadding marginTop">
+		<fieldset id="pageConditions">
+			<legend>{lang}wcf.acp.ad.conditions.page{/lang}</legend>
+			<small>{lang}wcf.acp.ad.conditions.page.description{/lang}</small>
+			
+			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
+				{@$pageConditionObjectType->getProcessor()->getHtml()}
+			{/foreach}
+		</fieldset>
+		
+		<fieldset id="pointInTimeConditions">
+			<legend>{lang}wcf.acp.ad.conditions.pointInTime{/lang}</legend>
+			<small>{lang}wcf.acp.ad.conditions.pointInTime.description{/lang}</small>
+			
+			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
+				{@$pointInTimeConditionObjectType->getProcessor()->getHtml()}
+			{/foreach}
+		</fieldset>
+		
+		{event name='conditionTypeFieldsets'}
+	</div>
+	
+	<header class="boxHeadline boxSubHeadline">
+		<h2>{lang}wcf.acp.ad.conditions.user{/lang}</h2>
+		<small>{lang}wcf.acp.ad.conditions.user.description{/lang}</small>
+	</header>
+	
+	{include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
+	
+	<div class="formSubmit">
+		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+		{@SECURITY_TOKEN_INPUT_TAG}
+	</div>
+</form>
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/adList.tpl b/wcfsetup/install/files/acp/templates/adList.tpl
new file mode 100644
index 0000000000..f14aa3eb18
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/adList.tpl
@@ -0,0 +1,70 @@
+{include file='header' pageTitle='wcf.acp.ad.list'}
+
+<script data-relocate="true">
+	//<![CDATA[
+	$(function() {
+		new WCF.Action.Delete('wcf\\data\\ad\\AdAction', '.jsAd');
+		new WCF.Action.Toggle('wcf\\data\\ad\\AdAction', '.jsAd');
+		new WCF.Sortable.List('adList', 'wcf\\data\\ad\\AdAction', {@$startIndex});
+	});
+	//]]>
+</script>
+
+<header class="boxHeadline">
+	<h1>{lang}wcf.acp.ad.list{/lang}</h1>
+</header>
+
+<div class="contentNavigation">
+	{pages print=true assign=pagesLinks controller="AdList" link="pageNo=%d"}
+	
+	<nav>
+		<ul>
+			<li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
+</div>
+
+{if $objects|count}
+	<div class="container containerPadding sortableListContainer marginTop" id="adList">
+		<ol class="sortableList" data-object-id="0" start="{@($pageNo - 1) * $itemsPerPage + 1}">
+			{foreach from=$objects item='ad'}
+				<li class="sortableNode sortableNoNesting jsAd" data-object-id="{@$ad->adID}">
+					<span class="sortableNodeLabel">
+						<span class="statusDisplay sortableButtonContainer">
+							<span class="icon icon16 icon-check{if $ad->isDisabled}-empty{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $ad->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$ad->adID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
+							<a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
+							<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$ad->adID}" data-confirm-message="{lang}wcf.acp.ad.delete.confirmMessage{/lang}"></span>
+							
+							{event name='itemButtons'}
+						</span>
+						
+						<a href="{link controller='AdEdit' object=$ad}{/link}">{$ad->adName}</a>
+						<p><small>{$ad->getLocation()}</small></p>
+					</span>
+				</li>
+			{/foreach}
+		</ol>
+		
+		<div class="formSubmit">
+			<button class="button" data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
+		</div>
+	</div>
+	
+	<div class="contentNavigation">
+		{@$pagesLinks}
+		
+		<nav>
+			<ul>
+				<li><a href="{link controller='AdAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.link.ad.add{/lang}</span></a></li>
+				
+				{event name='contentNavigationButtonsBottom'}
+			</ul>
+		</nav>
+	</div>
+{else}
+	<p class="info">{lang}wcf.global.noItems{/lang}</p>
+{/if}
+
+{include file='footer'}
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index ba133ea3da..02c4cfebc5 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -10978,6 +10978,11 @@ WCF.Condition.PageControllerDependence = Class.extend({
 		
 		this._pageControllerSelection = $('#pageControllers').change($.proxy(this._checkVisibility, this));
 		this._pageControllerContainer = this._pageControllerSelection.parents('dl:eq(0)');
+		this._fieldset = this._pageControllerContainer.parent('fieldset');
+		this._nextFieldset = this._fieldset.next('fieldset');
+		if (this._nextFieldset) {
+			this._nextFieldset.data('margin-top', this._nextFieldset.css('margin-top'));
+		}
 		
 		this._input = $('#' + inputIdentifier);
 		this._inputContainer = this._input.parents('dl:eq(0)');
@@ -11007,10 +11012,23 @@ WCF.Condition.PageControllerDependence = Class.extend({
 		if ($display) {
 			this._inputContainer.show();
 			this._input.enable();
+			this._fieldset.show();
+			
+			if (this._nextFieldset) {
+				this._nextFieldset.css('margin-top', this._nextFieldset.data('margin-top'));
+			}
 		}
 		else {
 			this._inputContainer.hide();
 			this._input.disable();
+			
+			if (!this._fieldset.children('dl:visible').length) {
+				this._fieldset.hide();
+				
+				if (this._nextFieldset) {
+					this._nextFieldset.css('margin-top', 0);
+				}
+			}
 		}
 	}
 });
diff --git a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
new file mode 100644
index 0000000000..55b84396f3
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
@@ -0,0 +1,240 @@
+<?php
+namespace wcf\acp\form;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\ad\AdAction;
+use wcf\form\AbstractForm;
+use wcf\system\ad\AdHandler;
+use wcf\system\condition\ConditionHandler;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Shows the form to create a new ad notice.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	acp.form
+ * @category	Community Framework
+ */
+class AdAddForm extends AbstractForm {
+	/**
+	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.ad.add';
+	
+	/**
+	 * html code of the ad
+	 * @var	string
+	 */
+	public $ad = '';
+	
+	/**
+	 * name of the notice
+	 * @var	string
+	 */
+	public $adName = '';
+	
+	/**
+	 * grouped ad condition object types
+	 * @var	array
+	 */
+	public $groupedConditionObjectTypes = array();
+	
+	/**
+	 * 1 if the ad is disabled
+	 * @var	integer
+	 */
+	public $isDisabled = 0;
+	
+	/**
+	 * list of available location object types
+	 * @var	array<\wcf\data\object\type\ObjectType>
+	 */
+	public $locationObjectTypes = array();
+	
+	/**
+	 * list of available locations
+	 * @var	array<string>
+	 */
+	public $locations = array();
+	
+	/**
+	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.content.ad.canManageAd');
+	
+	/**
+	 * id of the selected location's object type
+	 * @var	integer
+	 */
+	public $objectTypeID = 0;
+	
+	/**
+	 * order used to the show the ads
+	 * @var	integer
+	 */
+	public $showOrder = 0;
+	
+	/**
+	 * @see	\wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+		
+		WCF::getTPL()->assign(array(
+			'action' => 'add',
+			'ad' => $this->ad,
+			'adName' => $this->adName,
+			'locationObjectTypes' => $this->locationObjectTypes,
+			'locations' => $this->locations,
+			'isDisabled' => $this->isDisabled,
+			'groupedConditionObjectTypes' => $this->groupedConditionObjectTypes,
+			'objectTypeID' => $this->objectTypeID,
+			'showOrder' => $this->showOrder
+		));
+	}
+	
+	/**
+	 * @see	\wcf\page\IPage::readData()
+	 */
+	public function readData() {
+		$objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.condition.ad');
+		foreach ($objectTypes as $objectType) {
+			if (!$objectType->conditionobject) continue;
+			
+			if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject])) {
+				$this->groupedConditionObjectTypes[$objectType->conditionobject] = array();
+			}
+			
+			if ($objectType->conditiongroup) {
+				if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup])) {
+					$this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup] = array();
+				}
+				
+				$this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup][$objectType->objectTypeID] = $objectType;
+			}
+			else {
+				$this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->objectTypeID] = $objectType;
+			}
+		}
+		
+		$this->locations = AdHandler::getInstance()->getLocationSelection();
+		foreach (AdHandler::getInstance()->getLocationObjectTypes() as $objectType) {
+			$this->locationObjectTypes[$objectType->objectTypeID] = $objectType;
+		}
+		
+		parent::readData();
+	}
+	
+	/**
+	 * @see	\wcf\form\IForm::readFormParameters()
+	 */
+	public function readFormParameters() {
+		parent::readFormParameters();
+		
+		if (isset($_POST['ad'])) $this->ad = StringUtil::trim($_POST['ad']);
+		if (isset($_POST['adName'])) $this->adName = StringUtil::trim($_POST['adName']);
+		if (isset($_POST['isDisabled'])) $this->isDisabled = 1;
+		if (isset($_POST['objectTypeID'])) $this->objectTypeID = intval($_POST['objectTypeID']);
+		if (isset($_POST['showOrder'])) $this->showOrder = intval($_POST['showOrder']);
+		
+		foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
+			foreach ($groupedObjectTypes as $objectTypes) {
+				if (is_array($objectTypes)) {
+					foreach ($objectTypes as $objectType) {
+						$objectType->getProcessor()->readFormParameters();
+					}
+				}
+				else {
+					$objectTypes->getProcessor()->readFormParameters();
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @see	\wcf\form\IForm::save()
+	 */
+	public function save() {
+		parent::save();
+		
+		$this->objectAction = new AdAction(array(), 'create', array(
+			'data' => array(
+				'ad' => $this->ad,
+				'adName' => $this->adName,
+				'isDisabled' => $this->isDisabled,
+				'objectTypeID' => $this->objectTypeID,
+				'showOrder' => $this->showOrder
+			)
+		));
+		$returnValues = $this->objectAction->executeAction();
+		
+		// transform conditions array into one-dimensional array
+		$conditions = array();
+		foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
+			foreach ($groupedObjectTypes as $objectTypes) {
+				if (is_array($objectTypes)) {
+					$conditions = array_merge($conditions, $objectTypes);
+				}
+				else {
+					$conditions[] = $objectTypes;
+				}
+			}
+		}
+		
+		ConditionHandler::getInstance()->createConditions($returnValues['returnValues']->adID, $conditions);
+		
+		$this->saved();
+		
+		// reset values
+		$this->ad = '';
+		$this->adName = '';
+		$this->isDisabled = 0;
+		$this->objectTypeID = 0;
+		$this->showOrder = 0;
+		
+		foreach ($conditions as $condition) {
+			$condition->getProcessor()->reset();
+		}
+		
+		WCF::getTPL()->assign('success', true);
+	}
+	
+	/**
+	 * @see	\wcf\form\IForm::validate()
+	 */
+	public function validate() {
+		parent::validate();
+		
+		if (empty($this->adName)) {
+			throw new UserInputException('adName');
+		}
+		
+		if (empty($this->ad)) {
+			throw new UserInputException('ad');
+		}
+		
+		if (!$this->objectTypeID) {
+			throw new UserInputException('objectTypeID');
+		}
+		else if (!isset($this->locationObjectTypes[$this->objectTypeID])) {
+			throw new UserInputException('objectTypeID', 'noValidSelection');
+		}
+		
+		foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
+			foreach ($groupedObjectTypes as $objectTypes) {
+				if (is_array($objectTypes)) {
+					foreach ($objectTypes as $objectType) {
+						$objectType->getProcessor()->validate();
+					}
+				}
+				else {
+					$objectTypes->getProcessor()->validate();
+				}
+			}
+		}
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
new file mode 100644
index 0000000000..e686df776c
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
@@ -0,0 +1,135 @@
+<?php
+namespace wcf\acp\form;
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdAction;
+use wcf\form\AbstractForm;
+use wcf\system\condition\ConditionHandler;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\WCF;
+
+/**
+ * Shows the form to edit an ad notice.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	acp.form
+ * @category	Community Framework
+ */
+class AdEditForm extends AdAddForm {
+	/**
+	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.ad';
+	
+	/**
+	 * id of the edited ad
+	 * @var	integer
+	 */
+	public $adID = 0;
+	
+	/**
+	 * edited ad object
+	 * @var	\wcf\data\ad\Ad
+	 */
+	public $adObject = null;
+	
+	/**
+	 * @see	\wcf\page\IPage::assignVariables()
+	 */
+	public function assignVariables() {
+		parent::assignVariables();
+		
+		WCF::getTPL()->assign(array(
+			'action' => 'edit',
+			'adObject' => $this->adObject
+		));
+	}
+	
+	/**
+	 * @see	\wcf\page\IPage::readData()
+	 */
+	public function readData() {
+		parent::readData();
+		
+		if (empty($_POST)) {
+			$this->ad = $this->adObject->ad;
+			$this->adName = $this->adObject->adName;
+			$this->isDisabled = $this->adObject->isDisabled;
+			$this->objectTypeID = $this->adObject->objectTypeID;
+			$this->showOrder = $this->adObject->showOrder;
+			
+			$conditions = $this->adObject->getConditions();
+			$conditionsByObjectTypeID = array();
+			foreach ($conditions as $condition) {
+				$conditionsByObjectTypeID[$condition->objectTypeID] = $condition;
+			}
+			
+			foreach ($this->groupedConditionObjectTypes as $objectTypes1) {
+				foreach ($objectTypes1 as $objectTypes2) {
+					if (is_array($objectTypes2)) {
+						foreach ($objectTypes2 as $objectType) {
+							if (isset($conditionsByObjectTypeID[$objectType->objectTypeID])) {
+								$conditionsByObjectTypeID[$objectType->objectTypeID]->getObjectType()->getProcessor()->setData($conditionsByObjectTypeID[$objectType->objectTypeID]);
+							}
+						}
+					}
+					else if (isset($conditionsByObjectTypeID[$objectTypes2->objectTypeID])) {
+						$conditionsByObjectTypeID[$objectTypes2->objectTypeID]->getObjectType()->getProcessor()->setData($conditionsByObjectTypeID[$objectTypes2->objectTypeID]);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @see	\wcf\page\IPage::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+		
+		if (isset($_REQUEST['id'])) $this->adID = intval($_REQUEST['id']);
+		$this->adObject = new Ad($this->adID);
+		if (!$this->adObject->adID) {
+			throw new IllegalLinkException();
+		}
+	}
+	
+	/**
+	 * @see	\wcf\form\IForm::save()
+	 */
+	public function save() {
+		AbstractForm::save();
+		
+		$this->objectAction = new AdAction(array($this->adObject), 'update', array(
+			'data' => array(
+				'ad' => $this->ad,
+				'adName' => $this->adName,
+				'isDisabled' => $this->isDisabled,
+				'objectTypeID' => $this->objectTypeID,
+				'showOrder' => $this->showOrder
+			)
+		));
+		$this->objectAction->executeAction();
+		
+		// transform conditions array into one-dimensional array
+		$conditions = array();
+		foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
+			foreach ($groupedObjectTypes as $objectTypes) {
+				if (is_array($objectTypes)) {
+					$conditions = array_merge($conditions, $objectTypes);
+				}
+				else {
+					$conditions[] = $objectTypes;
+				}
+			}
+		}
+		
+		ConditionHandler::getInstance()->updateConditions($this->notice->noticeID, $this->notice->getConditions(), $conditions);
+		
+		$this->saved();
+		
+		WCF::getTPL()->assign('success', true);
+	}
+}
diff --git a/wcfsetup/install/files/lib/acp/page/AdListPage.class.php b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
new file mode 100644
index 0000000000..c93b6816c9
--- /dev/null
+++ b/wcfsetup/install/files/lib/acp/page/AdListPage.class.php
@@ -0,0 +1,30 @@
+<?php
+namespace wcf\acp\page;
+use wcf\page\MultipleLinkPage;
+
+/**
+ * Lists the available ads.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	acp.page
+ * @category	Community Framework
+ */
+class AdListPage extends MultipleLinkPage {
+	/**
+	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.ad.list';
+	
+	/**
+	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 */
+	public $neededPermissions = array('admin.content.ad.canManageAd');
+	
+	/**
+	 * @see	\wcf\page\MultipleLinkPage::$objectListClassName
+	 */
+	public $objectListClassName = 'wcf\data\ad\AdList';
+}
diff --git a/wcfsetup/install/files/lib/data/ad/Ad.class.php b/wcfsetup/install/files/lib/data/ad/Ad.class.php
new file mode 100644
index 0000000000..716f30cc52
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ad/Ad.class.php
@@ -0,0 +1,61 @@
+<?php
+namespace wcf\data\ad;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\DatabaseObject;
+use wcf\system\condition\ConditionHandler;
+use wcf\system\request\IRouteController;
+use wcf\system\WCF;
+
+/**
+ * Represents an ad.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	data.ad
+ * @category	Community Framework
+ */
+class Ad extends DatabaseObject implements IRouteController {
+	/**
+	 * @see	\wcf\data\DatabaseObject::$databaseTableIndexName
+	 */
+	protected static $databaseTableIndexName = 'adID';
+	
+	/**
+	 * @see	\wcf\data\DatabaseObject::$databaseTableName
+	 */
+	protected static $databaseTableName = 'ad';
+	
+	/**
+	 * Returns the conditions of the ad.
+	 * 
+	 * @return	array<\wcf\data\condition\Condition>
+	 */
+	public function getConditions() {
+		return ConditionHandler::getInstance()->getConditions('com.woltlab.wcf.condition.ad', $this->adID);
+	}
+	
+	/**
+	 * Returns the location of the ad.
+	 * 
+	 * @return	string
+	 */
+	public function getLocation() {
+		$objectType = ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
+		
+		$location = WCF::getLanguage()->get('wcf.acp.ad.location.'.$objectType->objectType);
+		if ($objectType->categoryname != 'com.woltlab.wcf.global') {
+			$location = WCF::getLanguage()->get('wcf.acp.ad.location.category.'.$objectType->categoryname).': '.$location;
+		}
+		
+		return $location;
+	}
+	
+	/**
+	 * @see	\wcf\data\ITitledObject::getTitle()
+	 */
+	public function getTitle() {
+		return $this->adName;
+	}
+}
diff --git a/wcfsetup/install/files/lib/data/ad/AdAction.class.php b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
new file mode 100644
index 0000000000..cac6f0483b
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
@@ -0,0 +1,119 @@
+<?php
+namespace wcf\data\ad;
+use wcf\data\AbstractDatabaseObjectAction;
+use wcf\data\ISortableAction;
+use wcf\data\IToggleAction;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
+
+/**
+ * Executes ad-related actions.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	data.ad
+ * @category	Community Framework
+ */
+class AdAction extends AbstractDatabaseObjectAction implements ISortableAction, IToggleAction {
+	/**
+	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 */
+	protected $permissionsDelete = array('admin.content.ad.canManageAd');
+	
+	/**
+	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 */
+	protected $permissionsUpdate = array('admin.content.ad.canManageAd');
+	
+	/**
+	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
+	 */
+	protected $requireACP = array('create', 'delete', 'toggle', 'update', 'updatePosition');
+	
+	/**
+	 * @see	\wcf\data\AbstractDatabaseObjectAction::create()
+	 */
+	public function create() {
+		$showOrder = 0;
+		if (isset($this->parameters['data']['showOrder'])) {
+			$showOrder = $this->parameters['data']['showOrder'];
+			unset($this->parameters['data']['showOrder']);
+		}
+		
+		$ad = parent::create();
+		$adEditor = new AdEditor($ad);
+		$adEditor->setShowOrder($showOrder);
+		
+		return new Ad($ad->adID);
+	}
+	
+	/**
+	 * @see	\wcf\data\IToggleAction::toggle()
+	 */
+	public function toggle() {
+		foreach ($this->objects as $ad) {
+			$ad->update(array(
+				'isDisabled' => $ad->isDisabled ? 0 : 1
+			));
+		}
+	}
+	
+	/**
+	 * @see	\wcf\data\IToggleAction::validateToggle()
+	 */
+	public function validateToggle() {
+		parent::validateUpdate();
+	}
+	
+	/**
+	 * @see	\wcf\data\ISortableAction::validateUpdatePosition()
+	 */
+	public function validateUpdatePosition() {
+		WCF::getSession()->checkPermissions($this->permissionsUpdate);
+		
+		if (!isset($this->parameters['data']['structure']) || !is_array($this->parameters['data']['structure'])) {
+			throw new UserInputException('structure');
+		}
+		
+		$adList = new AdList();
+		$adList->getConditionBuilder()->add('ad.adID IN (?)', array($this->parameters['data']['structure'][0]));
+		if ($adList->countObjects() != count($this->parameters['data']['structure'][0])) {
+			throw new UserInputException('structure');
+		}
+		
+		$this->readInteger('offset', true, 'data');
+	}
+	
+	/**
+	 * @see	\wcf\data\AbstractDatabaseObjectAction::update()
+	 */
+	public function update() {
+		parent::update();
+		
+		if (count($this->objects) == 1 && isset($this->parameters['data']['showOrder']) && $this->parameters['data']['showOrder'] != reset($this->objects)->showOrder) {
+			reset($this->objects)->setShowOrder($this->parameters['data']['showOrder']);
+		}
+	}
+	
+	/**
+	 * @see	\wcf\data\ISortableAction::updatePosition()
+	 */
+	public function updatePosition() {
+		$sql = "UPDATE	wcf".WCF_N."_ad
+			SET	showOrder = ?
+			WHERE	adID = ?";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		
+		$showOrder = $this->parameters['data']['offset'];
+		WCF::getDB()->beginTransaction();
+		foreach ($this->parameters['data']['structure'][0] as $adID) {
+			$statement->execute(array(
+				$showOrder++,
+				$adID
+			));
+		}
+		WCF::getDB()->commitTransaction();
+	}
+}
diff --git a/wcfsetup/install/files/lib/data/ad/AdEditor.class.php b/wcfsetup/install/files/lib/data/ad/AdEditor.class.php
new file mode 100644
index 0000000000..05ee10a013
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ad/AdEditor.class.php
@@ -0,0 +1,71 @@
+<?php
+namespace wcf\data\ad;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\DatabaseObjectEditor;
+use wcf\data\IEditableCachedObject;
+use wcf\system\cache\builder\AdCacheBuilder;
+use wcf\system\cache\builder\ConditionCacheBuilder;
+use wcf\system\WCF;
+
+/**
+ * Provides functions to edit ads.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	data.ad
+ * @category	Community Framework
+ */
+class AdEditor extends DatabaseObjectEditor implements IEditableCachedObject {
+	/**
+	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
+	 */
+	protected static $baseClass = 'wcf\data\ad\Ad';
+	
+	/**
+	 * Sets the show order of the ad.
+	 * 
+	 * @param	integer		$showOrder
+	 */
+	public function setShowOrder($showOrder = 0) {
+		$newShowOrder = 1;
+		
+		$sql = "SELECT	MAX(showOrder)
+			FROM	wcf".WCF_N."_ad";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute();
+		$maxShowOrder = $statement->fetchColumn();
+		if (!$maxShowOrder) $maxShowOrder = 0;
+		
+		if (!$showOrder || $showOrder > $maxShowOrder) {
+			$newShowOrder = $maxShowOrder + 1;
+		}
+		else {
+			// shift other ads
+			$sql = "UPDATE	wcf".WCF_N."_ad
+				SET	showOrder = showOrder + 1
+				WHERE	showOrder >= ?";
+			$statement = WCF::getDB()->prepareStatement($sql);
+			$statement->execute(array(
+				$showOrder
+			));
+			
+			$newShowOrder = $showOrder;
+		}
+		
+		$this->update(array(
+			'showOrder' => $newShowOrder
+		));
+	}
+	
+	/**
+	 * @see	\wcf\data\IEditableCachedObject::resetCache()
+	 */
+	public static function resetCache() {
+		AdCacheBuilder::getInstance()->reset();
+		ConditionCacheBuilder::getInstance()->reset(array(
+			'definitionID' => ObjectTypeCache::getInstance()->getDefinitionByName('com.woltlab.wcf.condition.ad')->definitionID
+		));
+	}
+}
diff --git a/wcfsetup/install/files/lib/data/ad/AdList.class.php b/wcfsetup/install/files/lib/data/ad/AdList.class.php
new file mode 100644
index 0000000000..fdc2a43884
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ad/AdList.class.php
@@ -0,0 +1,15 @@
+<?php
+namespace wcf\data\ad;
+use wcf\data\DatabaseObjectList;
+
+/**
+ * Represents a list of ads.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	data.ad
+ * @category	Community Framework
+ */
+class AdList extends DatabaseObjectList { }
diff --git a/wcfsetup/install/files/lib/system/ad/AdHandler.class.php b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
new file mode 100644
index 0000000000..aea2abc700
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
@@ -0,0 +1,137 @@
+<?php
+namespace wcf\system\ad;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\cache\builder\AdCacheBuilder;
+use wcf\system\exception\SystemException;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
+
+/**
+ * Handles ads.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.ads
+ * @category	Community Framework
+ */
+class AdHandler extends SingletonFactory {
+	/**
+	 * list of ad objects grouped by ad location
+	 * @var	array
+	 */
+	protected $ads = array();
+	
+	/**
+	 * list of ad location object types
+	 * @var	array<\wcf\data\object\type\ObjectType>
+	 */
+	protected $objectTypes = array();
+	
+	/**
+	 * Returns the ad output for the given ad location.
+	 * 
+	 * @param	string		$adLocation
+	 * @return	string
+	 */
+	public function getAds($adLocation) {
+		if (!isset($this->objectTypes[$adLocation])) {
+			throw new SystemException("Unknown ad location '".$adLocation."'");
+		}
+		
+		if (!isset($this->ads[$this->objectTypes[$adLocation]->objectTypeID])) {
+			return '';
+		}
+		
+		$output = '';
+		foreach ($this->ads[$this->objectTypes[$adLocation]->objectTypeID] as $ad) {
+			$conditions = $ad->getConditions();
+			foreach ($conditions as $condition) {
+				if (!$condition->getObjectType()->getProcessor()->showContent($condition)) {
+					continue 2;
+				}
+			}
+			
+			$output .= $ad->ad;
+		}
+		
+		return $output;
+	}
+	
+	/**
+	 * Returns all available ad location object types.
+	 * 
+	 * @return	array<\wcf\data\object\type\ObjectType>
+	 */
+	public function getLocationObjectTypes($categoryName = null) {
+		if ($categoryName === null) {
+			return $this->objectTypes;
+		}
+		
+		$objectTypes = array();
+		foreach ($this->objectTypes as $key => $objectType) {
+			if ($objectType->categoryname == $categoryName) {
+				$objectTypes[$key] = $objectType;
+			}
+		}
+		
+		return $objectType;
+	}
+	
+	/**
+	 * Returns the list of available locations used to be used for selections.
+	 * 
+	 * @return	array<string>
+	 */
+	public function getLocationSelection() {
+		$objectTypes = $this->objectTypes;
+		
+		// filter by options
+		foreach ($objectTypes as $objectTypeName => $objectType) {
+			if ($objectType->options) {
+				$options = explode(',', strtoupper($objectType->options));
+				foreach ($options as $option) {
+					if (!defined($option) || !constant($option)) {
+						unset($objectTypes[$objectTypeName]);
+						break;
+					}
+				}
+			}
+		}
+		
+		$selection = array();
+		foreach ($objectTypes as $objectType) {
+			$categoryName = WCF::getLanguage()->get('wcf.acp.ad.location.category.'.$objectType->categoryname);
+			if (!isset($selection[$categoryName])) {
+				$selection[$categoryName] = array();
+			}
+			
+			$selection[$categoryName][$objectType->objectTypeID] = WCF::getLanguage()->get('wcf.acp.ad.location.'.$objectType->objectType);
+		}
+		
+		foreach ($selection as &$subSelection) {
+			asort($subSelection);
+		}
+		
+		$globalCategory = WCF::getLanguage()->get('wcf.acp.ad.location.category.com.woltlab.wcf.global');
+		$globalLocations = $selection[$globalCategory];
+		unset($selection[$globalCategory]);
+		
+		ksort($selection);
+		
+		$selection = array_merge(array(
+			$globalCategory => $globalLocations
+		), $selection);
+		
+		return $selection;
+	}
+	
+	/**
+	 * @see	\wcf\system\SingletonFactory::init()
+	 */
+	protected function init() {
+		$this->ads = AdCacheBuilder::getInstance()->getData();
+		$this->objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.adLocation');
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/cache/builder/AdCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/AdCacheBuilder.class.php
new file mode 100644
index 0000000000..031fd6655f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/cache/builder/AdCacheBuilder.class.php
@@ -0,0 +1,36 @@
+<?php
+namespace wcf\system\cache\builder;
+use wcf\data\ad\AdList;
+
+/**
+ * Caches the enabled ads.
+ * 
+ * @author	Matthias Schmidt
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.cache.builder
+ * @category	Community Framework
+ */
+class AdCacheBuilder extends AbstractCacheBuilder {
+	/**
+	 * @see	\wcf\system\cache\builder\AbstractCacheBuilder::rebuild()
+	 */
+	public function rebuild(array $parameters) {
+		$adList = new AdList();
+		$adList->getConditionBuilder()->add('isDisabled = ?', array(0));
+		$adList->sqlOrderBy = 'showOrder ASC';
+		$adList->readObjects();
+		
+		$data = array();
+		foreach ($adList as $ad) {
+			if (!isset($data[$ad->objectTypeID])) {
+				$data[$ad->objectTypeID] = array();
+			}
+			
+			$data[$ad->objectTypeID][$ad->adID] = $ad;
+		}
+		
+		return $data;
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/condition/MultiPageControllerCondition.class.php b/wcfsetup/install/files/lib/system/condition/MultiPageControllerCondition.class.php
index e0df15ddb6..cd83919574 100644
--- a/wcfsetup/install/files/lib/system/condition/MultiPageControllerCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/MultiPageControllerCondition.class.php
@@ -4,6 +4,7 @@ use wcf\data\condition\Condition;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\system\page\PageManager;
 use wcf\system\request\RequestHandler;
+use wcf\system\WCF;
 
 /**
  * Condition implementation for selecting multiple page controllers.
@@ -31,6 +32,21 @@ class MultiPageControllerCondition extends AbstractMultiSelectCondition implemen
 	 */
 	protected $label = 'wcf.page.requestedPage';
 	
+	/**
+	 * @see	\wcf\system\condition\AbstractSingleFieldCondition::getFieldElement()
+	 */
+	protected function getFieldElement() {
+		$options = $this->getOptions();
+		
+		$fieldElement = '<select name="'.$this->fieldName.'[]" id="'.$this->fieldName.'" multiple="multiple" size="'.(count($options) > 10 ? 10 : count($options)).'">';
+		foreach ($options as $value => $label) {
+			$fieldElement .= '<option value="'.$value.'" data-object-type="'.ObjectTypeCache::getInstance()->getObjectType($value)->objectType.'"'.(in_array($value, $this->fieldValue) ? ' selected="selected"' : '').'>'.WCF::getLanguage()->get($label).'</option>';
+		}
+		$fieldElement .= "</select>";
+		
+		return $fieldElement;
+	}
+	
 	/**
 	 * @see	\wcf\system\condition\AbstractSelectCondition::getOptions()
 	 */
diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
index 321593f817..c401ca1333 100644
--- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
@@ -21,7 +21,7 @@ class TimeCondition extends AbstractMultipleFieldsCondition implements IContentC
 	 * end time
 	 * @var	string
 	 */
-	protected $endTime = '';
+	protected $endTime = '00:00';
 	
 	/**
 	 * @see	\wcf\system\condition\AbstractMultipleFieldsCondition::$label
@@ -35,7 +35,7 @@ class TimeCondition extends AbstractMultipleFieldsCondition implements IContentC
 	 * start time
 	 * @var	string
 	 */
-	protected $startTime = '';
+	protected $startTime = '00:00';
 
 	/**
 	 * timezone used to evaluate the start/end time
@@ -118,8 +118,8 @@ HTML;
 	 * @see	\wcf\system\condition\ICondition::reset()
 	 */
 	public function reset() {
-		$this->endTime = '';
-		$this->startTime = '';
+		$this->endTime = '00:00';
+		$this->startTime = '00:00';
 		$this->timezone = 0;
 	}
 	
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 9473ed7797..f216d03e45 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -15,6 +15,34 @@
 		<item name="wcf.acl.option.com.woltlab.wcf.label.canSetLabel"><![CDATA[Kann Labels setzen]]></item>
 	</category>
 	
+	<category name="wcf.acp.ad">
+		<item name="wcf.acp.ad.ad"><![CDATA[Werbung]]></item>
+		<item name="wcf.acp.ad.ad.description"><![CDATA[HTML-Code der Werbung]]></item>
+		<item name="wcf.acp.ad.add"><![CDATA[Werbung hinzufügen]]></item>
+		<item name="wcf.acp.ad.conditions"><![CDATA[Bedingungen]]></item>
+		<item name="wcf.acp.ad.conditions.description"><![CDATA[Werden keine Bedingungen ausgewählt, wird die für jeden Benutzer angezeigt.]]></item>
+		<item name="wcf.acp.ad.conditions.page"><![CDATA[Seite]]></item>
+		<item name="wcf.acp.ad.conditions.page.description"><![CDATA[Die vom Benutzer aufgerufene Seite muss folgende Bedingungen erfüllen, damit die Werbung angezeigt wird.]]></item>
+		<item name="wcf.acp.ad.conditions.pointInTime"><![CDATA[Zeitpunkt]]></item>
+		<item name="wcf.acp.ad.conditions.pointInTime.description"><![CDATA[Legen Sie den Zeitpunkt fest, zu dem die Werbung angezeigt werden soll.]]></item>
+		<item name="wcf.acp.ad.conditions.user"><![CDATA[Aktiver Benutzer]]></item>
+		<item name="wcf.acp.ad.conditions.user.description"><![CDATA[Der aktive Benutzer muss die folgenden Bedingungen erfüllen, damit die Werbung angezeigt wird.]]></item>
+		<item name="wcf.acp.ad.delete.confirmMessage"><![CDATA[Wollen Sie diese Werbung wirklich löschen?]]></item>
+		<item name="wcf.acp.ad.edit"><![CDATA[Werbung bearbeiten]]></item>
+		<item name="wcf.acp.ad.isDisabled"><![CDATA[Werbung deaktivieren]]></item>
+		<item name="wcf.acp.ad.list"><![CDATA[Werbung]]></item>
+		<item name="wcf.acp.ad.location"><![CDATA[Position]]></item>
+		<item name="wcf.acp.ad.location.category.com.woltlab.wcf.global"><![CDATA[global]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.logo"><![CDATA[Logo]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.header.content"><![CDATA[Inhaltsbereich (oben)]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.footer.content"><![CDATA[Inhaltsbereich (unten)]]></item>
+		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.top"><![CDATA[Sidebar (oben)]]></item>
+		<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"><![CDATA[Reihenfolge]]></item>
+		<item name="wcf.acp.ad.showOrder.description"><![CDATA[Legt die Reihenfolge fest, in der die Werbung angezeigt werden.]]></item>
+	</category>
+	
 	<category name="wcf.acp.application">
 		<item name="wcf.acp.application.cookie"><![CDATA[Cookie-Einstellungen]]></item>
 		<item name="wcf.acp.application.cookie.warning"><![CDATA[Die folgenden Einstellungen stellen sicher, dass der Login gespeichert wird und ein automatischer Login möglich ist. Sie müssen diese Einstellungen anpassen, sollte sich die Domain geändert haben. Sollten Sie sich bei dem korrekten Wert nicht sicher sein, übernehmen Sie bitte die exakte Angabe im Feld „Domain“.]]></item>
@@ -388,6 +416,8 @@
 		<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.user.profile.aboutMeMaxLength"><![CDATA[Maximallänge „Über mich“]]></item>
 		<item name="wcf.acp.group.option.user.profile.canReportContent"><![CDATA[Kann Inhalte melden]]></item>
 	</category>
@@ -585,6 +615,9 @@
 		<item name="wcf.acp.menu.link.notice"><![CDATA[Hinweise]]></item>
 		<item name="wcf.acp.menu.link.notice.add"><![CDATA[Hinweis hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.notice.list"><![CDATA[Hinweise auflisten]]></item>
+		<item name="wcf.acp.menu.link.ad"><![CDATA[Werbung]]></item>
+		<item name="wcf.acp.menu.link.ad.add"><![CDATA[Werbung hinzufügen]]></item>
+		<item name="wcf.acp.menu.link.ad.list"><![CDATA[Werbung auflisten]]></item>
 	</category>
 	
 	<category name="wcf.acp.notice">
@@ -933,6 +966,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.module_cookie_policy_page.description"><![CDATA[Weist Besucher beim ersten Aufruf der Seite gemäß EU-Richtlinie 2009/136/EG auf den Einsatz von Cookies hin.]]></item>
 		<item name="wcf.acp.option.url_omit_index_php"><![CDATA[„index.php“ aus URLs entfernen]]></item>
 		<item name="wcf.acp.option.url_omit_index_php.description"><![CDATA[TODO]]></item>
+		<item name="wcf.acp.option.module_ad"><![CDATA[Werbung]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 4679694f8b..05569c1a72 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -111,6 +111,16 @@ CREATE TABLE wcf1_acp_template (
 	UNIQUE KEY applicationTemplate (application, templateName)
 );
 
+DROP TABLE IF EXISTS wcf1_ad;
+CREATE TABLE wcf1_ad (
+	adID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	objectTypeID INT(10) NOT NULL,
+	adName VARCHAR(255) NOT NULL,
+	ad MEDIUMTEXT,
+	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
+	showOrder INT(10) NOT NULL DEFAULT 0
+);
+
 DROP TABLE IF EXISTS wcf1_application;
 CREATE TABLE wcf1_application (
 	packageID INT(10) NOT NULL PRIMARY KEY,
@@ -1373,6 +1383,8 @@ ALTER TABLE wcf1_acp_session_log ADD FOREIGN KEY (userID) REFERENCES wcf1_user (
 
 ALTER TABLE wcf1_acp_template ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
 
+ALTER TABLE wcf1_ad ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
+
 ALTER TABLE wcf1_application ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
 
 ALTER TABLE wcf1_attachment ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
-- 
2.20.1