Extension ext-network continued/fixed:

- Advertising network 'allads4you' updated: allowed countries and minimum stay
  now is for all advertising types
- New api array translation "allowed_countries" added
- SQL fixed in ext-network
- Language ids renamed to match with database column

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 14a18b8d6fae64a4b2a9c1044e31facd2cadb262..a2cdddfefe547b3e0772ce1c9fb3e3dd44d4a061 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -114,7 +114,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_handle`)",
 `request_param_default` VARCHAR(255) NULL DEFAULT NULL,
 PRIMARY KEY (`network_param_id`),
 UNIQUE INDEX `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
-UNIQUE INDEX `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),",
+UNIQUE INDEX `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`)",
                        'Request parameters for GET/POST request');
 
                // Error status codes
@@ -255,7 +255,8 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 ('textlink5'),
 ('subject'),
 ('click_url'),
-('media_url')");
+('media_url'),
+('allowed_countries')");
 
                // Insert error code types
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES
@@ -3321,54 +3322,72 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (10, 167, 4, 3),
 (10, 167, 5, 4),
 (10, 167, 6, 5),
+(10, 167, 10, 6),
+(10, 167, 40, 7),
 (10, 168, 1, 1),
 (10, 168, 2, 2),
 (10, 168, 4, 3),
 (10, 168, 5, 4),
 (10, 168, 6, 5),
+(10, 168, 10, 6),
+(10, 168, 40, 7),
 (10, 169, 1, 1),
 (10, 169, 2, 2),
 (10, 169, 4, 3),
 (10, 169, 5, 4),
 (10, 169, 6, 5),
+(10, 169, 10, 6),
+(10, 169, 40, 7),
 (10, 170, 1, 1),
 (10, 170, 2, 2),
 (10, 170, 4, 3),
 (10, 170, 5, 4),
 (10, 170, 6, 5),
+(10, 170, 10, 6),
+(10, 170, 40, 7),
 (10, 171, 1, 1),
 (10, 171, 2, 2),
 (10, 171, 4, 3),
 (10, 171, 5, 4),
 (10, 171, 6, 5),
+(10, 171, 10, 6),
+(10, 171, 40, 7),
 (10, 172, 1, 1),
 (10, 172, 2, 2),
 (10, 172, 4, 3),
 (10, 172, 5, 4),
 (10, 172, 6, 5),
+(10, 172, 10, 6),
+(10, 172, 40, 7),
 (10, 173, 1, 1),
 (10, 173, 2, 2),
 (10, 173, 4, 3),
 (10, 173, 5, 4),
 (10, 173, 6, 5),
+(10, 173, 10, 6),
+(10, 173, 40, 7),
 (10, 174, 1, 1),
 (10, 174, 2, 2),
 (10, 174, 4, 3),
 (10, 174, 5, 4),
 (10, 174, 6, 5),
+(10, 174, 10, 6),
+(10, 174, 40, 7),
 (10, 175, 1, 1),
 (10, 175, 2, 2),
 (10, 175, 4, 3),
 (10, 175, 5, 4),
 (10, 175, 6, 5),
 (10, 175, 10, 6),
+(10, 175, 40, 7),
 (10, 176, 1, 1),
 (10, 176, 2, 2),
 (10, 176, 4, 3),
 (10, 176, 5, 4),
 (10, 176, 6, 5),
 (10, 176, 10, 6),
-(10, 176, 9, 7)");
+(10, 176, 9, 7),
+(10, 176, 40, 8)");
 
                // API array elements - Alster-Marketing
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index b821b31c7ef4897e488f9c981b2c9933a868a0b8..089a0d62a13d7b040ba688c03f9d0c1b3c8ce5cc 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -121,7 +121,7 @@ addMessages(array(
        '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>.",
+       'ADMIN_NETWORK_REQUIRE_ID_CARD_NOTICE' => "Unter <strong>{--ADMIN_NETWORK_REQUIRE_ID_CARD--}</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.",
@@ -166,7 +166,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_REQUIRE_ID_CARD' => "ID verlangt?",
        'ADMIN_NETWORK_SEPERATOR' => "Trennzeichen",
        'ADMIN_NETWORK_DATA_SEPERATOR2' => "Daten",
        'ADMIN_NETWORK_ROW_SEPERATOR2' => "Zeilen",
@@ -259,6 +259,7 @@ addMessages(array(
        'ADMIN_NETWORK_TRANSLATE_SUBJECT_NAME' => "Betreffzeile",
        'ADMIN_NETWORK_TRANSLATE_CLICK_URL_NAME' => "Klick-URL",
        'ADMIN_NETWORK_TRANSLATE_MEDIA_URL_NAME' => "Media-URL",
+       'ADMIN_NETWORK_TRANSLATE_ALLOWED_COUNTRIES_NAME' => "Erlaubte L&auml;nder",
 ));
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
index bef6edbd8e3f2466ddd057ec36246537b89aeb68..d34edaa3c883d1bd86f47db55bfb4f7b994b1ab4 100644 (file)
--- a/inc/modules/admin/what-list_networks.php
+++ b/inc/modules/admin/what-list_networks.php
@@ -71,7 +71,7 @@ $result = SQL_QUERY('SELECT
        `network_row_seperator`,
        `network_request_type`,
        `network_charset`,
-       `network_requires_id`
+       `network_require_id_card`
 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 4480b4378b60ee5b3529e18bd630e3b8336700bc..40f913413a41297d59bf60177427fb2e9d500ea7 100644 (file)
--- a/templates/de/html/admin/admin_list_networks.tpl
+++ b/templates/de/html/admin/admin_list_networks.tpl
@@ -16,7 +16,7 @@
                <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 right"><strong>{--ADMIN_NETWORK_CHARSET--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUIRES_ID--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUIRE_ID_CARD--}</strong></td>
        </tr>
        $content
        <tr>
@@ -34,6 +34,6 @@
 </div>
 
 <div class="notice">
-       {--ADMIN_NETWORK_REQUIRES_ID_NOTICE--}
+       {--ADMIN_NETWORK_REQUIRE_ID_CARD_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 3fc9771fb7daf23a63a40757355501f9e6eac3f3..851e1ba8cacd883385efb5822aa235d5f032221a 100644 (file)
--- a/templates/de/html/admin/admin_list_networks_row.tpl
+++ b/templates/de/html/admin/admin_list_networks_row.tpl
@@ -26,6 +26,6 @@
                $content[network_charset]
        </td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
-               {%pipe,translateYesNo=$content[network_requires_id]%}
+               {%pipe,translateYesNo=$content[network_require_id_card]%}
        </td>
 </tr>