Forced-Ads are never locked, instead lock campaigns

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index 0694e013d046db42b8d6e158eaad81d71db43926..eb0346768c4ee0f954f4d30d520cb01800c293ee 100644 (file)
--- 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_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');
 
 PRIMARY KEY (`forced_ads_id`)",
                        'Forced Ads Data');
 

diff --git a/inc/language/forced_de.php b/inc/language/forced_de.php
index ffda5a044751168ca3ee7e89b43772d5c9a31752..14660737fe6d1ef4c030e3cd7b8627f6fea2e8d4 100644 (file)
--- 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ügt?",
        'ADMIN_FORCED_ADS_CLICKS_COUNTER' => "Anzahl Forced-Klicks",
        'ADMIN_FORCED_ADS_HAS_FRAMEBREAKER' => "Framekiller?",
        'ADMIN_FORCED_ADS_ADDED' => "Hinzugefügt?",

-       'ADMIN_FORCED_ADS_LAST_LOCKED' => "Zuletzt gesperrt",
-       'ADMIN_FORCED_ADS_LOCK_REASON' => "Sperrgrund",

 ));
 
 // [EOF]
 ));
 
 // [EOF]

diff --git a/templates/de/html/admin/admin_list_forced_ads.tpl b/templates/de/html/admin/admin_list_forced_ads.tpl
index b6fc2585c2b57eb9f63422866e4064f2538357c3..18ab74f76d5b73e5756d7245072d68e268063a3f 100644 (file)
--- 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>
 <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>
                <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_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>
 </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="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>
                <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 a9fd1e38ad24f480cf60a8f6d4f4b312bc2f2e83..2d37488b668762cfb83a388b767e362322d8eb76 100644 (file)
--- 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%}">
                {%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%}">
        <td align="center" class="bottom {%template,ColorSwitch%}">

-               {%pipe,fixEmptyContentToDashes=$content[forced_ads_lock_reason]%}
+               $content[forced_ads_added]

        </td>
 </tr>
        </td>
 </tr>

diff --git a/templates/xml/admin/admin_list_forced_ads.xml b/templates/xml/admin/admin_list_forced_ads.xml
index 04d4d9b445a307bb399b8593ea30d6dbd5debd8d..7c70620088fad0ae158a150c0af0925e4cba4f28 100644 (file)
--- 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_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.
                </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>
                                <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>
        </column-callback-list>
 </admin-list-data>