Advertising network Ad-Promotion.net added, some cleanups

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 3a8d194327235bc465e454851bfea320b5f05d0b..a26cc1b8497211294c714e4e802797c7c33567e3 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -293,7 +293,8 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 ('adgain', 'adgain.de', 'http://www.adgain.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 150),
 ('adkracher', 'ADkracher', 'http://www.adkracher.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 350),
 ('adminlose', 'Adminlose.de', 'http://www.adminlose.de/index.php?ref=2148', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200),
-('admono', 'Admono.de', 'http://www.admono.de/?ref=92', '|', '|', 'GET', 'ISO-8859-1', 'N', 150)");
+('admono', 'Admono.de', 'http://www.admono.de/?ref=92', '|', '|', 'GET', 'ISO-8859-1', 'N', 150),
+('adpromotionnet', 'Ad-Promotion.net', 'http://ad-promotion.net?ref=10194', '|', '|', 'GET', 'WINDOWS-1252', 'N', 150)");
 
                // Network type handlers - A3H
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`,`network_type_reload_time_unit`) VALUES
@@ -342,6 +343,19 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // Network type handlers - Ad-Magnet
 
+               // Network type handlers - Ad-Promotion.net
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES
+(367, 37, 'forcedbanner', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', http://ad-promotion.net/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(368, 37, 'forcedtextlink', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL),
+(369, 37, 'banner_view', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', http://ad-promotion.net/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(370, 37, 'banner_click', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', http://ad-promotion.net/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(371, 37, 'skybanner_view', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', http://ad-promotion.net/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(372, 37, 'button_view', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', http://ad-promotion.net/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(373, 37, 'textlink_view', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL),
+(374, 37, 'traffic', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL),
+(375, 37, 'popup', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL),
+(376, 37, 'textmail', 'http://ad-promotion.net/interface/api_2.php', 'http://ad-promotion.net/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL)");
+
                // Network type handlers - AdCity.eu
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`,`network_type_reload_time_unit`) VALUES
 (312, 32, 'forcedbanner', 'http://www.adcity.eu/interface/', 'http://www.adcity.eu/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.adcity.eu/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
@@ -1043,6 +1057,79 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // Request parameters per type handler - Ad-Magnet
 
+               // Request parameters per type handler - Ad-Promotion.net
+               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
+(37, 367, 'extra', 'typ', 'forcedbanner'),
+(37, 367, 'id', 'id', 'NULL),
+(37, 367, 'password', 'pw', 'NULL),
+(37, 367, 'remain', 'uebrig', 'NULL),
+(37, 367, 'reload', 'reload', 'NULL),
+(37, 367, 'reward', 'verguetung', 'NULL),
+(37, 367, 'sid', 'siteid', 'NULL),
+(37, 368, 'extra', 'typ', 'forcedtextlink'),
+(37, 368, 'id', 'id', 'NULL),
+(37, 368, 'password', 'pw', 'NULL),
+(37, 368, 'remain', 'uebrig', 'NULL),
+(37, 368, 'reload', 'reload', 'NULL),
+(37, 368, 'reward', 'verguetung', 'NULL),
+(37, 368, 'sid', 'siteid', 'NULL),
+(37, 369, 'extra', 'typ', 'bannerview'),
+(37, 369, 'id', 'id', 'NULL),
+(37, 369, 'password', 'pw', 'NULL),
+(37, 369, 'remain', 'uebrig', 'NULL),
+(37, 369, 'reload', 'reload', 'NULL),
+(37, 369, 'reward', 'verguetung', 'NULL),
+(37, 369, 'sid', 'siteid', 'NULL),
+(37, 370, 'extra', 'typ', 'bannerklick'),
+(37, 370, 'id', 'id', 'NULL),
+(37, 370, 'password', 'pw', 'NULL),
+(37, 370, 'remain', 'uebrig', 'NULL),
+(37, 370, 'reload', 'reload', 'NULL),
+(37, 370, 'reward', 'verguetung', 'NULL),
+(37, 370, 'sid', 'siteid', 'NULL),
+(37, 371, 'extra', 'typ', 'skybannerview'),
+(37, 371, 'id', 'id', 'NULL),
+(37, 371, 'password', 'pw', 'NULL),
+(37, 371, 'remain', 'uebrig', 'NULL),
+(37, 371, 'reload', 'reload', 'NULL),
+(37, 371, 'reward', 'verguetung', 'NULL),
+(37, 371, 'sid', 'siteid', 'NULL),
+(37, 372, 'extra', 'typ', 'buttonview'),
+(37, 372, 'id', 'id', 'NULL),
+(37, 372, 'password', 'pw', 'NULL),
+(37, 372, 'remain', 'uebrig', 'NULL),
+(37, 372, 'reload', 'reload', 'NULL),
+(37, 372, 'reward', 'verguetung', 'NULL),
+(37, 372, 'sid', 'siteid', 'NULL),
+(37, 373, 'extra', 'typ', 'textview'),
+(37, 373, 'id', 'id', 'NULL),
+(37, 373, 'password', 'pw', 'NULL),
+(37, 373, 'remain', 'uebrig', 'NULL),
+(37, 373, 'reload', 'reload', 'NULL),
+(37, 373, 'reward', 'verguetung', 'NULL),
+(37, 373, 'sid', 'siteid', 'NULL),
+(37, 374, 'extra', 'typ', 'traffic'),
+(37, 374, 'id', 'id', 'NULL),
+(37, 374, 'password', 'pw', 'NULL),
+(37, 374, 'remain', 'uebrig', 'NULL),
+(37, 374, 'reload', 'reload', 'NULL),
+(37, 374, 'reward', 'verguetung', 'NULL),
+(37, 374, 'sid', 'siteid', 'NULL),
+(37, 375, 'extra', 'typ', 'popup'),
+(37, 375, 'id', 'id', 'NULL),
+(37, 375, 'password', 'pw', 'NULL),
+(37, 375, 'remain', 'uebrig', 'NULL),
+(37, 375, 'reload', 'reload', 'NULL),
+(37, 375, 'reward', 'verguetung', 'NULL),
+(37, 375, 'sid', 'siteid', 'NULL),
+(37, 376, 'extra', 'typ', 'paidmail'),
+(37, 376, 'id', 'id', 'NULL),
+(37, 376, 'password', 'pw', 'NULL),
+(37, 376, 'remain', 'uebrig', 'NULL),
+(37, 376, 'reload', 'reload', 'NULL),
+(37, 376, 'reward', 'verguetung', 'NULL),
+(37, 376, 'sid', 'siteid', 'NULL)");
+
                // Request parameters per type handler - AdCity.eu
                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
 (32, 312, 'extra', 'typ', 'forcedbanner'),
@@ -1446,6 +1533,77 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (35, 356, 'type', 'typ', 'popdown')");
 
                // Request parameters per type handler - Admono.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
+(36, 357, 'extra', 'typ', 'forcedbanner'),
+(36, 357, 'id', 'id', 'NULL),
+(36, 357, 'sid', 'sid', 'NULL),
+(36, 357, 'password', 'pw', 'NULL),
+(36, 357, 'remain', 'uebrig', 'NULL),
+(36, 357, 'reload', 'reload', 'NULL),
+(36, 357, 'reward', 'verguetung', 'NULL),
+(36, 358, 'extra', 'typ', 'forcedtextlink'),
+(36, 358, 'id', 'id', 'NULL),
+(36, 358, 'sid', 'sid', 'NULL),
+(36, 358, 'password', 'pw', 'NULL),
+(36, 358, 'remain', 'uebrig', 'NULL),
+(36, 358, 'reload', 'reload', 'NULL),
+(36, 358, 'reward', 'verguetung', 'NULL),
+(36, 359, 'extra', 'typ', 'bannerview'),
+(36, 359, 'id', 'id', 'NULL),
+(36, 359, 'sid', 'sid', 'NULL),
+(36, 359, 'password', 'pw', 'NULL),
+(36, 359, 'remain', 'uebrig', 'NULL),
+(36, 359, 'reload', 'reload', 'NULL),
+(36, 359, 'reward', 'verguetung', 'NULL),
+(36, 360, 'extra', 'typ', 'bannerklick'),
+(36, 360, 'id', 'id', 'NULL),
+(36, 360, 'sid', 'sid', 'NULL),
+(36, 360, 'password', 'pw', 'NULL),
+(36, 360, 'remain', 'uebrig', 'NULL),
+(36, 360, 'reload', 'reload', 'NULL),
+(36, 360, 'reward', 'verguetung', 'NULL),
+(36, 361, 'extra', 'typ', 'skybannerview'),
+(36, 361, 'id', 'id', 'NULL),
+(36, 361, 'sid', 'sid', 'NULL),
+(36, 361, 'password', 'pw', 'NULL),
+(36, 361, 'remain', 'uebrig', 'NULL),
+(36, 361, 'reload', 'reload', 'NULL),
+(36, 361, 'reward', 'verguetung', 'NULL),
+(36, 362, 'extra', 'typ', 'buttonview'),
+(36, 362, 'id', 'id', 'NULL),
+(36, 362, 'sid', 'sid', 'NULL),
+(36, 362, 'password', 'pw', 'NULL),
+(36, 362, 'remain', 'uebrig', 'NULL),
+(36, 362, 'reload', 'reload', 'NULL),
+(36, 362, 'reward', 'verguetung', 'NULL),
+(36, 363, 'extra', 'typ', 'textview'),
+(36, 363, 'id', 'id', 'NULL),
+(36, 363, 'sid', 'sid', 'NULL),
+(36, 363, 'password', 'pw', 'NULL),
+(36, 363, 'remain', 'uebrig', 'NULL),
+(36, 363, 'reload', 'reload', 'NULL),
+(36, 363, 'reward', 'verguetung', 'NULL),
+(36, 364, 'extra', 'typ', 'traffic'),
+(36, 364, 'id', 'id', 'NULL),
+(36, 364, 'sid', 'sid', 'NULL),
+(36, 364, 'password', 'pw', 'NULL),
+(36, 364, 'remain', 'uebrig', 'NULL),
+(36, 364, 'reload', 'reload', 'NULL),
+(36, 364, 'reward', 'verguetung', 'NULL),
+(36, 365, 'extra', 'typ', 'popup'),
+(36, 365, 'id', 'id', 'NULL),
+(36, 365, 'sid', 'sid', 'NULL),
+(36, 365, 'password', 'pw', 'NULL),
+(36, 365, 'remain', 'uebrig', 'NULL),
+(36, 365, 'reload', 'reload', 'NULL),
+(36, 365, 'reward', 'verguetung', 'NULL),
+(36, 366, 'extra', 'typ', 'paidmail'),
+(36, 366, 'id', 'id', 'NULL),
+(36, 366, 'sid', 'sid', 'NULL),
+(36, 366, 'password', 'pw', 'NULL),
+(36, 366, 'remain', 'uebrig', 'NULL),
+(36, 366, 'reload', 'reload', 'NULL),
+(36, 366, 'reward', 'verguetung', '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
@@ -3597,7 +3755,90 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // API array elements - AD-Magnet
 
-               // API array elements - ADCity.eu
+               // API array elements - AD-Promotion
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
+(37, 367, 1, 1),
+(37, 367, 2, 2),
+(37, 367, 4, 3),
+(37, 367, 5, 4),
+(37, 367, 6, 5),
+(37, 367, 10, 6),
+(37, 367, 9, 7),
+(37, 367, 40, 8),
+(37, 368, 1, 1),
+(37, 368, 2, 2),
+(37, 368, 4, 3),
+(37, 368, 5, 4),
+(37, 368, 6, 5),
+(37, 368, 10, 6),
+(37, 368, 9, 7),
+(37, 368, 40, 8),
+(37, 369, 1, 1),
+(37, 369, 2, 2),
+(37, 369, 4, 3),
+(37, 369, 5, 4),
+(37, 369, 6, 5),
+(37, 369, 10, 6),
+(37, 369, 9, 7),
+(37, 369, 40, 8),
+(37, 370, 1, 1),
+(37, 370, 2, 2),
+(37, 370, 4, 3),
+(37, 370, 5, 4),
+(37, 370, 6, 5),
+(37, 370, 10, 6),
+(37, 370, 9, 7),
+(37, 370, 40, 8),
+(37, 371, 1, 1),
+(37, 371, 2, 2),
+(37, 371, 4, 3),
+(37, 371, 5, 4),
+(37, 371, 6, 5),
+(37, 371, 10, 6),
+(37, 371, 9, 7),
+(37, 371, 40, 8),
+(37, 372, 1, 1),
+(37, 372, 2, 2),
+(37, 372, 4, 3),
+(37, 372, 5, 4),
+(37, 372, 6, 5),
+(37, 372, 10, 6),
+(37, 372, 9, 7),
+(37, 372, 40, 8),
+(37, 373, 1, 1),
+(37, 373, 2, 2),
+(37, 373, 4, 3),
+(37, 373, 5, 4),
+(37, 373, 6, 5),
+(37, 373, 10, 6),
+(37, 373, 9, 7),
+(37, 373, 40, 8),
+(37, 374, 1, 1),
+(37, 374, 2, 2),
+(37, 374, 4, 3),
+(37, 374, 5, 4),
+(37, 374, 6, 5),
+(37, 374, 10, 6),
+(37, 374, 9, 7),
+(37, 374, 40, 8),
+(37, 375, 1, 1),
+(37, 375, 2, 2),
+(37, 375, 4, 3),
+(37, 375, 5, 4),
+(37, 375, 6, 5),
+(37, 375, 10, 6),
+(37, 375, 9, 7),
+(37, 375, 40, 8),
+(37, 376, 1, 1),
+(37, 376, 2, 2),
+(37, 376, 4, 3),
+(37, 376, 5, 4),
+(37, 376, 6, 5),
+(37, 376, 10, 6),
+(37, 376, 9, 7),
+(37, 376, 40, 8)");
+
+               // API array elements - AdCity.eu
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
 (32, 312, 1, 1),
 (32, 312, 2, 2),
@@ -3929,6 +4170,62 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (35, 356, 6, 5),
 (35, 356, 10, 6)");
 
+               // API array elements - Admono.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
+(36, 357, 1, 1),
+(36, 357, 2, 2),
+(36, 357, 4, 3),
+(36, 357, 5, 4),
+(36, 357, 6, 5),
+(36, 358, 1, 1),
+(36, 358, 2, 2),
+(36, 358, 4, 3),
+(36, 358, 5, 4),
+(36, 358, 6, 5),
+(36, 359, 1, 1),
+(36, 359, 2, 2),
+(36, 359, 4, 3),
+(36, 359, 5, 4),
+(36, 359, 6, 5),
+(36, 360, 1, 1),
+(36, 360, 2, 2),
+(36, 360, 4, 3),
+(36, 360, 5, 4),
+(36, 360, 6, 5),
+(36, 361, 1, 1),
+(36, 361, 2, 2),
+(36, 361, 4, 3),
+(36, 361, 5, 4),
+(36, 361, 6, 5),
+(36, 362, 1, 1),
+(36, 362, 2, 2),
+(36, 362, 4, 3),
+(36, 362, 5, 4),
+(36, 362, 6, 5),
+(36, 363, 1, 1),
+(36, 363, 2, 2),
+(36, 363, 4, 3),
+(36, 363, 5, 4),
+(36, 363, 6, 5),
+(36, 364, 1, 1),
+(36, 364, 2, 2),
+(36, 364, 4, 3),
+(36, 364, 5, 4),
+(36, 364, 6, 5),
+(36, 365, 1, 1),
+(36, 365, 2, 2),
+(36, 365, 4, 3),
+(36, 365, 5, 4),
+(36, 365, 6, 5),
+(36, 365, 10, 6),
+(36, 366, 1, 1),
+(36, 366, 2, 2),
+(36, 366, 4, 3),
+(36, 366, 5, 4),
+(36, 366, 6, 5),
+(36, 366, 10, 6),
+(36, 366, 9, 7)");
+
                // API array elements - AdPaid
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
 (5, 177, 7, 1),

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index bbd85f52b0e5f31e18cc1a8262f02f49943016b2..124473819033f1928e60a1e14fe8af932173de3d 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -52,12 +52,12 @@ addMessages(array(
        'ADMIN_NETWORK_NOTHING_REMOVED' => "Es wurden keine allgemeinen Daten gelöscht.",
        'ADMIN_NETWORK_ALREADY_ADDED' => "Ein Werbenetzwerk mit dem Kurznamen <span class=\"data\">%s</span> existiert bereits.",
        'ADMIN_NETWORK_DATA_NOT_ADDED' => "Das Werbenetzwerk mit dem Kurznamen <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
-       'ADMIN_NETWORK_HANDLER_TYPES_NOTHING_CHANGED' => "Es wurden keine &Auml;nderungen an den Werbeart-Handlern ausgef&uuml;hrt.",
-       'ADMIN_NETWORK_HANDLER_TYPES_NOTHING_REMOVED' => "Es wurden keine Werbeart-Handler gel&ouml;scht.",
-       'ADMIN_NETWORK_HANDLER_TYPES_404' => "Es wurden keine Werbearten-Handler zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
-       'ADMIN_NETWORK_HANDLER_TYPES_HANDLE_ALREADY_ADDED' => "Ein Werbeart-Handler <span class=\"data\">%s</span> existiert bereits.",
-       'ADMIN_NETWORK_HANDLER_TYPES_NOT_ADDED' => "Der Werbeart-Handler <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
-       'ADMIN_NETWORK_HANDLER_TYPES_NOTHING_FOUND' => "Es wurden keine Werbart-Handler zum Editieren oder L&ouml;schen gefunden.",
+       'ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED' => "Es wurden keine &Auml;nderungen an den Werbeart-Handlern ausgef&uuml;hrt.",
+       'ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED' => "Es wurden keine Werbeart-Handler gel&ouml;scht.",
+       'ADMIN_NETWORK_TYPE_HANDLER_404' => "Es wurden keine Werbearten-Handler zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
+       'ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED' => "Ein Werbeart-Handler <span class=\"data\">%s</span> existiert bereits.",
+       'ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED' => "Der Werbeart-Handler <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
+       'ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND' => "Es wurden keine Werbart-Handler zum Editieren oder L&ouml;schen gefunden.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED' => "Ein Abfrageparameter <span class=\"data\">%s</span> existiert bereits.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_404' => "Es wurden keine Abfrageparameter zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED' => "Der Abfrageparameter <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
@@ -74,9 +74,9 @@ addMessages(array(
        'ADMIN_SELECT_NETWORK_TITLE' => "Bitte w&auml;hlen Sie ein Werbenetzwerk aus",
        'ADMIN_SELECT_NETWORK_HANDLER_TYPE_TITLE' => "Bitte w&auml;hlen Sie einen Werbeart-Handler aus",
        'ADMIN_ADD_NETWORK_HANDLER_TYPE_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzuf&uuml;gen",
-       'ADMIN_NETWORK_HANDLER_TYPES_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
+       'ADMIN_NETWORK_TYPE_HANDLER_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        'ADMIN_EDIT_NETWORK_HANDLER_TYPES_TITLE' => "Werbeart-Handler editieren",
-       'ADMIN_NETWORK_HANDLER_TYPES_DELETE_TITLE' => "Werbeart-Handle l&ouml;schen",
+       'ADMIN_NETWORK_TYPE_HANDLER_DELETE_TITLE' => "Werbeart-Handle l&ouml;schen",
        'ADMIN_ADD_NETWORK_REQUEST_PARAMETER_TITLE' => "Werbenetzwerk verwalten - Neuen Abfrageparameter hinzuf&uuml;gen",
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE' => "Abfrageparameter auflisten und verwalten",
        'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE' => "Abfrageparameter editieren",
@@ -89,7 +89,7 @@ addMessages(array(
        'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler &auml;ndern - {%%pipe,translateNetworkTypeHandler=%s%%}",
        // - Link titles
        'ADMIN_NETWORK_API_CONFIG_LINK_TITLE' => "Weiter zur API-Konfiguration",
-       'ADMIN_NETWORK_HANDLER_TYPES_CONFIG_LINK_TITLE' => "Weiter zur Werbart-Handler-Konfiguration",
+       'ADMIN_NETWORK_TYPE_HANDLER_CONFIG_LINK_TITLE' => "Weiter zur Werbart-Handler-Konfiguration",
        'ADMIN_LIST_NETWORK_HANDLER_TYPES_LINK_TITLE' => "Weiter zu den Werbearten",
        'ADMIN_LIST_NETWORK_REQUEST_PARAMS_LINK_TITLE' => "Weiter zu den Abfrageparametern",
        'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LINK_TITLE' => "Weiter zu den &Uuml;bersetzungen zum Antwort-Arrayn",
@@ -113,22 +113,22 @@ addMessages(array(
        'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT' => "Werbeart-Handler &auml;ndern",
        // - Success titles
        'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt",
-       'ADMIN_NETWORK_HANDLER_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt",
+       'ADMIN_NETWORK_TYPE_HANDLER_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt",
        'ADMIN_NETWORK_REQUEST_PARAM_ADDED_TITLE' => "Abfrageparameter hinzugef&uuml;gt",
        'ADMIN_NETWORK_ARRAY_TRANSLATION_ADDED_TITLE' => "Array-Element-&Uuml;bersetzung hinzugef&uuml;gt",
        // - Success nots
        'ADMIN_NETWORK_UPDATED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge in den allgemeinen Daten aktualisiert.",
        'ADMIN_NETWORK_REMOVED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge aus den allgemeinen Daten gel&ouml;scht.",
-       'ADMIN_NETWORK_HANDLER_TYPES_UPDATED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler aktualisiert.",
+       'ADMIN_NETWORK_TYPE_HANDLER_UPDATED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler aktualisiert.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED' => "Es wurden <span class=\"data\">%s</span> Abfrageparameter aktualisiert.",
-       'ADMIN_NETWORK_HANDLER_TYPES_REMOVED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler gel&ouml;scht.",
+       'ADMIN_NETWORK_TYPE_HANDLER_REMOVED' => "Es wurden <span class=\"data\">%s</span> Werbeart-Handler gel&ouml;scht.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden <span class=\"data\">%s</span> Abfrageparameter gel&ouml;scht.",
        // - Form notes
        'ADMIN_ADD_NETWORK_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_LIST_NETWORK_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_LIST_NETWORK_REFERRAL_LINK_NOTE' => "Wenn Sie Ihren Referral-Link eingeben, verwenden Sie bitte nicht dieses Formular, sondern das unter [<a href=\"{%url=modules.php?module=admin&amp;what=config_network_api%}\">API-Zugangsdaten</a>]. Sollten Sie hier Ihren Referral-Link eingetragen haben, ist dies nicht weiter schlimm, er wird jedoch nicht ver&ouml;ffentlicht.",
        'ADMIN_ADD_NETWORK_HANDLER_TYPE_NOTE' => "F&uuml;gen Sie hier weitere Werbearten-Handler 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_HANDLER_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_TYPE_HANDLER_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_ADD_NETWORK_REQUEST_PARAMETER_NOTE' => "F&uuml;gen Sie hier weitere Abfrageparameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.",
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Abfrageparameter 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_ADD_NETWORK_ARRAY_TRANSLATION_NOTE' => "F&uuml;gen Sie hier weitere Array-Element-&Uuml;bersetzungen zu dem ausgew&auml;hlten Netzwerk und Werbeart-Handler ein.",
@@ -142,35 +142,35 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE' => "Es wurden nur die Abfrageparameter des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-&Uuml;bersetzungen des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        // - Advertise types
-       'ADMIN_NETWORK_HANDLER_TYPES_BANNER' => "Banner-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_BANNER_CLICK' => "Banner-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_BANNER_VIEW' => "Banner-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_BUTTON' => "Button-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_BUTTON_CLICK' => "Button-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_BUTTON_VIEW' => "Button-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_SURFBAR' => "Surfbar-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_SURFBAR_CLICK' => "Surfbar-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_SURFBAR_VIEW' => "Surfbar-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_FORCEDBANNER' => "Forced-Banner",
-       'ADMIN_NETWORK_HANDLER_TYPES_FORCEDTEXTLINK' => "Forced-Textlink",
-       'ADMIN_NETWORK_HANDLER_TYPES_TEXTLINK' => "Textlink-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_TEXTLINK_CLICK' => "Textlink-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_TEXTLINK_VIEW' => "Textlink-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_SKYBANNER' => "Sky-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_SKYBANNER_CLICK' => "Sky-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_SKYBANNER_VIEW' => "Sky-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_LAYER' => "Layer-Klick/-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_LAYER_CLICK' => "Layer-Klick",
-       'ADMIN_NETWORK_HANDLER_TYPES_LAYER_VIEW' => "Layer-View",
-       'ADMIN_NETWORK_HANDLER_TYPES_POPUP' => "PopUp",
-       'ADMIN_NETWORK_HANDLER_TYPES_POPDOWN' => "PopDown",
-       'ADMIN_NETWORK_HANDLER_TYPES_TEXTMAIL' => "Textmail",
-       'ADMIN_NETWORK_HANDLER_TYPES_HTMLMAIL' => "HTML-Mail",
-       'ADMIN_NETWORK_HANDLER_TYPES_LEAD' => "Lead",
-       'ADMIN_NETWORK_HANDLER_TYPES_SALE' => "Sale",
-       'ADMIN_NETWORK_HANDLER_TYPES_PAYPERACTIVE' => "PayPerAktiv",
-       'ADMIN_NETWORK_HANDLER_TYPES_PAGEPEEL' => "Page-Peel",
-       'ADMIN_NETWORK_HANDLER_TYPES_TRAFFIC' => "Traffic", // These are visitor exchanges like ext-surfbar!
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER' => "Banner-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_CLICK' => "Banner-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_VIEW' => "Banner-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON' => "Button-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_CLICK' => "Button-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_VIEW' => "Button-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR' => "Surfbar-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_CLICK' => "Surfbar-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_VIEW' => "Surfbar-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_FORCEDBANNER' => "Forced-Banner",
+       'ADMIN_NETWORK_TYPE_HANDLER_FORCEDTEXTLINK' => "Forced-Textlink",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK' => "Textlink-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_CLICK' => "Textlink-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_VIEW' => "Textlink-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER' => "Sky-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_CLICK' => "Sky-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_VIEW' => "Sky-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_LAYER' => "Layer-Klick/-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_CLICK' => "Layer-Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_VIEW' => "Layer-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_POPUP' => "PopUp",
+       'ADMIN_NETWORK_TYPE_HANDLER_POPDOWN' => "PopDown",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTMAIL' => "Textmail",
+       'ADMIN_NETWORK_TYPE_HANDLER_HTMLMAIL' => "HTML-Mail",
+       'ADMIN_NETWORK_TYPE_HANDLER_LEAD' => "Lead",
+       'ADMIN_NETWORK_TYPE_HANDLER_SALE' => "Sale",
+       'ADMIN_NETWORK_TYPE_HANDLER_PAYPERACTIVE' => "PayPerAktiv",
+       'ADMIN_NETWORK_TYPE_HANDLER_PAGEPEEL' => "Page-Peel",
+       'ADMIN_NETWORK_TYPE_HANDLER_TRAFFIC' => "Traffic", // These are visitor exchanges like ext-surfbar!
        // - Sponsor networks
        'ADMIN_LIST_NEWORK_DATA_TITLE' => "Auflistung der Grunddaten aller Werbenetzwerke",
        'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.",
@@ -189,11 +189,11 @@ addMessages(array(
        'ADMIN_NETWORK_ROW_SEPARATOR2' => "Zeilen:",
        'ADMIN_NETWORK_QUERY_AMOUNT' => "Freie API-Abfragen t&auml;glich:",
        // - Advertise type
-       'ADMIN_NETWORK_HANDLER_TYPES_HANDLE' => "Werbeart-Handler:",
-       'ADMIN_NETWORK_HANDLER_TYPES_API_URL' => "API-URL der Werbeart:",
-       'ADMIN_NETWORK_HANDLER_TYPES_CLICK_URL' => "Klick-URL der Werbeart:",
-       'ADMIN_NETWORK_HANDLER_TYPES_BANNER_URL' => "Banner-URL der Werbeart:",
-       'ADMIN_NETWORK_HANDLER_TYPES_RELOAD_TIME_UNIT' => "Zeiteinheit f&uuml;r Reloadsperre:",
+       'ADMIN_NETWORK_TYPE_HANDLER' => "Werbeart-Handler:",
+       'ADMIN_NETWORK_TYPE_HANDLER_API_URL' => "API-URL der Werbeart:",
+       'ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL' => "Klick-URL der Werbeart:",
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL' => "Banner-URL der Werbeart:",
+       'ADMIN_NETWORK_TYPE_HANDLER_RELOAD_TIME_UNIT' => "Zeiteinheit f&uuml;r Reloadsperre:",
        // - API request parameter
        'ADMIN_SELECT_NETWORK_HANDLER_TYPE' => "Werbeart-Handler ausw&auml;hlen",
        'ADMIN_NETWORK_REQUEST_PARAMETER_KEY' => "Abfragename",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 5794a6f219fcbbf09bae3aabd88ec92d06ee385e..b0c9552f8672a227ca20e74e19dc681ed09a9eb5 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -743,7 +743,7 @@ function translateNetworkTranslationName ($name) {
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
        // Get the message id
-       return '{--ADMIN_NETWORK_HANDLER_TYPES_' . strtoupper($type) . '--}';
+       return '{--ADMIN_NETWORK_TYPE_HANDLER_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
@@ -973,7 +973,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1115,7 +1115,7 @@ function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_HANDLER_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
                // ... so abort here
                return false;
@@ -1142,7 +1142,7 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_HANDLER_TYPES_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
        }
 }
 
@@ -1191,10 +1191,10 @@ function doAdminNetworkProcessChangeHandlerTypes () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_UPDATED=' . $updated . '%}');
+                       displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1271,10 +1271,10 @@ function doAdminNetworkProcessRemoveNetworkTypes () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_REMOVED=' . $removed . '%}');
+                       displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1307,7 +1307,7 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () {
 }
 
 // Adds a request parameter to given network and type
-function doAdminNetworkProcessAddNetworkRequestParams () {
+function doAdminNetworkProcessAddRequestParam () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
@@ -1616,12 +1616,12 @@ ORDER BY
                __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = '';
+       $SQL = "<pre>INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_network_data` (`network_short_name`,`network_title`,`network_reflink`,`network_data_separator`,`network_row_separator`,`network_request_type`,`network_charset`,`network_require_id_card`,`network_query_amount`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
                // Add row
-               $SQL .= "<pre>('" .
+               $SQL .= "('" .
                        $content['network_short_name'] . "', '" .
                        $content['network_title'] . "', '" .
                        $content['network_reflink'] . "', '" .
@@ -1630,11 +1630,11 @@ ORDER BY
                        $content['network_request_type'] . "', '" .
                        $content['network_charset'] . "', '" .
                        $content['network_require_id_card'] . "', " .
-                       $content['network_query_amount'] . '),</pre>';
+                       $content['network_query_amount'] . "),\n";
        } // END - while
 
        // Remove last commata and close braces
-       $SQL = substr($SQL, 0, -7) . '</pre>';
+       $SQL = substr($SQL, 0, -2) . '</pre>';
 
        // Free result
        SQL_FREERESULT($result);

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index 18f679b43f54e82071096fb753628bbbacd544f3..5366184a771877512180b9f5b80536cee3e7ccf0 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -104,7 +104,7 @@ ORDER BY
                loadTemplate('admin_list_network_types', false, $OUT);
        } else {
                // No entries found
-               displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_404=' . $networkData['network_title'] . '%}');
+               displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');
        }
 
        // Free result

diff --git a/templates/de/html/admin/admin_add_network_request_param.tpl b/templates/de/html/admin/admin_add_network_request_param.tpl
index 89f44c4af61071be6449684bdff7964778a5375c..6fc8f5d946df75cdc1d07aa45f55da039c3459dd 100644 (file)
--- a/templates/de/html/admin/admin_add_network_request_param.tpl
+++ b/templates/de/html/admin/admin_add_network_request_param.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=add_network_request_param&amp;network_id={%get=network_id%}%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=add_request_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 e64251cd34f19992f08ab09444d59c96c1b872e4..17da812ca9bde90c974bdfc65d21ee05aa31e531 100644 (file)
--- a/templates/de/html/admin/admin_add_network_type.tpl
+++ b/templates/de/html/admin/admin_add_network_type.tpl
@@ -10,33 +10,33 @@
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_TYPE_HANDLER--}:</td>
                <td>
-                       <select name="network_type_handle" class="form_select" size="1">
+                       <select name="network_type_handler" class="form_select" size="1">
                                {%pipe,generateNetworkTypesAvailableOptions%}
                        </select>
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_HANDLER_TYPES_API_URL--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}:</td>
                <td>
                        <input type="text" class="form_field" name="network_type_api_url" size="50" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_HANDLER_TYPES_CLICK_URL--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}:</td>
                <td>
                        <input type="text" class="form_field" name="network_type_click_url" size="40" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_NETWORK_HANDLER_TYPES_BANNER_URL--}:</td>
+               <td align="right" width="250">{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}:</td>
                <td>
                        <input type="text" class="form_field" name="network_type_banner_url" size="40" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_HANDLER_TYPES_RELOAD_TIME_UNIT--}:</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_NETWORK_TYPE_HANDLER_RELOAD_TIME_UNIT--}:</td>
                <td class="bottom">
                        $content[network_type_reload_time_unit]
                </td>

diff --git a/templates/de/html/admin/admin_config_network_types_row.tpl b/templates/de/html/admin/admin_config_network_types_row.tpl
index 9a8891df2dc774be76476a9b9a84fd71c1b1828e..0b44fe1c18fb422949ae7e96cfee1e6b968314f1 100644 (file)
--- a/templates/de/html/admin/admin_config_network_types_row.tpl
+++ b/templates/de/html/admin/admin_config_network_types_row.tpl
@@ -4,7 +4,7 @@
                <strong>$content[network_type_id]</strong>
        </td>
        <td class="{%template,ColorSwitch%} bottom" align="center" width="93%">
-               {--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}<br />
+               {--ADMIN_NETWORK_TYPE_HANDLER--}<br />
                <strong>{%pipe,translateNetworkTypeHandler=$content[network_type_handler]%}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_delete_network_request_params_row.tpl b/templates/de/html/admin/admin_delete_network_request_params_row.tpl
index f94424573bc17227a2060eab40eb69528f39bd29..83736bbfc86bb9235d466bab298787733b1aa059 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_request_params_row.tpl
+++ b/templates/de/html/admin/admin_delete_network_request_params_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER--}:</td>
        <td class="{%template,ColorSwitch%}">
                <input type="hidden" name="sel[$content[network_request_param_id]]" value="1" />
                {%pipe,translateNetworkTypeHandler=$content[network_type_data][network_type_handler]%}

diff --git a/templates/de/html/admin/admin_delete_network_types.tpl b/templates/de/html/admin/admin_delete_network_types.tpl
index 6163c6580a23e8559d94b1d132a1eae8cb83a40d..7003318df5ad8d020790b3d5bf35d85ed4614004 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_types.tpl
+++ b/templates/de/html/admin/admin_delete_network_types.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
                        <div>
-                               <strong>{--ADMIN_NETWORK_HANDLER_TYPES_DELETE_TITLE--}</strong>
+                               <strong>{--ADMIN_NETWORK_TYPE_HANDLER_DELETE_TITLE--}</strong>
                        </div>
                        <div class="tiny">
                                (<a href="{%network,getNetworkDataById,network_reflink=%network_id%%}" target="_blank" title="{%network,getNetworkDataById,network_title=%network_id%%}">{%network,getNetworkDataById,network_title=%network_id%%}</a>)
@@ -21,6 +21,6 @@
 </form>
 
 <div class="notice">
-       {--ADMIN_NETWORK_HANDLER_TYPES_LIST_NOTE--}
+       {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTE--}
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_delete_network_types_row.tpl b/templates/de/html/admin/admin_delete_network_types_row.tpl
index 4038047f143cc238285410394fae1971dc26e1d2..00611f510a6480f5c3a9d0dea02276c792248239 100644 (file)
--- a/templates/de/html/admin/admin_delete_network_types_row.tpl
+++ b/templates/de/html/admin/admin_delete_network_types_row.tpl
@@ -1,24 +1,24 @@
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER--}:</td>
        <td class="{%template,ColorSwitch%}">
                <input type="hidden" name="sel[$content[network_type_id]]" value="1" />
                {%pipe,translateNetworkTypeHandler=$content[network_type_handler]%}
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_API_URL--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}:</td>
        <td class="{%template,ColorSwitch%}">
                $content[network_type_api_url]
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_CLICK_URL--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}:</td>
        <td class="{%template,ColorSwitch%}">
                $content[network_type_click_url]
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%} bottom" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_BANNER_URL--}:</td>
+       <td class="{%template,ColorSwitch%} bottom" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}:</td>
        <td class="{%template,ColorSwitch%} bottom">
                {%pipe,fixEmptyContentToDashes=$content[network_type_banner_url]%}
        </td>

diff --git a/templates/de/html/admin/admin_edit_network_request_params_row.tpl b/templates/de/html/admin/admin_edit_network_request_params_row.tpl
index 768c9ff71b7761236c203871a0d7f6852f50a016..c95c9cd6dc7353c384f513c692aa6fddc85ca098 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_request_params_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_request_params_row.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER--}:</td>
        <td class="{%template,ColorSwitch%}">
                <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">

diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl
index 4196a984db92448ed4e12af48b209dfb2773605a..91c7be7e8bbb1dfc08f17ee48615963c02cf0c93 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types.tpl
+++ b/templates/de/html/admin/admin_edit_network_types.tpl
@@ -22,6 +22,6 @@
 </form>
 
 <div class="notice">
-       {--ADMIN_NETWORK_HANDLER_TYPES_LIST_NOTE--}
+       {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTE--}
 </div>
 </div>

diff --git a/templates/de/html/admin/admin_edit_network_types_row.tpl b/templates/de/html/admin/admin_edit_network_types_row.tpl
index d64927f43383ce836e2b02e84338319df32227be..3f1540dcdb569c9e947e8d825d70806390e6cb36 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_types_row.tpl
@@ -1,24 +1,24 @@
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER--}:</td>
        <td class="{%template,ColorSwitch%}">
                <input type="hidden" name="sel[$content[network_type_id]]" value="1" />
                <input type="text" class="form_field" name="network_type_handle[$content[network_type_id]]" size="20" maxlength="255" value="$content[network_type_handler]" />
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_API_URL--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}:</td>
        <td class="{%template,ColorSwitch%}">
                <input type="text" class="form_field" name="network_type_api_url[$content[network_type_id]]" size="50" maxlength="255" value="$content[network_type_api_url]" />
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_CLICK_URL--}:</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}:</td>
        <td class="{%template,ColorSwitch%}">
                <input type="text" class="form_field" name="network_type_click_url[$content[network_type_id]]" size="50" maxlength="255" value="$content[network_type_click_url]" />
        </td>
 </tr>
 <tr>
-       <td class="{%template,ColorSwitch%} bottom" style="padding-left:5px">{--ADMIN_NETWORK_HANDLER_TYPES_BANNER_URL--}:</td>
+       <td class="{%template,ColorSwitch%} bottom" style="padding-left:5px">{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}:</td>
        <td class="{%template,ColorSwitch%} bottom">
                <input type="text" class="form_field" name="network_type_banner_url[$content[network_type_id]]" size="50" maxlength="255" value="$content[network_type_banner_url]" />
        </td>

diff --git a/templates/de/html/admin/admin_list_network_array_translation.tpl b/templates/de/html/admin/admin_list_network_array_translation.tpl
index e28138edc9a76805a9dd56b2c06aa6f76f2b954b..e64647a32cf156a8462083ee450298adeddc35cb 100644 (file)
--- a/templates/de/html/admin/admin_list_network_array_translation.tpl
+++ b/templates/de/html/admin/admin_list_network_array_translation.tpl
@@ -13,7 +13,7 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--}</strong></td>
        </tr>

diff --git a/templates/de/html/admin/admin_list_network_request_params.tpl b/templates/de/html/admin/admin_list_network_request_params.tpl
index 5dd626ca063a1899e3aa495d3e68c78877c42330..e0bb92f94750c53a9b94df12c781cbdf1c3b8eae 100644 (file)
--- a/templates/de/html/admin/admin_list_network_request_params.tpl
+++ b/templates/de/html/admin/admin_list_network_request_params.tpl
@@ -13,7 +13,7 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}</strong></td>
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}</strong></td>

diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl
index 9bdd57835ad3fa2ad38ead3df63aa86c3c17a51f..f11af69c8702a026f90054b47dd987d71d675268 100644 (file)
--- a/templates/de/html/admin/admin_list_network_types.tpl
+++ b/templates/de/html/admin/admin_list_network_types.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td colspan="6" align="center" class="table_header bottom">
                        <div>
-                               <strong>{--ADMIN_NETWORK_HANDLER_TYPES_LIST_TITLE--}</strong>
+                               <strong>{--ADMIN_NETWORK_TYPE_HANDLER_LIST_TITLE--}</strong>
                        </div>
                        <div class="tiny">
                                (<a href="{%network,getNetworkDataById,network_reflink=%network_id%%}" target="_blank" title="{%network,getNetworkDataById,network_title=%network_id%%}">{%network,getNetworkDataById,network_title=%network_id%%}</a>)
@@ -13,10 +13,10 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" height="25"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_HANDLE--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_API_URL--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_CLICK_URL--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_HANDLER_TYPES_BANNER_URL--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--TIME_UNIT--}</strong></td>
        </tr>
        $content
@@ -35,6 +35,6 @@
 </div>
 
 <div class="notice">
-       {--ADMIN_NETWORK_HANDLER_TYPES_LIST_NOTE--}
+       {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTE--}
 </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 54a2cb9cb3ed7ad9c80dfe36769c579662c583d4..d44c69750b973f1c04b97f8125460673ae645798 100644 (file)
--- a/templates/de/html/admin/admin_list_networks_row.tpl
+++ b/templates/de/html/admin/admin_list_networks_row.tpl
@@ -6,7 +6,7 @@
                $content[network_short_name]:<br />
                [<a
                 href="{%url=modules.php?module=admin&amp;what=config_network_api&amp;network_id=$content[network_id]%}" title="{--ADMIN_NETWORK_API_CONFIG_LINK_TITLE--}">AC</a>|<a
-                href="{%url=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]%}" title="{--ADMIN_NETWORK_HANDLER_TYPES_CONFIG_LINK_TITLE--}">TC</a>|<a
+                href="{%url=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]%}" title="{--ADMIN_NETWORK_TYPE_HANDLER_CONFIG_LINK_TITLE--}">TC</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_HANDLER_TYPES_LINK_TITLE--}">T</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_REQUEST_PARAMS_LINK_TITLE--}">P</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;network_id=$content[network_id]%}" title="{--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LINK_TITLE--}">RC</a>|<a

diff --git a/templates/de/html/admin/admin_network_type_added.tpl b/templates/de/html/admin/admin_network_type_added.tpl
index 0be99766f38df04871529a9d531149442ed28a2a..cfceb18d02b3552abc49d13075f562d896382152 100644 (file)
--- a/templates/de/html/admin/admin_network_type_added.tpl
+++ b/templates/de/html/admin/admin_network_type_added.tpl
@@ -2,7 +2,7 @@
 
 <div style="width:550px" class="table dashed">
        <div class="table_header bottom">
-               {--ADMIN_NETWORK_HANDLER_TYPES_ADDED_TITLE--}
+               {--ADMIN_NETWORK_TYPE_HANDLER_ADDED_TITLE--}
        </div>
        <div class="message">
                Der Werbeart-Handler $content[network_type_handler] wurde soeben hinzugef&uuml;gt.