Extension ext-network continued:

- Advertising network adgain.de added
- Column 'network_param_id' renamed to 'network_request_param_id' to make it
  more clear that this column belongs to the table 'network_request_params'
- Added missing (still out of function) script for API querying
- Renamed above script for better naming convention
- Misc fixes/improvements

diff --git a/.gitattributes b/.gitattributes
index 2f0da48bae7a2fc7864c288de00fd0981b952ba3..ebc68c07dca961c4ea7c67d447ea1c264e9ea194 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -572,6 +572,7 @@ inc/modules/admin/what-memedit.php svneol=native#text/plain
 inc/modules/admin/what-optimize.php svneol=native#text/plain
 inc/modules/admin/what-overview.php svneol=native#text/plain
 inc/modules/admin/what-payments.php svneol=native#text/plain
+inc/modules/admin/what-query_network_apis.php svneol=native#text/plain
 inc/modules/admin/what-refbanner.php svneol=native#text/plain
 inc/modules/admin/what-repair_amnu.php svneol=native#text/plain
 inc/modules/admin/what-repair_cats.php svneol=native#text/plain

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index ad5cb41800693a419f0db23ce628a9af5bc8e033..a4ed0fc9941a12107d11b9b2c6c04e7263181cc0 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -20,6 +20,8 @@
  * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
  * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
  * @TODO ADCocktail: Zero array element is return code!                 *
+ * @TODO adgain.de: HTML mails are encoded with BASE64                  *
+ * @TODO adgain.de: Textlink-View is a JavaScript URL                   *
  * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
  * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
  * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
@@ -108,13 +110,13 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_handle`)",
                // HTTP parameters (names) for URLs
                addDropTableSql('network_request_params');
                addCreateTableSql('network_request_params', "
-`network_param_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`network_request_param_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_request_param_key` VARCHAR(20) NOT NULL DEFAULT 'invalid',
 `network_request_param_value` VARCHAR(20) NOT NULL DEFAULT 'invalid',
 `network_request_param_default` VARCHAR(255) NULL DEFAULT NULL,
-PRIMARY KEY (`network_param_id`),
+PRIMARY KEY (`network_request_param_id`),
 UNIQUE INDEX `provider_type_key` (`network_id`,`network_type_id`,`network_request_param_key`),
 UNIQUE INDEX `provider_type_value` (`network_id`,`network_type_id`,`network_request_param_value`)",
                        'Request parameters for GET/POST request');
@@ -285,7 +287,8 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 ('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
 ('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
 ('ad-hit', 'Ad-Hit.de', 'http://www.ad-hit.de?ref=41', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('adcity', 'AdCity.eu', 'http://www.adcity.eu?ref=38', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200)");
+('adcity', 'AdCity.eu', 'http://www.adcity.eu?ref=38', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200),
+('adgain', 'adgain.de', 'http://www.adgain.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 150)");
 
                // 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`,`network_type_reload_time_unit`) VALUES
@@ -365,6 +368,23 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (301, 30, 'textmail', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL, 'h'),
 (299, 30, 'traffic', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL, 'h')");
 
+               // Network type handlers - AdGain
+               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`, `network_type_reload_time_unit`) VALUES
+(322, 33, 'banner_click', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(323, 33, 'banner_view', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(324, 33, 'forcedbanner', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(325, 33, 'forcedtextlink', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(326, 33, 'htmlmail', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(327, 33, 'layer', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/sc_layer.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(328, 33, 'textmail', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(329, 33, 'popup', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/sc_popup.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(330, 33, 'skybanner_click', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(331, 33, 'skybanner_view', 'http://www.dgain.de/int/get.phap', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(332, 33, 'surfbar_click', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(333, 33, 'surfbar_view', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
+(334, 33, 'textlink_click', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h'),
+(335, 33, 'textlink_view', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/sc_textview.php?uid=%UID%&bid=%CID%&sid=%SID%', NULL, 'h')");
+
                // Network type handlers - AdPaid
                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`,`network_type_reload_time_unit`) VALUES
 (177, 5, 'banner', 'http://www.adpaid.de/interface/out_banner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
@@ -1126,6 +1146,112 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (30, 301, 'remain', 'uebrig', NULL),
 (30, 301, 'reward', 'verguetung', NULL)");
 
+               // Request parameters per type handler - adgain.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES
+(33, 322, 'extra', 'art', 'bannerklick'),
+(33, 322, 'id', 'uid', NULL),
+(33, 322, 'password', 'pw', NULL),
+(33, 322, 'sid', 'sid', NULL),
+(33, 322, 'reward', 'verguetung', NULL),
+(33, 322, 'reload', 'reload', NULL),
+(33, 322, 'remain', 'uebrig', NULL),
+(33, 323, 'extra', 'art', 'bannerview'),
+(33, 323, 'id', 'uid', NULL),
+(33, 323, 'password', 'pw', NULL),
+(33, 323, 'sid', 'sid', NULL),
+(33, 323, 'reward', 'verguetung', NULL),
+(33, 323, 'reload', 'reload', NULL),
+(33, 323, 'remain', 'uebrig', NULL),
+(33, 324, 'extra', 'art', 'forcedbanner'),
+(33, 324, 'id', 'uid', NULL),
+(33, 324, 'password', 'pw', NULL),
+(33, 324, 'sid', 'sid', NULL),
+(33, 324, 'reward', 'verguetung', NULL),
+(33, 324, 'reload', 'reload', NULL),
+(33, 324, 'remain', 'uebrig', NULL),
+(33, 324, 'minimum_stay', 'ma', NULL),
+(33, 325, 'extra', 'art', 'forcedtextlink'),
+(33, 325, 'id', 'uid', NULL),
+(33, 325, 'password', 'pw', NULL),
+(33, 325, 'sid', 'sid', NULL),
+(33, 325, 'reward', 'verguetung', NULL),
+(33, 325, 'reload', 'reload', NULL),
+(33, 325, 'remain', 'uebrig', NULL),
+(33, 325, 'minimum_stay', 'ma', NULL),
+(33, 326, 'extra', 'art', 'htmlmail'),
+(33, 326, 'id', 'uid', NULL),
+(33, 326, 'password', 'pw', NULL),
+(33, 326, 'sid', 'sid', NULL),
+(33, 326, 'reward', 'verguetung', NULL),
+(33, 326, 'reload', 'reload', NULL),
+(33, 326, 'remain', 'uebrig', NULL),
+(33, 326, 'minimum_stay', 'ma', NULL),
+(33, 327, 'extra', 'art', 'layer'),
+(33, 327, 'id', 'uid', NULL),
+(33, 327, 'password', 'pw', NULL),
+(33, 327, 'sid', 'sid', NULL),
+(33, 327, 'reward', 'verguetung', NULL),
+(33, 327, 'reload', 'reload', NULL),
+(33, 327, 'remain', 'uebrig', NULL),
+(33, 328, 'extra', 'art', 'paidmail'),
+(33, 328, 'id', 'uid', NULL),
+(33, 328, 'password', 'pw', NULL),
+(33, 328, 'sid', 'sid', NULL),
+(33, 328, 'reward', 'verguetung', NULL),
+(33, 328, 'reload', 'reload', NULL),
+(33, 328, 'type', 'uebrig', NULL),
+(33, 328, 'minimum_stay', 'ma', NULL),
+(33, 329, 'extra', 'art', 'popup'),
+(33, 329, 'id', 'uid', NULL),
+(33, 329, 'password', 'pw', NULL),
+(33, 329, 'sid', 'sid', NULL),
+(33, 329, 'reward', 'verguetung', NULL),
+(33, 329, 'reload', 'reload', NULL),
+(33, 329, 'remain', 'uebrig', NULL),
+(33, 329, 'minimum_stay', 'ma', NULL),
+(33, 330, 'extra', 'art', 'skybannerklick'),
+(33, 330, 'id', 'uid', NULL),
+(33, 330, 'password', 'pw', NULL),
+(33, 330, 'sid', 'sid', NULL),
+(33, 330, 'reward', 'verguetung', NULL),
+(33, 330, 'reload', 'reload', NULL),
+(33, 330, 'remain', 'uebrig', NULL),
+(33, 331, 'extra', 'art', 'skybannerview'),
+(33, 331, 'id', 'uid', NULL),
+(33, 331, 'password', 'pw', NULL),
+(33, 331, 'sid', 'sid', NULL),
+(33, 331, 'reward', 'verguetung', NULL),
+(33, 331, 'reload', 'reload', NULL),
+(33, 331, 'remain', 'uebrig', NULL),
+(33, 332, 'extra', 'art', 'surfbarklick'),
+(33, 332, 'id', 'uid', NULL),
+(33, 332, 'password', 'pw', NULL),
+(33, 332, 'sid', 'sid', NULL),
+(33, 332, 'reward', 'verguetung', NULL),
+(33, 332, 'reload', 'reload', NULL),
+(33, 332, 'remain', 'uebrig', NULL),
+(33, 333, 'extra', 'art', 'surfbarview'),
+(33, 333, 'id', 'uid', NULL),
+(33, 333, 'password', 'pw', NULL),
+(33, 333, 'sid', 'sid', NULL),
+(33, 333, 'reward', 'verguetung', NULL),
+(33, 333, 'reload', 'reload', NULL),
+(33, 333, 'remain', 'uebrig', NULL),
+(33, 334, 'extra', 'art', 'textlinkklick'),
+(33, 334, 'id', 'uid', NULL),
+(33, 334, 'password', 'pw', NULL),
+(33, 334, 'sid', 'sid', NULL),
+(33, 334, 'reward', 'verguetung', NULL),
+(33, 334, 'reload', 'reload', NULL),
+(33, 334, 'remain', 'uebrig', NULL),
+(33, 335, 'extra', 'art', 'textlinkview'),
+(33, 335, 'id', 'uid', NULL),
+(33, 335, 'password', 'pw', NULL),
+(33, 335, 'sid', 'sid', NULL),
+(33, 335, 'reward', 'verguetung', NULL),
+(33, 335, 'reload', 'reload', NULL),
+(33, 335, 'remain', 'uebrig', NULL)");
+
                // Request parameters per type handler - AdPaid
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`,`network_type_id`,`network_request_param_key`,`network_request_param_value`,`network_request_param_default`) VALUES
 (5, 177, 'id', 'id', NULL),
@@ -3393,6 +3519,91 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (30, 301, 10, 6),
 (30, 301, 9, 7)");
 
+               // API array elements - adgain.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
+(33, 322, 1, 1),
+(33, 322, 2, 2),
+(33, 322, 5, 3),
+(33, 322, 4, 4),
+(33, 322, 6, 5),
+(33, 323, 1, 1),
+(33, 323, 2, 2),
+(33, 323, 5, 3),
+(33, 323, 4, 4),
+(33, 323, 6, 5),
+(33, 324, 1, 1),
+(33, 324, 2, 2),
+(33, 324, 5, 3),
+(33, 324, 4, 4),
+(33, 324, 6, 5),
+(33, 324, 10, 6),
+(33, 325, 1, 1),
+(33, 325, 2, 2),
+(33, 325, 5, 3),
+(33, 325, 4, 4),
+(33, 325, 6, 5),
+(33, 325, 10, 6),
+(33, 325, 9, 7),
+(33, 326, 1, 1),
+(33, 326, 2, 2),
+(33, 326, 5, 3),
+(33, 326, 4, 4),
+(33, 326, 6, 5),
+(33, 326, 10, 6),
+(33, 326, 37, 7),
+(33, 326, 9, 8),
+(33, 327, 1, 1),
+(33, 327, 2, 2),
+(33, 327, 5, 3),
+(33, 327, 4, 4),
+(33, 327, 6, 5),
+(33, 328, 1, 1),
+(33, 328, 2, 2),
+(33, 328, 5, 3),
+(33, 328, 4, 4),
+(33, 328, 6, 5),
+(33, 328, 10, 6),
+(33, 328, 37, 7),
+(33, 328, 9, 8),
+(33, 329, 1, 1),
+(33, 329, 2, 2),
+(33, 329, 5, 3),
+(33, 329, 4, 4),
+(33, 329, 6, 5),
+(33, 329, 10, 6),
+(33, 330, 1, 1),
+(33, 330, 2, 2),
+(33, 330, 5, 3),
+(33, 330, 4, 4),
+(33, 330, 6, 5),
+(33, 331, 1, 1),
+(33, 331, 2, 2),
+(33, 331, 5, 3),
+(33, 331, 4, 4),
+(33, 331, 6, 5),
+(33, 332, 1, 1),
+(33, 332, 2, 2),
+(33, 332, 5, 3),
+(33, 332, 4, 4),
+(33, 332, 6, 5),
+(33, 333, 1, 1),
+(33, 333, 2, 2),
+(33, 333, 5, 3),
+(33, 333, 4, 4),
+(33, 333, 6, 5),
+(33, 334, 1, 1),
+(33, 334, 2, 2),
+(33, 334, 5, 3),
+(33, 334, 4, 4),
+(33, 334, 6, 5),
+(33, 334, 9, 6),
+(33, 335, 1, 1),
+(33, 335, 2, 2),
+(33, 335, 5, 3),
+(33, 335, 4, 4),
+(33, 335, 6, 5),
+(33, 335, 9, 6)");
+
                // API array elements - AdPaid
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`,`network_type_id`,`network_api_index`,`sort`) VALUES
 (5, 177, 7, 1),
@@ -5156,7 +5367,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
                addAdminMenuSql('network', NULL, 'Werbenetzwerke', 'Verwalten Sie hier Werbenetzwerke (API-Anbindung), versenden Sie deren Mails, oder &uuml;bernehmen Sie deren Textlinks und vieles mehr. <strong>VORSICHT:</strong> Das Einrichten von weiteren Werbenetzwerken ist nicht leicht, daf&uuml;r aber sehr flexibel! Sollte ein Netzwerk fehlen, so melden Sie dies bitte <a href="http://forum.mxchange.org/topic-462.html" target="_blank" title="Direktlink zum Forum">im Forum</a>!',4);
                addAdminMenuSql('network', 'config_network_api', 'API-Zugangsdaten', 'Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie aus dem Affiliate-Bereich des jeweiligen Werbenetzwerkes. Sollten Sie bei einem Werbenetzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referral-Link dazu.',1);
                addAdminMenuSql('network', 'config_network_types', 'Werbearten', 'Stellen Sie hier Reload-Zeiten, Mindestauffenthalt und so weiter pro Werbeart und Werbenetzwerk ein. Es werden sonst Ausgangswerte (Mimimumwerte: 0, Maximumwerte: sehr gross, Erotik: aus) angenommen, die Sie meistens nicht wollen.',2);
-               addAdminMenuSql('network', 'query_networks', 'APIs abfragen', 'Fragt alle eingestellten APIs ab. Die Ergebnisse werden dann f&uuml;r einen einstellbaren Zeitraum gecacht und nicht erneut angefordert.',3);
+               addAdminMenuSql('network', 'query_network_apis', 'APIs abfragen', 'Fragt alle eingestellten APIs ab. Die Ergebnisse werden dann f&uuml;r einen einstellbaren Zeitraum gecacht und nicht erneut angefordert.',3);
                addAdminMenuSql('network', 'config_network', 'Einstellungen', 'Stellen Sie generelle Einstellungen ein, die f&uuml;r alle Werbenetzwerke gelten, wie z.B. Cache-Erneuerungsinterval. Generell sind aber die Einstellungen in Ordnung, da z.B. sonst Ihre freien Abfragen beim Werbenetzwerk sich zu schnell abbauen.',4);
                addAdminMenuSql('network', 'list_network_reloads', 'Reload-Sperren', 'Listen oder l&ouml;schen Sie hier Reload-Sperren. <strong>Vorsicht:</strong> Die hier gespeicherten Reload-Sperren sind vom jeweiligen Werbenetzwerk &uuml;bernommen. Eventuell verdienen Sie nichts, wenn Sie z.B. eine Mail innerhalb der Reload-Sperre erneut versenden.',5);
                addAdminMenuSql('network', 'list_networks', 'Auflisten/Verwalten', '<strong>Entwicklereinstellungen!</strong> Hier &auml;ndern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 6);

diff --git a/inc/language/de.php b/inc/language/de.php
index 85a99b63fc9bb882545ee09cf25430db98c71f46..4a85b71a065725f75f950272905e2ba13afaae56 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1132,7 +1132,7 @@ addMessages(array(
 
        // Expert settings
        'ADMIN_EXPERT_SETTINGS_STATUS_UPDATE' => "Ihr {?mt_word?} weisst nicht die n&ouml;tige Erweiterung <span class=\"data\">admins</span> mindestens in der Version <span class=\"data\">0.7.3</span> auf, um Entwicklereinstellungen zu pr&uuml;fen. Bitte aktualisieren Sie Ihre {?mt_word?}-Installation.",
-       'ADMIN_EXPERT_SETTINGS_STATUS_FAILED' => "Es ist ein allgemeiner Fehler beim Pr&uuml;fen der Experteneinstellungen aufgetreten f&uuml;r den Sie vermutlich nichts k&ouml;nnen.",
+       'ADMIN_EXPERT_SETTINGS_STATUS_FAILED' => "Es ist ein allgemeiner Fehler beim Pr&uuml;fen der Entwicklereinstellungen aufgetreten f&uuml;r den Sie vermutlich nichts k&ouml;nnen.",
        'ADMIN_EXPERT_SETTINGS_STATUS_FORBIDDEN' => "Sie haben nicht die Berechtigung, Entwicklereinstellungen zu &auml;ndern.",
        'ADMIN_EXPERT_SETTINGS_TITLE' => "&Auml;nderungen von Entwicklereinstellungen",
        'ADMIN_EXPERT_SETTINGS_NOTE' => "Sie sind im Begriff Einstellungen zu &auml;ndern, die sehr sensibel sind und sich auf die Funktionalit&auml;t Ihres {?mt_word2?} negativ auswirken k&ouml;nnen. Sie sollten daher hier nichts &auml;ndern, solange Sie nicht wissen, was Sie da tun.",

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index ee617c165d12342349e4b64cf7fdab4373b7e30c..50d5fe6397b2c94467541fc3e9b856ac3b2535db 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -191,7 +191,7 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_API_URL' => "API-URL der Werbeart:",
        'ADMIN_NETWORK_TYPES_CLICK_URL' => "Klick-URL der Werbeart:",
        'ADMIN_NETWORK_TYPES_BANNER_URL' => "Banner-URL der Werbeart:",
-       'ADMIN_NETWORK_TYPES_RELOAD_TIME_UNIT' => "Zeieinheit für Reloadsperre:",
+       'ADMIN_NETWORK_TYPES_RELOAD_TIME_UNIT' => "Zeiteinheit für Reloadsperre:",
        // - API request parameter
        'ADMIN_SELECT_NETWORK_TYPE' => "Werbeart-Handler auswählen",
        'ADMIN_NETWORK_REQUEST_PARAMETER_KEY' => "Abfragename",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 1f865f76a8be377a832510477b0bdf75590470af..5c9515f24ae52d3bc96d2a6bd6edfb20c46cda14 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -126,7 +126,7 @@ function isNetworkTypeHandleValid ($type, $networkId) {
 // Checks wether the given network request parameter is already used (valid)
 function isNetworkRequestElementValid ($key, $type, $networkId) {
        // Query for it
-       $result = SQL_QUERY_ESC("SELECT `network_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_request_param_key`='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `network_request_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_request_param_key`='%s' LIMIT 1",
                array($networkId, $type, $key), __FUNCTION__, __LINE__);
 
        // Does it exist?
@@ -325,7 +325,7 @@ function getNetworkRequestParamsDataById ($networkId) {
 
        // Query for the network data
        $result = SQL_QUERY_ESC("SELECT
-       `network_param_id`,
+       `network_request_param_id`,
        `network_id`,
        `network_type_id`,
        `network_request_param_key`,
@@ -334,7 +334,7 @@ function getNetworkRequestParamsDataById ($networkId) {
 FROM
        `{?_MYSQL_PREFIX?}_network_request_params`
 WHERE
-       `network_param_id`=%s
+       `network_request_param_id`=%s
 LIMIT 1",
                array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
@@ -384,7 +384,7 @@ function doNetworkUpdateParamsByArray ($networkId, $networkParamData) {
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_param_id`=%s", bigintval($networkId)), array(), false, false);
+       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkId)), array(), false, false);
 }
 
 // Removes given network entry
@@ -1268,7 +1268,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
-                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_param_id', $networkId);
+                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_request_param_id', $networkId);
                        } // END - if
                } // END - foreach
 
@@ -1312,7 +1312,7 @@ function doAdminNetworkProcessAddNetworkParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_network_request_param_added', false, postRequestArray());
+               loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');

diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index 12fc5b7cff2c74cdee5ee790cdd47facfc9900d2..d8cabb694b8281ecb6b95d58af400e5a37e60a77 100644 (file)
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -85,7 +85,7 @@ if (isGetRequestElementSet('network_id')) {
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
-       p.`network_param_id`,
+       p.`network_request_param_id`,
        t.`network_type_id`,
        t.`network_type_handle`,
        p.`network_request_param_key`,
@@ -101,7 +101,7 @@ WHERE
        p.`network_id`=%s".$ADD."
 ORDER BY
        t.`network_type_handle` ASC,
-       p.`network_param_id` ASC",
+       p.`network_request_param_id` ASC",
                array(getRequestElement('network_id')), __FILE__, __LINE__);
 
        // Do we have entries?

diff --git a/inc/modules/admin/what-query_network_apis.php b/inc/modules/admin/what-query_network_apis.php
new file mode 100644 (file)
index 0000000..844cb62
--- /dev/null
+++ b/inc/modules/admin/what-query_network_apis.php
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/23/2011 *
+ * ===================                          Last change: 08/23/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-query_network_apis.php                      *
+ * -------------------------------------------------------------------- *
+ * Short description : Queries all configured network APIs              *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Fragt alle konfigurierten Netzwerk-APIs ab       *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+// [EOF]
+?>

diff --git a/templates/de/html/admin/admin_add_network_api_translation.tpl b/templates/de/html/admin/admin_add_network_api_translation.tpl
index 415cd5354377ddb669a6c80653649ec80426f3fc..367d53e5edd1a94ca4e5a3093812c32e2bfa25bb 100644 (file)
--- a/templates/de/html/admin/admin_add_network_api_translation.tpl
+++ b/templates/de/html/admin/admin_add_network_api_translation.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=add_network_api_translation&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">

diff --git a/templates/de/html/admin/admin_add_network_params.tpl b/templates/de/html/admin/admin_add_network_params.tpl
index 08010e542ffb6da23f479c55fc093237a1719110..05d73cfb5b7eb53673b36c0d3dd6e2660a00e82d 100644 (file)
--- a/templates/de/html/admin/admin_add_network_params.tpl
+++ b/templates/de/html/admin/admin_add_network_params.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=add_network_param&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=add_network_param&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">

diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl
index f5597257e87cdcf772c2b78fb03773ebb6263e85..fd9dc72bfe8f18c83d456cede09ecc4e0c502a3b 100644 (file)
--- a/templates/de/html/admin/admin_add_network_type.tpl
+++ b/templates/de/html/admin/admin_add_network_type.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">

diff --git a/templates/de/html/admin/admin_delete_network_params.tpl b/templates/de/html/admin/admin_delete_network_params.tpl
index 6734b68b829b387fbc08abccaa82f2f657a15d58..fea910a6225ecfc3e127db7c77d656880019fc3a 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_params.tpl
+++ b/templates/de/html/admin/admin_delete_network_params.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=remove_network_param&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=remove_network_param&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_delete_network_params_row.tpl b/templates/de/html/admin/admin_delete_network_params_row.tpl
index dc189e06184918e16e7eabeea3df255d0efe1a7d..13e4f1fb20d0faf944efd2b6f35b31ae64ccc4db 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_params_row.tpl
+++ b/templates/de/html/admin/admin_delete_network_params_row.tpl
@@ -1,7 +1,7 @@
 <tr>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPES_HANDLE--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="hidden" name="sel[$content[network_param_id]]" value="1" />
+               <input type="hidden" name="sel[$content[network_request_param_id]]" value="1" />
                $content[network_type_data][network_type_handle]
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_delete_network_types.tpl b/templates/de/html/admin/admin_delete_network_types.tpl
index 8ce1b5f73531683fbe0e5d0215e23a8244443ce0..ea34b00ca405eed00b3769bd2e6acb63b6deb524 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_types.tpl
+++ b/templates/de/html/admin/admin_delete_network_types.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_type&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_type&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_edit_network_params.tpl b/templates/de/html/admin/admin_edit_network_params.tpl
index d5c004195729fbd4c72e2e1bf978c67e04c8dbd2..ad977d0c8a93d389d0673909d357166f723f3e2a 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_params.tpl
+++ b/templates/de/html/admin/admin_edit_network_params.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=change_network_param&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=change_network_param&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_edit_network_params_row.tpl b/templates/de/html/admin/admin_edit_network_params_row.tpl
index 410381991e00f799c783ea2b008293f0ea334131..5014a7b35d9e2163a5c137d8de0872b4548a4bf3 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_params_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_params_row.tpl
@@ -1,8 +1,8 @@
 <tr>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPES_HANDLE--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="hidden" name="sel[$content[network_param_id]]" value="1" />
-               <select name="network_type_id[$content[network_param_id]]" class="form_select" size="1">
+               <input type="hidden" name="sel[$content[network_request_param_id]]" value="1" />
+               <select name="network_type_id[$content[network_request_param_id]]" class="form_select" size="1">
                        {%pipe,generateNetworkTypeOptions=$content[network_type_id]%}
                </select>
        </td>
@@ -10,20 +10,20 @@
 <tr>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <select name="network_request_param_key[$content[network_param_id]]" class="form_select" size="1">
-                       {%pipe,generateNetworkRequestKeyOptions=$content[network_param_key]%}
+               <select name="network_request_param_key[$content[network_request_param_id]]" class="form_select" size="1">
+                       {%pipe,generateNetworkRequestKeyOptions=$content[network_request_param_key]%}
                </select>
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="network_request_param_value[$content[network_param_id]]" size="10" maxlength="10" value="$content[network_request_param_value]" />
+               <input type="text" class="form_field" name="network_request_param_value[$content[network_request_param_id]]" size="10" maxlength="10" value="$content[network_request_param_value]" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom" style="padding-left:5px">{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:</td>
        <td class="{%template,ColorSwitch%} bottom">
-               <input type="text" class="form_field" name="network_request_param_default[$content[network_param_id]]" size="50" maxlength="255" value="$content[network_request_param_default]" />
+               <input type="text" class="form_field" name="network_request_param_default[$content[network_request_param_id]]" size="50" maxlength="255" value="$content[network_request_param_default]" />
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl
index 9571fef7d0369a5c565344a9c8034ecdfa0798ea..072661311a9615e73e6edd7234fa2d7e087af80b 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types.tpl
+++ b/templates/de/html/admin/admin_edit_network_types.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=change_network_type&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=change_network_type&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_list_network_api_translation.tpl b/templates/de/html/admin/admin_list_network_api_translation.tpl
index 6a71b8d28dc33fd822e8e470cf18a27404fdaf17..41e47eabc72f59e24f25ca5e5cf0fa430fa24d13 100644 (file)
--- a/templates/de/html/admin/admin_list_network_api_translation.tpl
+++ b/templates/de/html/admin/admin_list_network_api_translation.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=handle_api_translation&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_api_translation&amp;do=handle_api_translation&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">

diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl
index 9b7000d537646abe1315dc02de46bf5bd4383289..4e8752151fe990d22892c65844efbcf2cb33b33e 100644 (file)
--- a/templates/de/html/admin/admin_list_network_params.tpl
+++ b/templates/de/html/admin/admin_list_network_params.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=handle_request_params&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_params&amp;do=handle_request_params&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">

diff --git a/templates/de/html/admin/admin_list_network_params_row.tpl b/templates/de/html/admin/admin_list_network_params_row.tpl
index e100a7d1291aa7d8a56cd24da6a69b24ae01f35b..621ef39c2b4694c5e366dccdaa2802eaee8c5012 100644 (file)
--- a/templates/de/html/admin/admin_list_network_params_row.tpl
+++ b/templates/de/html/admin/admin_list_network_params_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <input type="checkbox" title="{--ID_SELECT--} $content[network_param_id]" class="form_field" name="sel[$content[network_param_id]]" value="1" />
+               <input type="checkbox" title="{--ID_SELECT--} $content[network_request_param_id]" class="form_field" name="sel[$content[network_request_param_id]]" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%}

diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl
index e943528f84df9b450e5f68239383fafc48a081f2..73968205536d8037241321bc81c60f236b17b0e1 100644 (file)
--- a/templates/de/html/admin/admin_list_network_types.tpl
+++ b/templates/de/html/admin/admin_list_network_types.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_type&amp;network_id={%get=network%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_type&amp;network_id={%get=network_id%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" align="center" class="table_header bottom">