From cc5fcb5c6db358d2b41f3a4477d0d4303fdd859f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 28 Jul 2011 05:01:15 +0000
Subject: [PATCH] Forced-Ads are never locked, instead lock campaigns

---
 inc/extensions/ext-forced.php                         |  2 --
 inc/language/forced_de.php                            |  2 --
 templates/de/html/admin/admin_list_forced_ads.tpl     |  7 ++-----
 templates/de/html/admin/admin_list_forced_ads_row.tpl |  8 +-------
 templates/xml/admin/admin_list_forced_ads.xml         | 11 -----------
 5 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index 0694e013d0..eb0346768c 100644
--- a/inc/extensions/ext-forced.php
+++ b/inc/extensions/ext-forced.php
@@ -68,8 +68,6 @@ switch (getExtensionMode()) {
 `forced_ads_reload_lock` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `forced_ads_min_stay` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `forced_ads_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-`forced_ads_last_locked` TIMESTAMP NULL DEFAULT NULL,
-`forced_ads_lock_reason` TINYTEXT,
 PRIMARY KEY (`forced_ads_id`)",
 			'Forced Ads Data');
 
diff --git a/inc/language/forced_de.php b/inc/language/forced_de.php
index ffda5a0447..14660737fe 100644
--- a/inc/language/forced_de.php
+++ b/inc/language/forced_de.php
@@ -66,8 +66,6 @@ addMessages(array(
 	'ADMIN_FORCED_ADS_CLICKS_COUNTER' => "Anzahl Forced-Klicks",
 	'ADMIN_FORCED_ADS_HAS_FRAMEBREAKER' => "Framekiller?",
 	'ADMIN_FORCED_ADS_ADDED' => "Hinzugef&uuml;gt?",
-	'ADMIN_FORCED_ADS_LAST_LOCKED' => "Zuletzt gesperrt",
-	'ADMIN_FORCED_ADS_LOCK_REASON' => "Sperrgrund",
 ));
 
 // [EOF]
diff --git a/templates/de/html/admin/admin_list_forced_ads.tpl b/templates/de/html/admin/admin_list_forced_ads.tpl
index b6fc2585c2..18ab74f76d 100644
--- a/templates/de/html/admin/admin_list_forced_ads.tpl
+++ b/templates/de/html/admin/admin_list_forced_ads.tpl
@@ -2,7 +2,7 @@
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
-	<td align="center" colspan="7" class="table_header">
+	<td align="center" colspan="5" class="table_header">
 		<strong>{--ADMIN_LIST_FORCED_ADS_TITLE--}</strong>
 	</td>
 </tr>
@@ -12,15 +12,12 @@
 	<td class="header_column bottom right" align="center"><strong>{--ADMIN_FORCED_ADS_TYPE--}</strong></td>
 	<td class="header_column bottom right" align="center"><strong>{--ADMIN_FORCED_ADS_HAS_FRAMEBREAKER--}</strong></td>
 	<td class="header_column bottom right" align="center"><strong>{--ADMIN_FORCED_ADS_ADDED--}</strong></td>
-	<td class="header_column bottom right" align="center"><strong>{--ADMIN_FORCED_ADS_LAST_LOCKED--}</strong></td>
-	<td class="header_column bottom" align="center"><strong>{--ADMIN_FORCED_ADS_LOCK_REASON--}</strong></td>
 </tr>
 $content
 <tr>
-	<td class="table_footer" colspan="7">
+	<td class="table_footer" colspan="5">
 		<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
 		<input type="submit" class="form_submit" name="edit" value="{--ADMIN_ACTION_EDIT_SUBMIT--}" />
-		<input type="submit" class="form_delete" name="lock" value="{--ADMIN_ACTION_LOCK_SUBMIT--}" />
 		<input type="submit" class="form_delete" name="delete" value="{--ADMIN_ACTION_DELETE_SUBMIT--}" />
 	</td>
 </tr>
diff --git a/templates/de/html/admin/admin_list_forced_ads_row.tpl b/templates/de/html/admin/admin_list_forced_ads_row.tpl
index a9fd1e38ad..2d37488b66 100644
--- a/templates/de/html/admin/admin_list_forced_ads_row.tpl
+++ b/templates/de/html/admin/admin_list_forced_ads_row.tpl
@@ -11,13 +11,7 @@
 	<td align="center" class="bottom right {%template,ColorSwitch%}">
 		{%pipe,translateYesNo=$content[forced_ads_framebreaker]%}
 	</td>
-	<td align="center" class="bottom right {%template,ColorSwitch%}">
-		$content[forced_ads_added]
-	</td>
-	<td align="center" class="bottom right {%template,ColorSwitch%}">
-		$content[forced_ads_last_locked]
-	</td>
 	<td align="center" class="bottom {%template,ColorSwitch%}">
-		{%pipe,fixEmptyContentToDashes=$content[forced_ads_lock_reason]%}
+		$content[forced_ads_added]
 	</td>
 </tr>
diff --git a/templates/xml/admin/admin_list_forced_ads.xml b/templates/xml/admin/admin_list_forced_ads.xml
index 04d4d9b445..7c70620088 100644
--- a/templates/xml/admin/admin_list_forced_ads.xml
+++ b/templates/xml/admin/admin_list_forced_ads.xml
@@ -69,8 +69,6 @@ MA  02110-1301  USA
 			<select-data-from-list-entry type="string" table="" value="forced_ads_type" alias="" function="" />
 			<select-data-from-list-entry type="string" table="" value="forced_ads_framebreaker" alias="" function="" />
 			<select-data-from-list-entry type="string" table="" value="forced_ads_added" alias="forced_ads_added" function="UNIX_TIMESTAMP" />
-			<select-data-from-list-entry type="string" table="" value="forced_ads_last_locked" alias="forced_ads_last_locked" function="UNIX_TIMESTAMP" />
-			<select-data-from-list-entry type="string" table="" value="forced_ads_lock_reason" alias="" function="" />
 		</select-data-from-list>
 		<!--
 		And the column list to perform the WHERE statement on.
@@ -115,14 +113,5 @@ MA  02110-1301  USA
 				<callback-extra-parameter-list-entry type="int" column="forced_ads_added" value="2" />
 			</callback-extra-parameter-list>
 		</column-callback-list-entry>
-		<!--
-		Second column to "translate".
-		//-->
-		<column-callback-list-entry>
-			<column-callback-data type="string" value="forced_ads_last_locked" callback="generateDateTime" />
-			<callback-extra-parameter-list>
-				<callback-extra-parameter-list-entry type="int" column="forced_ads_last_locked" value="2" />
-			</callback-extra-parameter-list>
-		</column-callback-list-entry>
 	</column-callback-list>
 </admin-list-data>
-- 
2.39.2