Extension ext-network does now show if a network requires the webmaster to send a...

- Some advertiser networks require you to send them a copy of an ID card or
  business registration. They are now marked so.
- Some more lowercase UTF-8 converted to uppercase
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 8d3c261673246d0dc74aa1c2988c276661d6af47..2be3c4f0dcc4d1bd599313d727ef113fcad77a79 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -23,17 +23,18 @@
 ./inc/extensions/ext-network.php:25: * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
 ./inc/extensions/ext-network.php:26: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
 ./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response               *
-./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:30: * @TODO VIPads: HTML text is send encoded with BASE64                  *
-./inc/extensions/ext-network.php:31: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
-./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
-./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Layer not correct                         *
-./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
-./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
-./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:37: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:91:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-network.php:28: * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
+./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner?                      *
+./inc/extensions/ext-network.php:31: * @TODO VIPads: HTML text is send encoded with BASE64                  *
+./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
+./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
+./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct                         *
+./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
+./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
+./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
+./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
 ./inc/extensions/ext-order.php:336:            // @TODO This should be moved out to inc/daily/
 ./inc/extensions/ext-rallye.php:329:           // @TODO Move this code into rallye_functions.php

diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php
index bd8afaa4c14070b48a6d8ef19b4e944d2bf55d26..deead7a895f5fddcc644c68d83e4716dab2de76b 100644 (file)
--- a/DOCS/tpl-validator.php
+++ b/DOCS/tpl-validator.php
@@ -50,7 +50,7 @@ print "Validating template ".$_SERVER['argv'][1]."...\n";
 $doc = new DOMDocument();
 $doc->formatOutput = true;
 $doc->preserveWhiteSpace = false;
-$doc->encoding = 'utf-8';
+$doc->encoding = 'UTF-8';
 $doc->xmlVersion = '1.1';
 $doc->loadHTMLFile($_SERVER['argv'][1]);
 

diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php
index 988b3d2915dd3490305e464b4311846b0c647aa1..78c7e95fbbd267e132e9a4d5745f6161b6b44615 100644 (file)
--- a/inc/classes/rdf.class.php
+++ b/inc/classes/rdf.class.php
@@ -799,7 +799,7 @@ class fase4_rdf {
                        case 'textinput':
                                if(isset($this->_display_opt['textinput']) && ($this->_display_opt['textinput'] != 'hidden') && $this->_item['name'] && $this->_item['link']) {
                                        $this->_output .= "<tr><td class=\"fase4_rdf\">\n";
-                                       $this->_output .= "<form accept-charset=\"utf-8\" action=\"".$this->_item['link']."\" ";
+                                       $this->_output .= "<form accept-charset=\"UTF-8\" action=\"".$this->_item['link']."\" ";
                                        if(isset($this->_link_target)) { $this->_output .= "target=\"".$this->_link_target."\" "; }
                                        $this->_output .= "method=\"get\">\n";
                                        $this->_output .= "<div class=\"fase4_rdf_title\">".$this->_item['title']."</div>";

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 3493239ca65b08e0de4782feb9d9f70d2cb36c9f..964463054d1c5d19382dffeccbf42ee1e08062a0 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -25,6 +25,7 @@
  * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
  * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
  * @TODO Fusion-Ads: Has click/banner URL in API response               *
+ * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
  * @TODO GolloX: Which charset?                                         *
  * @TODO paid4ad: Which URLs for click and banner?                      *
  * @TODO VIPads: HTML text is send encoded with BASE64                  *
@@ -83,6 +84,7 @@ switch (getExtensionMode()) {
 `network_row_seperator` CHAR(4) NOT NULL DEFAULT '|',
 `network_request_type` ENUM('GET','POST') NOT NULL DEFAULT 'GET',
 `network_charset` VARCHAR(20) NOT NULL DEFAULT 'UTF-8',
+`network_require_id_card` ENUM('Y','N') NOT NULL DEFAULT 'N',
 UNIQUE (`network_short_name`),
 PRIMARY KEY (`network_id`)
 ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Network data'");
@@ -268,37 +270,37 @@ PRIMARY KEY (`network_reload_id`)
 ('REQUEST_PARAMETER_INCOMPLETE')");
 
                // Sponsor networks
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES
-('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252'),
-('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252'),
-('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1'),
-('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252'),
-('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1'),
-('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252'),
-('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252'),
-('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252'),
-('affiliblatt', 'Affiliblatt', 'http://www.Affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8'),
-('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1'),
-('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16'),
-('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252'),
-('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1'),
-('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252'),
-('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252'),
-('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1'),
-('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252'),
-('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252'),
-('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252'),
-('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252'),
-('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252'),
-('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252'),
-('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252'),
-('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252'),
-('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252'),
-('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1'),
-('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1'),
-('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252'),
-('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1'),
-('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`,`network_require_id_card`) VALUES
+('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'WINDOWS-1252','Y'),
+('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1','N'),
+('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1','N'),
+('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('affiliblatt', 'Affiliblatt', 'http://www.Affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8','N'),
+('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1','N'),
+('alster', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16','N'),
+('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1','N'),
+('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('hpsonsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1','N'),
+('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('swizerland', 'The-Swizerland-Ad-Network', 'http://www.the-switzerland-ad-network.ch?ref=3', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('werbepartnercc', 'Der Werbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1','Y'),
+('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1','N'),
+('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252','N'),
+('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1','N'),
+('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252','N')");
 
                // Network type handlers - A3H
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index 8632957e684313063bd0ba50dcdd271c30c75d73..e2a87575cf55fdc0568c7bec8ab60ac80f8296da 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -122,13 +122,14 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden <span class=\"data\">%s</span> API-Parameter gel&ouml;scht.",
        // - Form notes
        'ADMIN_NETWORK_ADD_NOTE' => "Mehr Datenschutz bei POST-Abfragen bedeutet, dass die von den Internetanbietern betriebenen Caches (Proxy) die POST-Daten nicht mitloggen (so eine Art Kodex). Der Zeichensatz ist meistens ISO-8859-1 oder WINDOWS-1252.",
-       'ADMIN_NETWORK_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Allgemeine Daten sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten.",
+       'ADMIN_NETWORK_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren vonallgemeinen Daten der Werbenetzwerke sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten.",
        'ADMIN_NETWORK_TYPES_ADD_NOTE' => "F&uuml;gen Sie hier weitere Werbearten dem ausgw&auml;hlten Werbenetzwerk hinzu. Die Klick- und Banner-URL m&uuml;ssen dabei Platzhalter enthalten, die Sie der Dokumentation und <a href=\"http://forum.mxchange.org/forum-43.html\" rel=\"external\" title=\"Direkt-Link zur Forumkategorie Werbenetzwerke\" target=\"_blank\">dem Forum</a> entnehmen k&ouml;nnen. Die API-URL muss nur bis zum Fragezeichen eingegeben werden. Richtig: <strong>http://www.some-sponsor.invalid/inteface/script.php</strong>, falsch: <strike>http://www.some-sponsor.invalid/inteface/script.php?uid=123&amp;pw=xyzxyzxyz</strike>",
        'ADMIN_NETWORK_TYPES_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Platzhaltern (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_ADD_NOTE' => "F&uuml;gen Sie hier weitere API-Parameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei API-Parameter den GET- bzw. POST-Parameternamen an.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von API-Parameter sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Abfragenamen (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
        'ADMIN_NETWORK_API_TRANSLATION_ADD_NOTE' => "F&uuml;gen Sie hier weitere Array-Element-&Uuml;bersetzungen zu dem ausgew&auml;hlten Netzwerk und Werbeart-Handler ein.",
        'ADMIN_NETWORK_API_TRANSLATION_LIST_NOTE' => "Seien Sie mit dem Editieren bzw. L&ouml;schen von Array-Elementen sehr vorsichtig, die API-Abfrage k&ouml;ntte unerwartete Ergebnisse bzw. Fehler zur&uuml;ckliefern.",
+       'ADMIN_NETWORK_REQUIRES_ID_NOTICE' => "Unter <strong>{--ADMIN_NETWORK_REQUIRES_ID--}</strong> ist das durch den Webnetzwerkbetreiber Verlangen einerPersonalausweiskopie bzw. Gerwerbescheins zu verstehen. Mehr dazu erfahen Sie <a href=\"http://forum.mxchange.org/topic-499.html\" rel=\"external\" target=\"_blank\">im Forum</a>.",
        // - Other messages
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die API-Parameter des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        'ADMIN_NETWORK_API_TRANSLATION_LIST_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-&Uuml;bersetzungen des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
@@ -173,6 +174,7 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_TYPE_GET' => "GET (meistens richtig)",
        'ADMIN_NETWORK_REQUEST_TYPE_POST' => "POST (mehr Datenschutz)",
        'ADMIN_NETWORK_CHARSET' => "Zeichensatz",
+       'ADMIN_NETWORK_REQUIRES_ID' => "ID verlangt?",
        'ADMIN_NETWORK_SEPERATOR' => "Trennzeichen",
        'ADMIN_NETWORK_DATA_SEPERATOR2' => "Daten",
        'ADMIN_NETWORK_ROW_SEPERATOR2' => "Zeilen",

diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
index 3b533b0774fb57f925945542510307fc31ddc967..ef72b032d50d1f2794d6ce308e4d7a05483c0b63 100644 (file)
--- a/inc/modules/admin/what-list_networks.php
+++ b/inc/modules/admin/what-list_networks.php
@@ -63,7 +63,15 @@ if ($GLOBALS['network_display'] === false) {
 
 // Query for networks
 $result = SQL_QUERY('SELECT
-       `network_id`, `network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`
+       `network_id`,
+       `network_short_name`,
+       `network_title`,
+       `network_reflink`,
+       `network_data_seperator`,
+       `network_row_seperator`,
+       `network_request_type`,
+       `network_charset`,
+       `network_requires_id`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY

diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl
index 6608efa4d90a32411b06a820b6947be2404889a9..bc82733d4aa681e255d4c1885535884394601dd3 100644 (file)
--- a/templates/de/html/admin/admin_list_networks.tpl
+++ b/templates/de/html/admin/admin_list_networks.tpl
@@ -6,7 +6,7 @@
                <td colspan="2" class="header_column bottom right" align="center">
                        <strong>{--ADMIN_NETWORK_SEPERATOR--}</strong>
                </td>
-               <td colspan="2" class="header_column bottom seperator">&nbsp;</td>
+               <td colspan="3" class="header_column bottom seperator">&nbsp;</td>
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
@@ -15,11 +15,12 @@
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_DATA_SEPERATOR2--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_ROW_SEPERATOR2--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_TYPE--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_CHARSET--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_CHARSET--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUIRES_ID--}</strong></td>
        </tr>
        $content
        <tr>
-               <td colspan="7" class="table_footer">
+               <td colspan="8" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                        <input type="submit" class="form_submit" name="edit" value="{--ADMIN_NETWORK_EDIT--}" />
                        <input type="submit" class="form_delete" name="delete" value="{--ADMIN_NETWORK_DELETE--}" />
@@ -31,4 +32,8 @@
 <div class="notice">
        {--ADMIN_NETWORK_LIST_NOTE--}
 </div>
+
+<div class="notice">
+       {--ADMIN_NETWORK_REQUIRES_ID_NOTICE--}
+</div>
 </div>

diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl
index 718887e4d5f5c6d649ba5088eacd33a555e503c3..3fc9771fb7daf23a63a40757355501f9e6eac3f3 100644 (file)
--- a/templates/de/html/admin/admin_list_networks_row.tpl
+++ b/templates/de/html/admin/admin_list_networks_row.tpl
@@ -22,7 +22,10 @@
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                $content[network_request_type]
        </td>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
                $content[network_charset]
        </td>
+       <td class="{%template,ColorSwitch%} bottom" align="center">
+               {%pipe,translateYesNo=$content[network_requires_id]%}
+       </td>
 </tr>